diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily b/Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily
deleted file mode 100644
index f8ae63eff8259a1dc23d38aafb1d387057859cc6..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily
+++ /dev/null
@@ -1,7 +0,0 @@
-#(ly:set-option 'point-and-click #f)
-
-\include "deutsch.ly"
-
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily"
-
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_ChoralScore.ily b/Eybler_Graduale_TuaEstPotentia_HV50_Settings_ChoralScore.ily
deleted file mode 100644
index 5eb4b6e3fecc676d63333961dd99e54473d8b817..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_ChoralScore.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_choralscore.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily b/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily
deleted file mode 100644
index 683d0a2f076c672ceaf8f5b0edfa4ab859be0e34..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalScore.ily b/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalScore.ily
deleted file mode 100644
index 5a3556c0168860d3860d9bbad7226512830954db..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalScore.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_vocalscore.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily b/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily
deleted file mode 100644
index 2b9c08e8a910f3eeb7e72eab2935c1e18014cf95..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_vocalvoice.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_A.ly b/Eybler_TuaEstPotentia_HV50_Instrument_A.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_A.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_A.ly
index 25cefbd5e703f08b957d647c3e74a24c023fe347..0da980a5030976322be0568c378032ef7d8fd7b2 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_A.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_A.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
 
 \header {
   instrument = \AInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_B.ly b/Eybler_TuaEstPotentia_HV50_Instrument_B.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_B.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_B.ly
index 406bcfeffe81473aec2a9c1a28eee1de5f7d852d..95d0dfa2edb297966017bbcf0a12d4de4858de42 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_B.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_B.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
 
 \header {
   instrument = \BInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClI.ly b/Eybler_TuaEstPotentia_HV50_Instrument_ClI.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClI.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_ClI.ly
index 0c30bed0215dc2af7fe653097908055ecb665dca..ebe57b5bdfc9fef8c232c9e25aaa36ac0e7262d4 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClI.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_ClI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \ClIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClII.ly b/Eybler_TuaEstPotentia_HV50_Instrument_ClII.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClII.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_ClII.ly
index 1c87f65f9d6df5e9d81a58fbbeb4f2122894c4ac..118af8d794d73b50e862fa02c921ab3a20378f4c 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_ClII.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_ClII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \ClIIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Continuo.ly b/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.ly
similarity index 70%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Continuo.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_Continuo.ly
index 50471d47b61918b18de80a7283163b2e705675f2..fd6cf0e0b91513c99bd0209bd7a198c23f512aa8 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Continuo.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \ContinuoInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagI.ly b/Eybler_TuaEstPotentia_HV50_Instrument_FagI.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagI.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_FagI.ly
index ef37e340ec1dc9ef78960347a33be22c26c6aeb8..3c095f770aea8d8347ee0d0e5c1099cc07e623e1 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagI.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_FagI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \FagIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagII.ly b/Eybler_TuaEstPotentia_HV50_Instrument_FagII.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagII.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_FagII.ly
index 32bb250b34a356a308b46e0a22bed32c8d77fcf3..02f71ed6cf2055be2d57223d5248899b45743e0a 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_FagII.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_FagII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \FagIIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_S.ly b/Eybler_TuaEstPotentia_HV50_Instrument_S.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_S.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_S.ly
index 0f4877578ddcbdbdc0741009fdc3883e04e618ba..4a674a5e7fa682faa62438bb30133b04d030176e 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_S.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_S.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
 
 \header {
   instrument = \SInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_T.ly b/Eybler_TuaEstPotentia_HV50_Instrument_T.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_T.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_T.ly
index 1af38f3817cc342bcbcdc0b76b230ed745ec49c6..2cb79b604a54329502e3c12d68d57e90783261d0 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_T.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_T.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily"
 
 \header {
   instrument = \TInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeI.ly b/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeI.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_TbeI.ly
index 7a1cd304031ea99cf20503e57f6e387887d2d602..ddc79853eb1a58980fb19ff89397d9d296e8fb46 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeI.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \TbeIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeII.ly b/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeII.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_TbeII.ly
index 64009cadca35677d8832d99e7bc88dd076cc1d34..5066d89a97986ff272085ef1496a00e0b9fa9983 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TbeII.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \TbeIIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Tim.ly b/Eybler_TuaEstPotentia_HV50_Instrument_Tim.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Tim.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_Tim.ly
index 664717c5d652d8ea12e5657deb9917b0af80a0e0..c9179a8fad0b2565fbeacade2e3a0f91c6906acc 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Tim.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_Tim.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \TimInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbI.ly b/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbI.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_TrbI.ly
index b54e71176a5f9545d7c4de45192e9dc2a0c625f6..f5b36df2b5e4f27aad933140c47fc9ab4aa34638 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbI.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbII.ly b/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.ly
similarity index 69%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbII.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_TrbII.ly
index f0f4a96a4821d159da2cf40914b097153fad73d2..7aa57cd51769f31df0ed63967b5833ae49728f4e 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_TrbII.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VI.ly b/Eybler_TuaEstPotentia_HV50_Instrument_VI.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VI.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_VI.ly
index 654cb9292c4041dd727f008138a8f227a67601f4..c9bac3e9289d0ac30a6ee82a8fe6775e8a79922f 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VI.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_VI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \VIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VII.ly b/Eybler_TuaEstPotentia_HV50_Instrument_VII.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VII.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_VII.ly
index c60a4ee0c5200a5d2ff079e526a882dfe32cf195..8ea08ab84cde1c0c66b5e7c7b1a899756711c1ff 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VII.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_VII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \VIIInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly b/Eybler_TuaEstPotentia_HV50_Instrument_Va.ly
similarity index 72%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_Va.ly
index 6e8c3b2da7d4790d7580ee09688237014714452f..db91b7cce246a73bcf407e91879407bcd1db731f 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_Va.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \VaInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VcB.ly b/Eybler_TuaEstPotentia_HV50_Instrument_VcB.ly
similarity index 68%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VcB.ly
rename to Eybler_TuaEstPotentia_HV50_Instrument_VcB.ly
index 4db5bba3ed9ea52f75557a89cfaabcee3e79be87..90250904c5065eab4183f6fcebb05b35f18db8b1 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_VcB.ly
+++ b/Eybler_TuaEstPotentia_HV50_Instrument_VcB.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily"
 
 \header {
   instrument = \VcBInstrumentName
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm.ly b/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.ly
similarity index 100%
rename from Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm.ly
rename to Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.ly
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily b/Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily
similarity index 100%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily
rename to Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.ly b/Eybler_TuaEstPotentia_HV50_Score_Choral.ly
similarity index 74%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.ly
rename to Eybler_TuaEstPotentia_HV50_Score_Choral.ly
index 6cd4280c63c974fa58137c166be460490501b195..0462ec1e8ac124c6f182b324a1efd08e1922d7cc 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.ly
+++ b/Eybler_TuaEstPotentia_HV50_Score_Choral.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_ChoralScore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.ly b/Eybler_TuaEstPotentia_HV50_Score_Full.ly
similarity index 74%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.ly
rename to Eybler_TuaEstPotentia_HV50_Score_Full.ly
index 4673ff7b185b1035b21a3962635b3f371da83019..7e66f89e809fd7df6cd8c3b0a710ba9d53c30858 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.ly
+++ b/Eybler_TuaEstPotentia_HV50_Score_Full.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.ly b/Eybler_TuaEstPotentia_HV50_Score_Long.ly
similarity index 74%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.ly
rename to Eybler_TuaEstPotentia_HV50_Score_Long.ly
index b8c03546a1145759015315f3c8427825a5c7ecdd..6555696ac8585b73d2194310a0df80dfa3618c8c 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.ly
+++ b/Eybler_TuaEstPotentia_HV50_Score_Long.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly b/Eybler_TuaEstPotentia_HV50_Score_Original.ly
similarity index 85%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly
rename to Eybler_TuaEstPotentia_HV50_Score_Original.ly
index d130e4492a437b5352b5c8e42ab6fe36269730f1..2948062bb3b83c20764076ca9f5c6282318ffaf9 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly
+++ b/Eybler_TuaEstPotentia_HV50_Score_Original.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.ly b/Eybler_TuaEstPotentia_HV50_Score_Vocal.ly
similarity index 74%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.ly
rename to Eybler_TuaEstPotentia_HV50_Score_Vocal.ly
index 9abc3adcae96f8ba695852da7cd82ada8358b222..feaac4c614f7106b48d049275eaecf913e29774d 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.ly
+++ b/Eybler_TuaEstPotentia_HV50_Score_Vocal.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalScore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_TuaEstPotentia_HV50_Settings.ily b/Eybler_TuaEstPotentia_HV50_Settings.ily
new file mode 100644
index 0000000000000000000000000000000000000000..1dce0a7df42a3678f756651bc76b7cfb34e9f5b4
--- /dev/null
+++ b/Eybler_TuaEstPotentia_HV50_Settings.ily
@@ -0,0 +1,7 @@
+#(ly:set-option 'point-and-click #f)
+
+\include "deutsch.ly"
+
+\include "Eybler_TuaEstPotentia_HV50_Settings_Global.ily"
+\include "Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily"
+
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings.ly b/Eybler_TuaEstPotentia_HV50_Settings.ly
similarity index 100%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Settings.ly
rename to Eybler_TuaEstPotentia_HV50_Settings.ly
diff --git a/Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily b/Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..79e6d99e37fb52825d36496090cfecbeb5a7f2d2
--- /dev/null
+++ b/Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily b/Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily
similarity index 53%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily
rename to Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily
index aceda9b0d9e4637f282438bb30467f626d73cbef..8757441cb47e3ba6a09c42ad84aff61ab60ef46d 100644
--- a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily
+++ b/Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily
@@ -1,13 +1,13 @@
 \include "orchestrallily/oly_settings_fullscore.ily"
-\include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings.ily"
 
-GradualeTuaEstPotentiaTrbISettings = {
+TuaEstPotentiaTrbISettings = {
     \set Staff.fontSize = #-4
     \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-    \GradualeTuaEstPotentiaSettings
+    \TuaEstPotentiaSettings
 }
-GradualeTuaEstPotentiaTrbIISettings = {
+TuaEstPotentiaTrbIISettings = {
     \set Staff.fontSize = #-4
     \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-    \GradualeTuaEstPotentiaSettings
+    \TuaEstPotentiaSettings
 }
diff --git a/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily b/Eybler_TuaEstPotentia_HV50_Settings_Global.ily
similarity index 100%
rename from Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily
rename to Eybler_TuaEstPotentia_HV50_Settings_Global.ily
diff --git a/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily b/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily
new file mode 100644
index 0000000000000000000000000000000000000000..c2f9862bd424ebcb2a9473c2a28a1f3c128f8b14
--- /dev/null
+++ b/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily b/Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..20a46de3e747bfa7b636a4ef37cbecc1bf8b13db
--- /dev/null
+++ b/Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily b/Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily
new file mode 100644
index 0000000000000000000000000000000000000000..1302c125515dbd39ba7bb4706223edfbfa6500b4
--- /dev/null
+++ b/Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalvoice.ily"
+\include "Eybler_TuaEstPotentia_HV50_Settings.ily"
diff --git a/Makefile b/Makefile
index 5a9d060ab0113029a2924d7ef359867611cb7f98..5cc8dd827d6b78b409ab7d8c287c1d3e0d4894be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 OUT=out
 
-base = Eybler_Graduale_TuaEstPotentia_HV50
-SRCS = Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalScore.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings_ChoralScore.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings_VocalVoice.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily Eybler_Graduale_TuaEstPotentia_HV50_Settings_Instrument.ily Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily $(base)_Settings.ily
+base = Eybler_TuaEstPotentia_HV50
+SRCS = Eybler_TuaEstPotentia_HV50_Settings_Global.ily Eybler_TuaEstPotentia_HV50_Settings.ily Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily $(base)_Settings.ily
 instruments = ClI ClII FagI FagII TbeI TbeII TrbI TrbII Tim VI VII Va S A T B Continuo VcB
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
 
 
-texbase = Eybler_Graduale_TuaEstPotentia_HV50
+texbase = Eybler_TuaEstPotentia_HV50
 texscores = Long Full Vocal Choral Original
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex b/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex
deleted file mode 100644
index 1b13c3227df49877dadf1b96a42a37b6f6a6cd57..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex
+++ /dev/null
@@ -1,14 +0,0 @@
-\frontmatter
-\maketitle
-
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex}
-\cleardoublepage
-\begin{preface}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_About.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex}
-\pagebreak
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex}
-\end{preface}
-
-\mainmatter
-\cleardoublepage
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_About.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_About.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_About.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_About.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex
new file mode 100644
index 0000000000000000000000000000000000000000..06b798d2697910c4d20d2e85b3aa771e6b27892f
--- /dev/null
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex
@@ -0,0 +1,14 @@
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex}
+\cleardoublepage
+\begin{preface}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_About.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex}
+\pagebreak
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex}
+\end{preface}
+
+\mainmatter
+\cleardoublepage
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Short.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Short.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Short.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Short.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex b/TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex
similarity index 100%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
similarity index 58%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
index 8f609e146566fae9416121f29ec04c09f01b28bd..1a6d5b9889e8304267208cb8776504ffc56eca6b 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Choral.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \ChoralScoreType},
@@ -11,8 +11,8 @@
 \ChoralScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\ChoralScoreType}
