diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings.ily b/Eybler_Graduale_SperateInDeo_HV41_Settings.ily
deleted file mode 100644
index 5d1169a205fc44abd760db637a6f3b8303f9443e..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings.ily
+++ /dev/null
@@ -1,7 +0,0 @@
-#(ly:set-option 'point-and-click #f)
-
-\include "deutsch.ly"
-
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily"
-
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_ChoralScore.ily b/Eybler_Graduale_SperateInDeo_HV41_Settings_ChoralScore.ily
deleted file mode 100644
index e22ef719e5ecad95431208e554a39eb41a3c3113..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings_ChoralScore.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_choralscore.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily b/Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily
deleted file mode 100644
index 44e00262b6630b83a12395e67bed72c4f9e836d5..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalScore.ily b/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalScore.ily
deleted file mode 100644
index b0b52557532ce16b7e828bb6e1d2b38e7075f7dc..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalScore.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_vocalscore.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily b/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily
deleted file mode 100644
index b7bf364e09d5f105a42440e8e7a6cf4723693626..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_vocalvoice.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_A.ly b/Eybler_SperateInDeo_HV41_Instrument_A.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_A.ly
rename to Eybler_SperateInDeo_HV41_Instrument_A.ly
index ba54a7e10a1c5c9493986db9021daf2415933dab..2fb0c926f2f9c3783d5079f4e96b373788a71e98 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_A.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_A.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily"
 
 \header {
   instrument = \AInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_B.ly b/Eybler_SperateInDeo_HV41_Instrument_B.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_B.ly
rename to Eybler_SperateInDeo_HV41_Instrument_B.ly
index 86200e452014d7d3722b687a1269dee8819d2e0e..78946c05d53b4b09ceb583e4b026aa94683c5f5d 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_B.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_B.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily"
 
 \header {
   instrument = \BInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly b/Eybler_SperateInDeo_HV41_Instrument_Continuo.ly
similarity index 72%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly
rename to Eybler_SperateInDeo_HV41_Instrument_Continuo.ly
index e9c626d8e8bb65154fb94d708501d2d00cf43297..1d2fb46111f9238e94ca23a58e227736b98dba24 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_Continuo.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \ContinuoInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_CorI.ly b/Eybler_SperateInDeo_HV41_Instrument_CorI.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_CorI.ly
rename to Eybler_SperateInDeo_HV41_Instrument_CorI.ly
index dd4955727c55934f87ae4719b97e46ee119c9e4d..7194f7ad2e794096960e674a96cfe97734c67760 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_CorI.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_CorI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \CorIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_CorII.ly b/Eybler_SperateInDeo_HV41_Instrument_CorII.ly
similarity index 71%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_CorII.ly
rename to Eybler_SperateInDeo_HV41_Instrument_CorII.ly
index bbb92836143bec5e16528b0b8b492b71db948a39..6a8a05f6ea69a2c9c3f4834f29230e11306bdf59 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_CorII.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_CorII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \CorIIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_FagI.ly b/Eybler_SperateInDeo_HV41_Instrument_FagI.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_FagI.ly
rename to Eybler_SperateInDeo_HV41_Instrument_FagI.ly
index 1ad2ca01e179c8264dfdc3210a0dfff8f20c53d6..f5d12704cd62c5100c8cd3f7d882d0bbead04b8e 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_FagI.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_FagI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \FagIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_FagII.ly b/Eybler_SperateInDeo_HV41_Instrument_FagII.ly
similarity index 71%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_FagII.ly
rename to Eybler_SperateInDeo_HV41_Instrument_FagII.ly
index 1f0f71de63789209b1e272f404aab28e46d41f73..3ae785cd0e8ec269ce2dbd86d336a389177b034a 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_FagII.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_FagII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \FagIIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_ObI.ly b/Eybler_SperateInDeo_HV41_Instrument_ObI.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_ObI.ly
rename to Eybler_SperateInDeo_HV41_Instrument_ObI.ly
index f23bd7a617dd889da8c68dea3ca5576427f09048..77ef12b7a0694549b28e9b4c67496657e752bba0 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_ObI.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_ObI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \ObIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_ObII.ly b/Eybler_SperateInDeo_HV41_Instrument_ObII.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_ObII.ly
rename to Eybler_SperateInDeo_HV41_Instrument_ObII.ly
index 6d13e8a29b5220369b631b95993d86c6ccbdc67d..32fa3ed5ddc5466b9edf3d3f7830e8d1b2f2f193 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_ObII.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_ObII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \ObIIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_S.ly b/Eybler_SperateInDeo_HV41_Instrument_S.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_S.ly
rename to Eybler_SperateInDeo_HV41_Instrument_S.ly
index 59907a5dd1199876e2ce509c350b2c6b5d4d0201..0343323e29ef0bad8d9f2d0a5b00ed5b2df8689b 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_S.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_S.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily"
 
 \header {
   instrument = \SInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_T.ly b/Eybler_SperateInDeo_HV41_Instrument_T.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_T.ly
rename to Eybler_SperateInDeo_HV41_Instrument_T.ly
index 283b3ce11cf152c1761efa19b6047e8f4a549b11..a3e2775a30a868708cf4168cd4856ed125f011bf 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_T.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_T.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily"
 
 \header {
   instrument = \TInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly b/Eybler_SperateInDeo_HV41_Instrument_Tim.ly
similarity index 74%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly
rename to Eybler_SperateInDeo_HV41_Instrument_Tim.ly
index 923f4fded79452a239f9dde4fa3b06a1dea49952..25edd916e0b6ea1668ec1e726002ae72f8051453 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_Tim.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \TimInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly b/Eybler_SperateInDeo_HV41_Instrument_TrbI.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly
rename to Eybler_SperateInDeo_HV41_Instrument_TrbI.ly
index da1484da8fb966b0ce8e9cb00218e89a2e9a7c65..8db6d45050777242892ceebdcd5d08acd828def0 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_TrbI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly b/Eybler_SperateInDeo_HV41_Instrument_TrbII.ly
similarity index 71%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly
rename to Eybler_SperateInDeo_HV41_Instrument_TrbII.ly
index fb1f765aee5b71cee6d0ddbbf8f005219a94a2b5..600cf8d40558c0199a77a036d76b51f5cc09d7dd 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_TrbII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VI.ly b/Eybler_SperateInDeo_HV41_Instrument_VI.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_VI.ly
rename to Eybler_SperateInDeo_HV41_Instrument_VI.ly
index d81a4b13ecc118bdc7e582f70c3e1d2ac40ea002..05b2d113043dc484d47096304adc32a2d3443c2e 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VI.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_VI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \VIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VII.ly b/Eybler_SperateInDeo_HV41_Instrument_VII.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_VII.ly
rename to Eybler_SperateInDeo_HV41_Instrument_VII.ly
index 7cb38795e764525e39b66647fbc0d94c7b2e33d8..b2f4eeeb0ebbedaf41732bca85cea7c309ec0698 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VII.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_VII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \VIIInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Va.ly b/Eybler_SperateInDeo_HV41_Instrument_Va.ly
similarity index 69%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_Va.ly
rename to Eybler_SperateInDeo_HV41_Instrument_Va.ly
index 91e1f03ecb3e10d5f0d476f815351440ddbdc2ec..4399caf306a26ffc0bbb99cf65c582b802d69322 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Va.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_Va.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \VaInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VcB.ly b/Eybler_SperateInDeo_HV41_Instrument_VcB.ly
similarity index 70%
rename from Eybler_Graduale_SperateInDeo_HV41_Instrument_VcB.ly
rename to Eybler_SperateInDeo_HV41_Instrument_VcB.ly
index c5d3d3cc44a56ee815585625a6abf887c1682cc8..80c53f8739c27c0689656da64136196738f70512 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_VcB.ly
+++ b/Eybler_SperateInDeo_HV41_Instrument_VcB.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_Instrument.ily"
 
 \header {
   instrument = \VcBInstrumentName
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures.ly b/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly
similarity index 100%
rename from Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures.ly
rename to Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures73.ly b/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures73.ly
similarity index 100%
rename from Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures73.ly
rename to Eybler_SperateInDeo_HV41_Music_AdditionalMeasures73.ly
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily b/Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily
similarity index 100%
rename from Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily
rename to Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Choral.ly b/Eybler_SperateInDeo_HV41_Score_Choral.ly
similarity index 75%
rename from Eybler_Graduale_SperateInDeo_HV41_Score_Choral.ly
rename to Eybler_SperateInDeo_HV41_Score_Choral.ly
index f161f38323a995183058e28a970be014b236238e..36e516dfb1088acbe169edb2d21743c06eaffd4c 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Choral.ly
+++ b/Eybler_SperateInDeo_HV41_Score_Choral.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_ChoralScore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_ChoralScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Full.ly b/Eybler_SperateInDeo_HV41_Score_Full.ly
similarity index 75%
rename from Eybler_Graduale_SperateInDeo_HV41_Score_Full.ly
rename to Eybler_SperateInDeo_HV41_Score_Full.ly
index e5d840d83b9c376ad1c7d09ec0420d4fef399d76..fa8c5393ed9d84b2358db7c927f1ba19877d2af6 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Full.ly
+++ b/Eybler_SperateInDeo_HV41_Score_Full.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Long.ly b/Eybler_SperateInDeo_HV41_Score_Long.ly
similarity index 75%
rename from Eybler_Graduale_SperateInDeo_HV41_Score_Long.ly
rename to Eybler_SperateInDeo_HV41_Score_Long.ly
index 8fcd8f0b851288cc14519d1a6f558993e042f5e3..cd6a94c898e03807b4fb111cd78fb02e334d4e81 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Long.ly
+++ b/Eybler_SperateInDeo_HV41_Score_Long.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly b/Eybler_SperateInDeo_HV41_Score_Original.ly
similarity index 83%
rename from Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly
rename to Eybler_SperateInDeo_HV41_Score_Original.ly
index a6f7be53d6b898baf6c9c54a9872b88994c00ef1..1f38acaccc1c65670b2dba363b85625d81f2ebc8 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly
+++ b/Eybler_SperateInDeo_HV41_Score_Original.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.ly b/Eybler_SperateInDeo_HV41_Score_Vocal.ly
similarity index 75%
rename from Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.ly
rename to Eybler_SperateInDeo_HV41_Score_Vocal.ly
index 4878e60342f3b4cf508a62d77138ff5b3fd0877c..edb591adee28a9a27a1d7fd73ef5c1c0471ae305 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.ly
+++ b/Eybler_SperateInDeo_HV41_Score_Vocal.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_VocalScore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings_VocalScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
diff --git a/Eybler_SperateInDeo_HV41_Settings.ily b/Eybler_SperateInDeo_HV41_Settings.ily
new file mode 100644
index 0000000000000000000000000000000000000000..e9f51a2d750ac6e598aef154e0b0413f9cbd21e1
--- /dev/null
+++ b/Eybler_SperateInDeo_HV41_Settings.ily
@@ -0,0 +1,7 @@
+#(ly:set-option 'point-and-click #f)
+
+\include "deutsch.ly"
+
+\include "Eybler_SperateInDeo_HV41_Settings_Global.ily"
+\include "Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily"
+
diff --git a/Eybler_SperateInDeo_HV41_Settings_ChoralScore.ily b/Eybler_SperateInDeo_HV41_Settings_ChoralScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..5f6c7ca7f41730f66f77f733749fd40221d2a352
--- /dev/null
+++ b/Eybler_SperateInDeo_HV41_Settings_ChoralScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily b/Eybler_SperateInDeo_HV41_Settings_FullScore.ily
similarity index 79%
rename from Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily
rename to Eybler_SperateInDeo_HV41_Settings_FullScore.ily
index a217665d9c487db98460af1ff22090b597d8da4e..b9ec824ac8da57028394f8a1b332f5d30e018d13 100644
--- a/Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily
+++ b/Eybler_SperateInDeo_HV41_Settings_FullScore.ily
@@ -1,5 +1,5 @@
 \include "orchestrallily/oly_settings_fullscore.ily"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
+\include "Eybler_SperateInDeo_HV41_Settings.ily"
 
 GradualeSperateInDeoTimSettings = {
     \set Staff.fontSize = #-4
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily b/Eybler_SperateInDeo_HV41_Settings_Global.ily
similarity index 100%
rename from Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily
rename to Eybler_SperateInDeo_HV41_Settings_Global.ily
diff --git a/Eybler_SperateInDeo_HV41_Settings_Instrument.ily b/Eybler_SperateInDeo_HV41_Settings_Instrument.ily
new file mode 100644
index 0000000000000000000000000000000000000000..5cf455b023c01420600fc65655c3d6d20c5f6964
--- /dev/null
+++ b/Eybler_SperateInDeo_HV41_Settings_Instrument.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_SperateInDeo_HV41_Settings_VocalScore.ily b/Eybler_SperateInDeo_HV41_Settings_VocalScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..bd3930859436e343d1a596d9ffab1c7b8ba5848c
--- /dev/null
+++ b/Eybler_SperateInDeo_HV41_Settings_VocalScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Eybler_SperateInDeo_HV41_Settings.ily"
diff --git a/Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily b/Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily
new file mode 100644
index 0000000000000000000000000000000000000000..6d48eaf7d0cf833ece4563c4dd64bb6d26b93f7f
--- /dev/null
+++ b/Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalvoice.ily"
+\include "Eybler_SperateInDeo_HV41_Settings.ily"
diff --git a/Makefile b/Makefile
index 15dd0ae597cdc6417d0eb2d09765b565065d2730..b88fb5c33895c77689b6da0d184cc63b7d52ce25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 OUT=out
 
-base = Eybler_Graduale_SperateInDeo_HV41
-SRCS = Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily Eybler_Graduale_SperateInDeo_HV41_Settings.ily Eybler_Graduale_SperateInDeo_HV41_Settings_VocalScore.ily Eybler_Graduale_SperateInDeo_HV41_Settings_ChoralScore.ily Eybler_Graduale_SperateInDeo_HV41_Settings_VocalVoice.ily Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily $(base)_Settings.ily
+base = Eybler_SperateInDeo_HV41
+SRCS = Eybler_SperateInDeo_HV41_Settings_Global.ily Eybler_SperateInDeo_HV41_Settings.ily Eybler_SperateInDeo_HV41_Settings_VocalScore.ily Eybler_SperateInDeo_HV41_Settings_ChoralScore.ily Eybler_SperateInDeo_HV41_Settings_VocalVoice.ily Eybler_SperateInDeo_HV41_Settings_FullScore.ily Eybler_SperateInDeo_HV41_Settings_Instrument.ily Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily $(base)_Settings.ily
 instruments = ObI ObII FagI FagII CorI CorII 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_SperateInDeo_HV41
+texbase = Eybler_SperateInDeo_HV41
 texscores = Long Full Vocal Choral Original
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex b/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex
deleted file mode 100644
index a8eed7174a76e27b196302647c1e14b32865db12..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex
+++ /dev/null
@@ -1,14 +0,0 @@
-\frontmatter
-\maketitle
-
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex}
-\cleardoublepage
-\begin{preface}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex}
-\pagebreak
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex}
-\end{preface}
-
-\mainmatter
-\cleardoublepage
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex b/TeX_Eybler_SperateInDeo_HV41_Include_About.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_About.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex b/TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex b/TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex
similarity index 99%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex
index 639b9a03a13f94143aafbf712b472983bb6f597e..775afe1c04bfab871bfcfbfaef1cb5a65c315058 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex
+++ b/TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex
@@ -69,7 +69,7 @@ in Abbildung~\ref{Measures80f} reproduziert sind.
 
 \begin{figure*}[bt]
 \centering
-\includegraphics[width=17cm]{Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures}
+\includegraphics[width=17cm]{Eybler_SperateInDeo_HV41_Music_AdditionalMeasures}
 \caption{Die Takte 80 und 81 in der Abbildung sind in \cite{Aut,HS1} enthalten, 
 jedoch nachträglich ausgestrichen und nicht in den Druck \cite{TH5012,TH5015} 
 übernommen.}
@@ -198,7 +198,7 @@ abgedruckt.
 
 \begin{figure*}[btp]
 \centering
-\includegraphics[width=17cm]{Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures73}
+\includegraphics[width=17cm]{Eybler_SperateInDeo_HV41_Music_AdditionalMeasures73}
 \caption{Ausgestrichener Entwurf einer Chorfuge im Autograph \cite{Aut}.}
 \label{Measures73ff}
 \end{figure*}
diff --git a/TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex
new file mode 100644
index 0000000000000000000000000000000000000000..4b4e126cd4a5d869724dad6e82a2a40e41b8c4b5
--- /dev/null
+++ b/TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex
@@ -0,0 +1,14 @@
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex}
+\cleardoublepage
+\begin{preface}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_About.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Text.itex}
+\pagebreak
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex}
+\end{preface}
+
+\mainmatter
+\cleardoublepage
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Short.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Preface_Short.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Short.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Preface_Short.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Text.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Text.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex b/TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex
similarity index 100%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex
rename to TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Choral.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Choral.tex
similarity index 59%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Choral.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Choral.tex
index 30c4d5666d27f2eddb6ef6755cf92f833e199d04..971334b1ffce8b7009cbf68e076159c5b2aaf300 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Choral.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Choral.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \ChoralScoreType},
@@ -11,8 +11,8 @@
 \ChoralScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\ChoralScoreType}