@@ -20,5 +20,5 @@
 
 
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
similarity index 54%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
index 45f1f598a99b48c7e58f6161986276ccbffbcaec..f8f521c264ccde0625f9f651c91c593bda28f0d7 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Full.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \FullScoreType},
@@ -11,8 +11,8 @@
 \FullScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\FullScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
similarity index 84%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
index 962c68d9f3ae45fe7fd21729a9e822af7e910327..dc7a46871961cf8f00d530fa173c7378ea621c2a 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
@@ -11,8 +11,10 @@
 \InstrumentalPartsSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+
+
 
 \phantomsection
 \addcontentsline{toc}{section}{\OrganName}
@@ -77,7 +79,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
similarity index 54%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
index a1848ce1297cc28276d9d3179994228157c5e716..911b75c579dd752dd98caec69c0aa96b027e2b50 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Long.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \LongScoreType},
@@ -11,8 +11,8 @@
 \LongScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\LongScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
similarity index 55%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
index 3a83719233a2d3f448d68128584ab9fc1a4647b2..cce49d4f5e99f68a486e927474a04bf6f3401458 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \OriginalScoreType},
@@ -11,8 +11,8 @@
 \OriginalScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\OriginalScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
similarity index 58%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.tex
rename to TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
index 67be0589a530d0c8fc98bf1daabc22e35f3fcd21..d446d3728b4c4319d1329a08da1dcc56008b89c1 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Vocal.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage[vocalscore]{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \VocalScoreType},
@@ -11,8 +11,8 @@
 \VocalScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\VocalScoreType}