@@ -20,5 +20,5 @@
 
 
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Full.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Full.tex
similarity index 54%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Full.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Full.tex
index 2ce984b1ac56badbe213e234489d8315eb52ca86..96e434df4a3e8fc738af3b5d29a624c99d45d790 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Full.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Full.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \FullScoreType},
@@ -11,8 +11,8 @@
 \FullScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\FullScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex
similarity index 85%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex
index 72e8395cf589ec084f8451d21d179036f95e0798..90dfa54b2fe61f5037d4fe983666965782dd0955 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
@@ -11,8 +11,8 @@
 \InstrumentalPartsSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\ContinuoName}
@@ -76,7 +76,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Long.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Long.tex
similarity index 54%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Long.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Long.tex
index 3c570b4b6b37960a1c351fbb8e2f66736f32c253..3ed3a677392021957c065342b97d6542dab1ebb1 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Long.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Long.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \LongScoreType},
@@ -11,8 +11,8 @@
 \LongScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\LongScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Original.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Original.tex
similarity index 56%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Original.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Original.tex
index 8e333c5da0980937883526d4751491924e4977f2..dcdbd11f0be67f3ab67f88f46eb697352a055ac1 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Original.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Original.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \OriginalScoreType},
@@ -11,8 +11,8 @@
 \OriginalScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\OriginalScoreType}