@@ -20,5 +20,5 @@
 
 
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Backpage.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex b/TeX_Eybler_TuaEstPotentia_HV50_Settings.itex
similarity index 86%
rename from TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex
rename to TeX_Eybler_TuaEstPotentia_HV50_Settings.itex
index aec4bc622be4fa45984eddaf8f6aea74fce963f9..fba8b218e88a33e20a9be89147af36cbf1c00f73 100644
--- a/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Settings.itex
@@ -9,7 +9,7 @@
 \year{2009}
 \scoreinfo{Urtext}
 
-\basename{Eybler_Graduale_TuaEstPotentia_HV50}
+\basename{Eybler_TuaEstPotentia_HV50}
 
 \newcommand{\scoreNumber}[1]{EK-1050-#1}
 \newcommand{\scoreTitle}{Joseph Eybler (1765-1846): Tua est potentia}
@@ -19,4 +19,4 @@
     pdfauthor={Reinhold Kainhofer <reinhold@kainhofer.com>}
 }
 
-\input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex}
+\input{TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex}
diff --git a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly.patch b/patches/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly.patch
deleted file mode 100644
index ae5ba75f403c8c1326e2881cc98f803fb15a4c67..0000000000000000000000000000000000000000
--- a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly.new	2009-10-01 12:45:46.000000000 +0200
-+++ Eybler_Graduale_TuaEstPotentia_HV50_Instrument_Va.ly	2009-10-01 12:38:50.000000000 +0200
-@@ -5,6 +5,9 @@
-   instrument = \VaInstrumentName
-   scorenumber = \markup{\scoreNumber \VaNumber}
- }
-+\paper {
-+  page-count = #2
-+}
- 
- \createScore #"TuaEstPotentia" #'("Va")
- 
diff --git a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily.patch b/patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily.patch
deleted file mode 100644
index a2c6cf31d4b84907ac94717cec657163938ad934..0000000000000000000000000000000000000000
--- a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily.new	2009-10-01 12:45:46.000000000 +0200
-+++ Eybler_Graduale_TuaEstPotentia_HV50_Settings_FullScore.ily	2009-09-08 16:20:56.000000000 +0200
-@@ -1,2 +1,13 @@
- \include "orchestrallily/oly_settings_fullscore.ily"
- \include "Eybler_Graduale_TuaEstPotentia_HV50_Settings.ily"
-+
-+GradualeTuaEstPotentiaTrbISettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \GradualeTuaEstPotentiaSettings
-+}
-+GradualeTuaEstPotentiaTrbIISettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \GradualeTuaEstPotentiaSettings
-+}
diff --git a/patches/Eybler_TuaEstPotentia_HV50_Instrument_Va.ly.patch b/patches/Eybler_TuaEstPotentia_HV50_Instrument_Va.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8ccb5b42764ac0ca33662e02bef73cbd190091a5
--- /dev/null
+++ b/patches/Eybler_TuaEstPotentia_HV50_Instrument_Va.ly.patch
@@ -0,0 +1,12 @@
+--- Eybler_TuaEstPotentia_HV50_Instrument_Va.ly.new	2009-10-01 12:56:26.000000000 +0200
++++ Eybler_TuaEstPotentia_HV50_Instrument_Va.ly	2009-10-01 12:54:13.000000000 +0200
+@@ -5,6 +5,9 @@
+   instrument = \VaInstrumentName
+   scorenumber = \markup{\scoreNumber \VaNumber}
+ }
++\paper {
++  page-count = #2
++}
+ 
+ \createScore #"TuaEstPotentia" #'("Va")
+ 
diff --git a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch b/patches/Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch
similarity index 99%
rename from patches/Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch
rename to patches/Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch
index d6a67bb7e47247e3170273c6d426e0d79b2a3760..d3c649155bdc6b923a69cd0e2500cf4dd42dd793 100644
--- a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch
+++ b/patches/Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.new	2009-10-01 12:45:46.000000000 +0200
-+++ Eybler_Graduale_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily	2009-10-01 12:40:03.000000000 +0200
+--- Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily.new	2009-10-01 12:56:26.000000000 +0200
++++ Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily	2009-10-01 12:40:03.000000000 +0200
 @@ -1,156 +1,1069 @@
  \version "2.13.1"
  