@@ -21,7 +21,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.tex b/TeX_Eybler_SperateInDeo_HV41_Score_Vocal.tex
similarity index 59%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.tex
rename to TeX_Eybler_SperateInDeo_HV41_Score_Vocal.tex
index 220eb43ed0f5921c773b548991770efd9b81456b..2a80d1ca32033db820c1858aa1f1acd24bce2465 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Vocal.tex
+++ b/TeX_Eybler_SperateInDeo_HV41_Score_Vocal.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage[vocalscore]{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \VocalScoreType},
@@ -11,8 +11,8 @@
 \VocalScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\VocalScoreType}
@@ -20,5 +20,5 @@
 
 
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Backpage.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex b/TeX_Eybler_SperateInDeo_HV41_Settings.itex
similarity index 86%
rename from TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex
rename to TeX_Eybler_SperateInDeo_HV41_Settings.itex
index 978d78c2a23ce788f42cd4ceb9c2147558b7a706..bd0b0e22a4962825de1e16b3d40f392dadc41633 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex
+++ b/TeX_Eybler_SperateInDeo_HV41_Settings.itex
@@ -9,7 +9,7 @@
 \year{2009}
 \scoreinfo{Urtext}
 
-\basename{Eybler_Graduale_SperateInDeo_HV41}
+\basename{Eybler_SperateInDeo_HV41}
 
 \newcommand{\scoreNumber}[1]{EK-1041-#1}
 \newcommand{\scoreTitle}{Joseph Eybler (1765-1846): Sperate in Deo}
@@ -19,4 +19,4 @@
     pdfauthor={Reinhold Kainhofer <reinhold@kainhofer.com>}
 }
 
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex}
+\input{TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex}
diff --git a/patches/Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily.patch b/patches/Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily.patch
deleted file mode 100644
index 4576a9c8d64ad1de1201c718cbc67af9a12bfc36..0000000000000000000000000000000000000000
--- a/patches/Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily.new	2009-10-01 11:58:42.000000000 +0200
-+++ Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily	2009-08-25 21:11:20.000000000 +0200
-@@ -1,2 +1,8 @@
- \include "orchestrallily/oly_settings_fullscore.ily"
- \include "Eybler_Graduale_SperateInDeo_HV41_Settings.ily"
-+
-+GradualeSperateInDeoTimSettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \GradualeSperateInDeoSettings 
-+}
diff --git a/patches/Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly.patch b/patches/Eybler_SperateInDeo_HV41_Instrument_Tim.ly.patch
similarity index 51%
rename from patches/Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly.patch
rename to patches/Eybler_SperateInDeo_HV41_Instrument_Tim.ly.patch
index c688717da66a7a28a95e3edfcd82e7812a0a77dc..f516650a03e551c114c48a1f6f7d07fa8a4abbb1 100644
--- a/patches/Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly.patch
+++ b/patches/Eybler_SperateInDeo_HV41_Instrument_Tim.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly.new	2009-10-01 11:58:42.000000000 +0200
-+++ Eybler_Graduale_SperateInDeo_HV41_Instrument_Tim.ly	2009-06-05 20:30:44.000000000 +0200
+--- Eybler_SperateInDeo_HV41_Instrument_Tim.ly.new	2009-10-01 11:58:42.000000000 +0200
++++ Eybler_SperateInDeo_HV41_Instrument_Tim.ly	2009-06-05 20:30:44.000000000 +0200
 @@ -5,6 +5,8 @@
    instrument = \TimInstrumentName
    scorenumber = \markup{\scoreNumber \TimNumber}
diff --git a/patches/Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch b/patches/Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch
similarity index 99%
rename from patches/Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch
rename to patches/Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch
index 5748d144828f343458914989a805c2e4935cc720..0d904da7968978c3efcf8ed0cead1e3e9477f517 100644
--- a/patches/Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch
+++ b/patches/Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.new	2009-10-01 11:58:42.000000000 +0200
-+++ Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily	2009-10-01 11:40:09.000000000 +0200
+--- Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily.new	2009-10-01 11:58:42.000000000 +0200
++++ Eybler_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily	2009-10-01 11:40:09.000000000 +0200
 @@ -1,156 +1,2053 @@
  \version "2.13.1"
  
diff --git a/patches/Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly.patch b/patches/Eybler_SperateInDeo_HV41_Score_Original.ly.patch
similarity index 65%
rename from patches/Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly.patch
rename to patches/Eybler_SperateInDeo_HV41_Score_Original.ly.patch
index 7dcfaf01978ba1d8c889a7a45b6c07efe7e51b58..293bbf70dc9e74289d376c15ec2f1e3a8c7d6d3f 100644
--- a/patches/Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly.patch
+++ b/patches/Eybler_SperateInDeo_HV41_Score_Original.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly.new	2009-10-01 11:58:42.000000000 +0200
-+++ Eybler_Graduale_SperateInDeo_HV41_Score_Original.ly	2009-10-01 11:59:43.000000000 +0200
+--- Eybler_SperateInDeo_HV41_Score_Original.ly.new	2009-10-01 11:58:42.000000000 +0200
++++ Eybler_SperateInDeo_HV41_Score_Original.ly	2009-10-01 11:59:43.000000000 +0200
 @@ -7,5 +7,8 @@
    scoretype = \OriginalScoreTitle
    scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