diff --git a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly.patch b/patches/Eybler_TuaEstPotentia_HV50_Score_Original.ly.patch
similarity index 67%
rename from patches/Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly.patch
rename to patches/Eybler_TuaEstPotentia_HV50_Score_Original.ly.patch
index 4131d0f92d5bcd7e16f075bfd015ebd43512fd90..b77e31833a2b0937e792dcccdc0b3fb9b5b78ff3 100644
--- a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly.patch
+++ b/patches/Eybler_TuaEstPotentia_HV50_Score_Original.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly.new	2009-10-01 12:45:46.000000000 +0200
-+++ Eybler_Graduale_TuaEstPotentia_HV50_Score_Original.ly	2009-10-01 12:41:18.000000000 +0200
+--- Eybler_TuaEstPotentia_HV50_Score_Original.ly.new	2009-10-01 12:56:26.000000000 +0200
++++ Eybler_TuaEstPotentia_HV50_Score_Original.ly	2009-10-01 12:54:38.000000000 +0200
 @@ -8,4 +8,10 @@
    scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
  }
diff --git a/patches/Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily.patch b/patches/Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bf42c000db7c8217fb2369a29567773d58d6fceb
--- /dev/null
+++ b/patches/Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily.patch
@@ -0,0 +1,16 @@
+--- Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily.new	2009-10-01 12:56:26.000000000 +0200
++++ Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily	2009-10-01 12:55:06.000000000 +0200
+@@ -1,2 +1,13 @@
+ \include "orchestrallily/oly_settings_fullscore.ily"
+ \include "Eybler_TuaEstPotentia_HV50_Settings.ily"
++
++TuaEstPotentiaTrbISettings = {
++    \set Staff.fontSize = #-4
++    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
++    \TuaEstPotentiaSettings
++}
++TuaEstPotentiaTrbIISettings = {
++    \set Staff.fontSize = #-4
++    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
++    \TuaEstPotentiaSettings
++}
diff --git a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily.patch b/patches/Eybler_TuaEstPotentia_HV50_Settings_Global.ily.patch
similarity index 86%
rename from patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily.patch
rename to patches/Eybler_TuaEstPotentia_HV50_Settings_Global.ily.patch
index e67084340043ee3791fc31a52e0587dd81040c74..590f4a8d50c6ebcc7b2bf04329114739f8517c5a 100644
--- a/patches/Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily.patch
+++ b/patches/Eybler_TuaEstPotentia_HV50_Settings_Global.ily.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily.new	2009-10-01 12:45:46.000000000 +0200
-+++ Eybler_Graduale_TuaEstPotentia_HV50_Settings_Global.ily	2009-10-01 12:46:23.000000000 +0200
+--- Eybler_TuaEstPotentia_HV50_Settings_Global.ily.new	2009-10-01 12:56:26.000000000 +0200
++++ Eybler_TuaEstPotentia_HV50_Settings_Global.ily	2009-10-01 12:46:23.000000000 +0200
 @@ -16,7 +16,34 @@
  
  %% Possibly adjust the \orchestralScoreStructure here...
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex.patch
similarity index 59%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex.patch
index cd2ffa18481ca9d5d0046bd35d52acfa6a208e9a..5e3edadcef02136bb136200ba4c87d31b5135c0a 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Bio.itex	2009-07-24 00:46:46.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Include_Bio.itex	2009-07-24 00:46:46.000000000 +0200
 @@ -1,14 +1 @@
 -\section*{Das Leben von Joseph Eybler}
 -
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch
similarity index 90%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch
index a16c9b0e0b46ca4c8612a2fabeadf18150315e98..8aec7d40062ae280aecae3207eb915866915be3d 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_ContentsMaterial.itex	2009-10-01 12:43:56.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Include_ContentsMaterial.itex	2009-10-01 12:43:56.000000000 +0200
 @@ -15,39 +15,40 @@
  \scorelistbox{
  Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
similarity index 99%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
index bb4dc1da287acde2591497fa917ffb7e1707b0b8..a30b7c90495fcbbd1cfd3c848c588eef9c700f13 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_KritBericht.itex	2009-10-01 12:47:38.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex	2009-10-01 12:47:38.000000000 +0200
 @@ -12,84 +12,92 @@
  \newblock TODO
  
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex.patch
similarity index 80%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex.patch
index 007b9f61624ff6e2cf3dbaa06e227e79982774bc..96705e916044544acf26728dd8579e1c64c6a6f6 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Text.itex	2009-10-01 12:44:42.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Include_Text.itex	2009-10-01 12:44:42.000000000 +0200
 @@ -1,10 +1,16 @@
 -\subsection*{Text des \q{Tua est potentia}: TODO}
 +\subsection*{Text des \q{Tua est potentia}: nach 1 Chr 29:11}
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex.patch
similarity index 64%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex.patch
index da9afc6feae772e2bd578ac9645809447821a522..84ef144c162df1541fab5bf10446b9fa1ad11b2a 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Todo.itex	2009-09-10 01:17:37.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Include_Todo.itex	2009-09-10 01:17:37.000000000 +0200
 @@ -1,8 +1,10 @@
 -% \todos{
 -% \chapter*{Offene Fragen}
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
similarity index 88%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
index c76935bb7794a41a19e33dc1a86f2330662c9928..b325eed31cd5bb79be5767a9019e27ff55da8224 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
@@ -1,15 +1,13 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Score_Instruments.tex	2009-08-02 13:15:53.000000000 +0200
-@@ -14,84 +14,64 @@
- \input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Coverpage.itex}
- \input{TeX_Eybler_Graduale_TuaEstPotentia_HV50_Include_Preface_Long.itex}
+--- TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex	2009-10-01 12:56:07.000000000 +0200
+@@ -16,82 +16,64 @@
+ 
+ 
  
 +\phantomsection
 +\addcontentsline{toc}{section}{\OrganName}
 +\includescore{Instrument_Organ}
  
--
--
 +\phantomsection
 +\addcontentsline{toc}{section}{\SName}
 +\includescore{Instrument_S}
@@ -68,11 +66,11 @@
 -\addcontentsline{toc}{section}{\TimName}
 -\includescore{Instrument_Tim}
 -
--\phantomsection
+ \phantomsection
 -\addcontentsline{toc}{section}{\VIName}
 -\includescore{Instrument_VI}
 -
- \phantomsection
+-\phantomsection
 -\addcontentsline{toc}{section}{\VIIName}
 -\includescore{Instrument_VII}
 -
diff --git a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Settings.itex.patch
similarity index 77%
rename from patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex.patch
rename to patches/TeX_Eybler_TuaEstPotentia_HV50_Settings.itex.patch
index 35472adaa70fe001e70850ffab45da9da7ede7fb..ee83a15ded851ad0a75c61fc4ae7b594a15eb344 100644
--- a/patches/TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Settings.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex.new	2009-10-01 12:45:46.000000000 +0200
-+++ TeX_Eybler_Graduale_TuaEstPotentia_HV50_Settings.itex	2009-10-01 12:45:22.000000000 +0200
+--- TeX_Eybler_TuaEstPotentia_HV50_Settings.itex.new	2009-10-01 12:56:26.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Settings.itex	2009-10-01 12:56:23.000000000 +0200
 @@ -1,9 +1,9 @@
  \title{Tua est potentia}
  \subtitle{Graduale, HV 50}