diff --git a/patches/Eybler_SperateInDeo_HV41_Settings_FullScore.ily.patch b/patches/Eybler_SperateInDeo_HV41_Settings_FullScore.ily.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4634d7b33236a05c92bd3cfa4314987b14409800
--- /dev/null
+++ b/patches/Eybler_SperateInDeo_HV41_Settings_FullScore.ily.patch
@@ -0,0 +1,11 @@
+--- Eybler_SperateInDeo_HV41_Settings_FullScore.ily.new	2009-10-01 11:58:42.000000000 +0200
++++ Eybler_SperateInDeo_HV41_Settings_FullScore.ily	2009-08-25 21:11:20.000000000 +0200
+@@ -1,2 +1,8 @@
+ \include "orchestrallily/oly_settings_fullscore.ily"
+ \include "Eybler_SperateInDeo_HV41_Settings.ily"
++
++GradualeSperateInDeoTimSettings = {
++    \set Staff.fontSize = #-4
++    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
++    \GradualeSperateInDeoSettings 
++}
diff --git a/patches/Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily.patch b/patches/Eybler_SperateInDeo_HV41_Settings_Global.ily.patch
similarity index 71%
rename from patches/Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily.patch
rename to patches/Eybler_SperateInDeo_HV41_Settings_Global.ily.patch
index c098709f6f13cfe88c47c977794b2b31fa2d3167..ed2f895616b7df48950e5de7dc44827541871c2b 100644
--- a/patches/Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily.patch
+++ b/patches/Eybler_SperateInDeo_HV41_Settings_Global.ily.patch
@@ -1,5 +1,5 @@
---- Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily.new	2009-10-01 11:58:42.000000000 +0200
-+++ Eybler_Graduale_SperateInDeo_HV41_Settings_Global.ily	2009-10-01 11:41:18.000000000 +0200
+--- Eybler_SperateInDeo_HV41_Settings_Global.ily.new	2009-10-01 11:58:42.000000000 +0200
++++ Eybler_SperateInDeo_HV41_Settings_Global.ily	2009-10-01 11:41:18.000000000 +0200
 @@ -16,7 +16,14 @@
  
  %% Possibly adjust the \orchestralScoreStructure here...
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_About.itex.patch
similarity index 95%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_About.itex.patch
index a3fa209517ceb3a74f83200f6223afd40f7a45c6..6ef5400e4e93971dbe87451d6bd0e2e9c1577e81 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_About.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex	2009-10-01 11:46:49.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_About.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_About.itex	2009-10-01 11:46:49.000000000 +0200
 @@ -2,9 +2,66 @@
  
  \begin{multicols}{2}
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex.patch
similarity index 60%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex.patch
index c02c93820f0a0ef5deebcf29b4830ae8e2133e84..ddd9ce774d4b9e80bcdb7ce420365cc5b6ead48f 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex.new	2009-10-01 12:03:11.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Bio.itex	2009-07-24 00:46:39.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex.new	2009-10-01 12:03:11.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_Bio.itex	2009-07-24 00:46:39.000000000 +0200
 @@ -1,14 +1 @@
 -\section*{Das Leben von Joseph Eybler}
 -
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch
similarity index 89%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch
index 6fb894015f04426aea9a71070f221d765f4315f1..1b637cf19d99b87ced9a9f04051708a8a61473db 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex	2009-09-24 15:59:12.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_ContentsMaterial.itex	2009-09-24 15:59:12.000000000 +0200
 @@ -15,12 +15,21 @@
  \scorelistbox{
  Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex.patch
similarity index 98%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex.patch
index 0bea77cd91e8c2a2bf21654c618fba4c93763ce5..4bd3dbbdd7d06b3ec37daa61f62e41c9195facc2 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex	2009-09-24 15:29:00.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_KritBericht.itex	2009-09-24 15:29:00.000000000 +0200
 @@ -12,124 +12,212 @@
  \newblock TODO
  
@@ -92,7 +92,7 @@
 +
 +\begin{figure*}[bt]
 +\centering
-+\includegraphics[width=17cm]{Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures}
++\includegraphics[width=17cm]{Eybler_SperateInDeo_HV41_Music_AdditionalMeasures}
 +\caption{Die Takte 80 und 81 in der Abbildung sind in \cite{Aut,HS1} enthalten, 
 +jedoch nachträglich ausgestrichen und nicht in den Druck \cite{TH5012,TH5015} 
 +übernommen.}
@@ -263,7 +263,7 @@
 +
 +\begin{figure*}[btp]
 +\centering
-+\includegraphics[width=17cm]{Eybler_Graduale_SperateInDeo_HV41_Music_AdditionalMeasures73}
++\includegraphics[width=17cm]{Eybler_SperateInDeo_HV41_Music_AdditionalMeasures73}
 +\caption{Ausgestrichener Entwurf einer Chorfuge im Autograph \cite{Aut}.}
 +\label{Measures73ff}
 +\end{figure*}
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Text.itex.patch
similarity index 83%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_Text.itex.patch
index db93a4fadead7e89972863070619675e7e83d61b..b64f37b77d7ba5e9031a3e28b19e9422ee1b3ac5 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Text.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex	2009-10-01 11:50:15.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_Text.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_Text.itex	2009-10-01 11:50:15.000000000 +0200
 @@ -1,10 +1,16 @@
 -\subsection*{Text des \q{Sperate in Deo}: TODO}
 +\subsection*{Text des \q{Sperate in Deo}: Ps 62(61),9(7)}
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex.patch
similarity index 88%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex.patch
index 9489908584d3d5a07e12420f74a38baa5dbc6bf0..c6b20f387f60e208aec3c5b61d27b34143f105a1 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Todo.itex	2009-08-25 21:11:20.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Include_Todo.itex	2009-08-25 21:11:20.000000000 +0200
 @@ -1,8 +1,35 @@
 -% \todos{
 -% \chapter*{Offene Fragen}
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex.patch
similarity index 87%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex.patch
index f72eddeca0f45f349b23d2f4f5580bf61d4037d3..35ebcbb8c162e364cd47c3fcc151b9c455ec7928 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex.patch
@@ -1,8 +1,8 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex	2009-07-31 21:35:26.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Score_Instruments.tex	2009-07-31 21:35:26.000000000 +0200
 @@ -14,85 +14,64 @@
- \input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Coverpage.itex}
- \input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Preface_Long.itex}
+ \input{TeX_Eybler_SperateInDeo_HV41_Include_Coverpage.itex}
+ \input{TeX_Eybler_SperateInDeo_HV41_Include_Preface_Long.itex}
  
 +\phantomsection
 +\addcontentsline{toc}{section}{\ContinuoName}
diff --git a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex.patch b/patches/TeX_Eybler_SperateInDeo_HV41_Settings.itex.patch
similarity index 75%
rename from patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex.patch
rename to patches/TeX_Eybler_SperateInDeo_HV41_Settings.itex.patch
index 38782b56a27a7e52a68cb8d7ab1012acedbeefe5..dc06d3b18b4dad498dea76a124e87ddbd03bc4b3 100644
--- a/patches/TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex.patch
+++ b/patches/TeX_Eybler_SperateInDeo_HV41_Settings.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex.new	2009-10-01 11:58:42.000000000 +0200
-+++ TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex	2009-10-01 11:58:27.000000000 +0200
+--- TeX_Eybler_SperateInDeo_HV41_Settings.itex.new	2009-10-01 11:58:42.000000000 +0200
++++ TeX_Eybler_SperateInDeo_HV41_Settings.itex	2009-10-01 11:58:27.000000000 +0200
 @@ -2,8 +2,8 @@
  \subtitle{Graduale, HV 41}
  \composer{Joseph Eybler}