diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_A.ly b/Eybler_FremitMare_HV92_Instrument_A.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_A.ly
rename to Eybler_FremitMare_HV92_Instrument_A.ly
index f6e4a377dc04133aad718112c11149cb04ab0419..9f5d078390a37f369b392be3c13264bc562b5af7 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_A.ly
+++ b/Eybler_FremitMare_HV92_Instrument_A.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily"
+\include "Eybler_FremitMare_HV92_Settings_VocalVoice.ily"
 
 \header {
   instrument = \AInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_B.ly b/Eybler_FremitMare_HV92_Instrument_B.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_B.ly
rename to Eybler_FremitMare_HV92_Instrument_B.ly
index cfa9c206b4c8163a3569aca74f788d31234efd8f..90106178973a6a75be0343526ebd6e652266e875 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_B.ly
+++ b/Eybler_FremitMare_HV92_Instrument_B.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily"
+\include "Eybler_FremitMare_HV92_Settings_VocalVoice.ily"
 
 \header {
   instrument = \BInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_Cl.ly b/Eybler_FremitMare_HV92_Instrument_Cl.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_Cl.ly
rename to Eybler_FremitMare_HV92_Instrument_Cl.ly
index 886458f338253a6a104e5bf09d58f2053714292f..69274738c41a3e627f9e09d2733b48abf2a50e8a 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_Cl.ly
+++ b/Eybler_FremitMare_HV92_Instrument_Cl.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \ClInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_ClI.ly b/Eybler_FremitMare_HV92_Instrument_ClI.ly
similarity index 100%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_ClI.ly
rename to Eybler_FremitMare_HV92_Instrument_ClI.ly
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_ClII.ly b/Eybler_FremitMare_HV92_Instrument_ClII.ly
similarity index 100%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_ClII.ly
rename to Eybler_FremitMare_HV92_Instrument_ClII.ly
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_Continuo.ly b/Eybler_FremitMare_HV92_Instrument_Continuo.ly
similarity index 70%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_Continuo.ly
rename to Eybler_FremitMare_HV92_Instrument_Continuo.ly
index cd0a160c4fe3a35fb6c265b73fbdc304f966a951..7e4077475160377baef598c18a0e2d3e5eb2aeb5 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_Continuo.ly
+++ b/Eybler_FremitMare_HV92_Instrument_Continuo.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \ContinuoInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_ObI.ly b/Eybler_FremitMare_HV92_Instrument_ObI.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_ObI.ly
rename to Eybler_FremitMare_HV92_Instrument_ObI.ly
index e090c1c7512d5811d5749df7fb059256e46de138..fe47b4619774962f60727897f5a2a617bcfc658e 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_ObI.ly
+++ b/Eybler_FremitMare_HV92_Instrument_ObI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \ObIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_ObII.ly b/Eybler_FremitMare_HV92_Instrument_ObII.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_ObII.ly
rename to Eybler_FremitMare_HV92_Instrument_ObII.ly
index f64858e962f68b6bbde316e44b8001b0e818ea96..8c57b4a996274c9ced6efa78fb8878732cb9100b 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_ObII.ly
+++ b/Eybler_FremitMare_HV92_Instrument_ObII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \ObIIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_S.ly b/Eybler_FremitMare_HV92_Instrument_S.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_S.ly
rename to Eybler_FremitMare_HV92_Instrument_S.ly
index 8cd2022f9e428cf632924e1ce8d20ca65126f38c..33f4611ade4ef2be2a528d14d395a79af42d49e6 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_S.ly
+++ b/Eybler_FremitMare_HV92_Instrument_S.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily"
+\include "Eybler_FremitMare_HV92_Settings_VocalVoice.ily"
 
 \header {
   instrument = \SInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_T.ly b/Eybler_FremitMare_HV92_Instrument_T.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_T.ly
rename to Eybler_FremitMare_HV92_Instrument_T.ly
index 551447fe086fc2b4e3eb7946e3099f9cc4fdf789..ff47ac73a547b926cef4f4360d9b9270343d387f 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_T.ly
+++ b/Eybler_FremitMare_HV92_Instrument_T.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily"
+\include "Eybler_FremitMare_HV92_Settings_VocalVoice.ily"
 
 \header {
   instrument = \TInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_Tim.ly b/Eybler_FremitMare_HV92_Instrument_Tim.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_Tim.ly
rename to Eybler_FremitMare_HV92_Instrument_Tim.ly
index c6f5955ffe8f866226293166c4643fd906abcc81..e688682e1824b17c5dade1b8e4807835852d4f89 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_Tim.ly
+++ b/Eybler_FremitMare_HV92_Instrument_Tim.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \TimInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_TrbI.ly b/Eybler_FremitMare_HV92_Instrument_TrbI.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_TrbI.ly
rename to Eybler_FremitMare_HV92_Instrument_TrbI.ly
index 44b65e9deca3cc04aacd58453f88f3af0778f62a..8ace1bcd8128456f9719f40d63ce209a8f5a990d 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_TrbI.ly
+++ b/Eybler_FremitMare_HV92_Instrument_TrbI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_TrbII.ly b/Eybler_FremitMare_HV92_Instrument_TrbII.ly
similarity index 69%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_TrbII.ly
rename to Eybler_FremitMare_HV92_Instrument_TrbII.ly
index 5999254229c7d9ed5a97520bb2f17d6d8376aedc..b3e58579f716c94cc2b373f95e79191c7774eb75 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_TrbII.ly
+++ b/Eybler_FremitMare_HV92_Instrument_TrbII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \TrbIIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_VI.ly b/Eybler_FremitMare_HV92_Instrument_VI.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_VI.ly
rename to Eybler_FremitMare_HV92_Instrument_VI.ly
index 333bebc042895c97f5e7c9877b22fcc22d9b5b81..1a54a67fc63b22c89fb8f9a93638fc0aa676de2f 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_VI.ly
+++ b/Eybler_FremitMare_HV92_Instrument_VI.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \VIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_VII.ly b/Eybler_FremitMare_HV92_Instrument_VII.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_VII.ly
rename to Eybler_FremitMare_HV92_Instrument_VII.ly
index 55e33d904f48d96b48b4f1c27084c10190a542a5..a2faaf68cd47dfefc46d0c58f6a057836cb7c3e9 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_VII.ly
+++ b/Eybler_FremitMare_HV92_Instrument_VII.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \VIIInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_Va.ly b/Eybler_FremitMare_HV92_Instrument_Va.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_Va.ly
rename to Eybler_FremitMare_HV92_Instrument_Va.ly
index 9af389056f80884d4ca4185ed5ce9ea9afa9c872..4c788613a629e081bcde6dddc290f9a288bc70f1 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_Va.ly
+++ b/Eybler_FremitMare_HV92_Instrument_Va.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \VaInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Instrument_VcB.ly b/Eybler_FremitMare_HV92_Instrument_VcB.ly
similarity index 68%
rename from Eybler_Offertorium_FremitMare_HV92_Instrument_VcB.ly
rename to Eybler_FremitMare_HV92_Instrument_VcB.ly
index f2419fc1ba3c338d1f313e9d7a7930906a025e6c..870706554a1a27a36fcbba6869b32861bd18998b 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Instrument_VcB.ly
+++ b/Eybler_FremitMare_HV92_Instrument_VcB.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings_Instrument.ily"
 
 \header {
   instrument = \VcBInstrumentName
diff --git a/Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily b/Eybler_FremitMare_HV92_Music_FremitMare.ily
similarity index 99%
rename from Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily
rename to Eybler_FremitMare_HV92_Music_FremitMare.ily
index 4166188fc436726040067f9e3920f0d9d0c3e22d..bf538cf813bbff7b5155e06830bfa39f64c4ae30 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily
+++ b/Eybler_FremitMare_HV92_Music_FremitMare.ily
@@ -1287,7 +1287,6 @@ FremitMareSMusic = \relative a' {
 }
 \addQuote "FremitMareSMusic" { \FremitMareSMusic }
 
-
 FremitMareSLyrics = \lyricmode {
    Fre -- mit ma -- re cum fu
     -- ro -- re, fre -- mit ma -- re cum fu -- ro -- re, coe -- lum un
@@ -2340,4 +2339,3 @@ FremitMareVcBMusic = \relative d {
 \addQuote "FremitMareVcBMusic" { \FremitMareVcBMusic }
 
 
-
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Choral.ly b/Eybler_FremitMare_HV92_Score_Choral.ly
similarity index 74%
rename from Eybler_Offertorium_FremitMare_HV92_Score_Choral.ly
rename to Eybler_FremitMare_HV92_Score_Choral.ly
index 99406a215a64d78b968832744b580ce1e5acf439..8687650d2e075f362caa69143c5951c8150247db 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Choral.ly
+++ b/Eybler_FremitMare_HV92_Score_Choral.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
+\include "Eybler_FremitMare_HV92_Settings_ChoralScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -9,4 +9,3 @@
 }
 
 \createScore #"FremitMare" #'("ChoralScore")
-
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Full.ly b/Eybler_FremitMare_HV92_Score_Full.ly
similarity index 57%
rename from Eybler_Offertorium_FremitMare_HV92_Score_Full.ly
rename to Eybler_FremitMare_HV92_Score_Full.ly
index 960e88c5aa95b2482068a2ff9cad927007ea66a5..3d3267c8023c60e501dbb274db795da3ab65c33f 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Full.ly
+++ b/Eybler_FremitMare_HV92_Score_Full.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
+\include "Eybler_FremitMare_HV92_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -8,5 +8,4 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createScore #"FremitMare" #'("FullScore")
-
+\createNoCuesScore #"FremitMare" #'("FullScore")
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Long.ly b/Eybler_FremitMare_HV92_Score_Long.ly
similarity index 52%
rename from Eybler_Offertorium_FremitMare_HV92_Score_Long.ly
rename to Eybler_FremitMare_HV92_Score_Long.ly
index f7e88a7453d1c6bf382256ef21793bd0e943388b..963d9cb67f5069613437582cba60f3e5288c9b4f 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Long.ly
+++ b/Eybler_FremitMare_HV92_Score_Long.ly
@@ -1,13 +1,11 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
+\include "Eybler_FremitMare_HV92_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
-#(set-global-staff-size 13)
 
 \header {
   scoretype = \LongScoreTitle
   scorenumber = \markup{\scoreNumber \LongScoreNumber}
 }
 
-\createScore #"FremitMare" #'("LongScore")
-
+\createNoCuesScore #"FremitMare" #'("LongScore")
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Original.ly b/Eybler_FremitMare_HV92_Score_Original.ly
similarity index 58%
rename from Eybler_Offertorium_FremitMare_HV92_Score_Original.ly
rename to Eybler_FremitMare_HV92_Score_Original.ly
index f52e65a11057abc87619eb3f45705e6c0462dea2..568d06415880d245e81dbee04d3e0b3f705d7cfd 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Original.ly
+++ b/Eybler_FremitMare_HV92_Score_Original.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
+\include "Eybler_FremitMare_HV92_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -8,5 +8,4 @@
   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
 }
 
-\createScore #"FremitMare" #'("OriginalScore")
-
+\createNoCuesScore #"FremitMare" #'("OriginalScore")
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Vocal.ly b/Eybler_FremitMare_HV92_Score_Vocal.ly
similarity index 74%
rename from Eybler_Offertorium_FremitMare_HV92_Score_Vocal.ly
rename to Eybler_FremitMare_HV92_Score_Vocal.ly
index cf9af3ae69fc4390330f002c9a9c9e8b6dcdc98a..c7dbb20a66c0be3f8f675d8b46e49e2f76cd54df 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Vocal.ly
+++ b/Eybler_FremitMare_HV92_Score_Vocal.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
+\include "Eybler_FremitMare_HV92_Settings_VocalScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -9,4 +9,3 @@
 }
 
 \createScore #"FremitMare" #'("VocalScore")
-
diff --git a/Eybler_FremitMare_HV92_Settings.ily b/Eybler_FremitMare_HV92_Settings.ily
new file mode 100644
index 0000000000000000000000000000000000000000..a349891d7df80d2f42a12df3c58f8488402ae3c0
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings.ily
@@ -0,0 +1,7 @@
+#(ly:set-option 'point-and-click #f)
+
+\include "deutsch.ly"
+
+\include "Eybler_FremitMare_HV92_Settings_Global.ily"
+\include "Eybler_FremitMare_HV92_Music_FremitMare.ily"
+
diff --git a/Eybler_FremitMare_HV92_Settings_ChoralScore.ily b/Eybler_FremitMare_HV92_Settings_ChoralScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..92e47dffa0f6e86c98fd9fb35d8abaf6a205b56a
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings_ChoralScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_FremitMare_HV92_Settings_FullScore.ily b/Eybler_FremitMare_HV92_Settings_FullScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..73f974f89f6fc64cefdb381117fa608a49a919f4
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings_FullScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_fullscore.ily"
+\include "Eybler_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily b/Eybler_FremitMare_HV92_Settings_Global.ily
similarity index 65%
rename from Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily
rename to Eybler_FremitMare_HV92_Settings_Global.ily
index 861bb085407408ac997edaf6745e63ad5e227185..780ebd7d14ceed9174b07223a7beba33c41fed3a 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily
+++ b/Eybler_FremitMare_HV92_Settings_Global.ily
@@ -1,32 +1,25 @@
 \version "2.13.1"
 
-\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_names.ily"
 
 scorenumber="EK-1092"
 
-\header { 
+\header {
   title = "Fremit mare cum furore"
   subtitle = "Offertorium, HV 92"
   composer = "Joseph Eybler (1765-1846)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { "2009, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."} 
+      \line { "2009, " \concat{\with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna},} \concat{\scorenumber.} "Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
 }
 
-% Possibly adjust the \orchestralScoreStructure here...
+%% Possibly adjust the \orchestralScoreStructure here...
 
-\layout {
-  \context { \Lyrics
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-  }
-}
-
-% Add custom keys here, e.g.
-% CorKey = \key g \major
-% CorIKey = \CorKey
-% CorIIKey = \CorKey
+%% Add custom keys here, e.g.
+%% CorKey = \key g \major
+%% CorIKey = \CorKey
+%% CorIIKey = \CorKey
 
 ClInstrumentName = \markup\concat{"Clarinetto in B / Si" \smaller\flat}
 TrbInstrumentName = \markup\concat{"Trombe in B / Si" \smaller\flat}
diff --git a/Eybler_FremitMare_HV92_Settings_Instrument.ily b/Eybler_FremitMare_HV92_Settings_Instrument.ily
new file mode 100644
index 0000000000000000000000000000000000000000..7815c589a1a871f0dc1aa4241fd67df024322aba
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings_Instrument.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_FremitMare_HV92_Settings_VocalScore.ily b/Eybler_FremitMare_HV92_Settings_VocalScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..0699ea7c76bd60b6aae9819ce542a286768ad739
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings_VocalScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Eybler_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_FremitMare_HV92_Settings_VocalVoice.ily b/Eybler_FremitMare_HV92_Settings_VocalVoice.ily
new file mode 100644
index 0000000000000000000000000000000000000000..e010415745e1c3afb38480e284b6ffe221995901
--- /dev/null
+++ b/Eybler_FremitMare_HV92_Settings_VocalVoice.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalvoice.ily"
+\include "Eybler_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_Offertorium_FremitMare_HV92_Score_Particell.ly b/Eybler_Offertorium_FremitMare_HV92_Score_Particell.ly
deleted file mode 100644
index ab47012d3ee36d1e3db33f665ead3c314b4a19f1..0000000000000000000000000000000000000000
--- a/Eybler_Offertorium_FremitMare_HV92_Score_Particell.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.13.1"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
-\setCreateMIDI ##t
-\setCreatePDF ##t
-
-\header {
-  scoretype = \ParticellTitle
-  scorenumber = \markup{\scoreNumber \ParticellNumber}
-}
-
-\createScore #"FremitMare" #'("Particell")
-
diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings.ily b/Eybler_Offertorium_FremitMare_HV92_Settings.ily
deleted file mode 100644
index 7a2d59eded760ba59c82cbd51ca0e9ab5bbe74be..0000000000000000000000000000000000000000
--- a/Eybler_Offertorium_FremitMare_HV92_Settings.ily
+++ /dev/null
@@ -1,8 +0,0 @@
-#(set-default-paper-size "a4")
-#(ly:set-option 'point-and-click #f)
-
-\include "deutsch.ly"
-
-\include "Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily"
-\include "Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily"
-
diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily b/Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily
deleted file mode 100644
index 7460d9f9cc751c16087c5b5023313f8ab8627355..0000000000000000000000000000000000000000
--- a/Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_fullscore.ily"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily b/Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily
deleted file mode 100644
index 7be261062fb8b92f9cf41bd21ae3c98a4e4bf2d0..0000000000000000000000000000000000000000
--- a/Eybler_Offertorium_FremitMare_HV92_Settings_Instrument.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings.ily"
diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily b/Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily
deleted file mode 100644
index 505fd39726cc253f6e6885649657e0dc1dc108cf..0000000000000000000000000000000000000000
--- a/Eybler_Offertorium_FremitMare_HV92_Settings_Vocal.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "orchestrallily/oly_settings_vocalvoice.ily"
-\include "Eybler_Offertorium_FremitMare_HV92_Settings.ily"
diff --git a/Makefile b/Makefile
index 9b33c691a2aed0c0312768c9535df88abf47fb9f..5c4d2f69df09a6fc5f359bf39bb0680fc68f6a83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,51 @@
-SRCS = Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily Eybler_Offertorium_FremitMare_HV92_Settings.ily
 OUT=out
 
+base = Eybler_FremitMare_HV92
+SRCS = Eybler_FremitMare_HV92_Settings_Global.ily Eybler_FremitMare_HV92_Settings.ily Eybler_FremitMare_HV92_Settings_VocalScore.ily Eybler_FremitMare_HV92_Settings_ChoralScore.ily Eybler_FremitMare_HV92_Settings_VocalVoice.ily Eybler_FremitMare_HV92_Settings_FullScore.ily Eybler_FremitMare_HV92_Settings_Instrument.ily Eybler_FremitMare_HV92_Music_FremitMare.ily $(base)_Settings.ily
 instruments = ObI ObII Cl TrbI TrbII Tim VI VII Va S A T B Continuo VcB
-scores = Full Long Vocal Particell Choral Original
+scores = Long Full Vocal Choral Original
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
 
-pdfs = $(instruments:%=$(OUT)/Eybler_Offertorium_FremitMare_HV92_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_Offertorium_FremitMare_HV92_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_Offertorium_FremitMare_HV92_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_Eybler_Offertorium_FremitMare_HV92_Score_%.pdf) $(OUT)/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.pdf
 
+texbase = Eybler_FremitMare_HV92
+texscores = Long Full Vocal Choral Original
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
+     $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
+
+
+additionalscores = 
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex 
 instruments: $(instruments)
 scores: $(scores)
 
-clean: 
+
+clean:
 	rm -rf $(OUT)
 
-$(OUT) : 
+$(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_Offertorium_FremitMare_HV92_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_Offertorium_FremitMare_HV92_Score_%.pdf $(SRCS)
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
-$(OUT)/%.pdf : %.ly $(SRCS)
+
+$(OUT)/%.pdf : %.ly
 	lilypond -o $(basename $@) $<
 
 $(OUT)/%.mp3 : %.midi
 	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
-tex: latex
-latex: $(texpdfs)
+$(additionalscores): $(OUT)/%.pdf: %.ly
+	lilypond -dbackend=eps -o $(basename $@) $<
+
+tex: $(additionalscores) latex
+latex: $(pdfs) $(texpdfs)
+latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
 	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex b/TeX_Eybler_FremitMare_HV92_Include_About.itex
similarity index 70%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex
rename to TeX_Eybler_FremitMare_HV92_Include_About.itex
index e163082927bfdf9c940b9fc21855a3a49f391234..4f6cf69999345257f69fbb4366c76891ad98f100 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex
+++ b/TeX_Eybler_FremitMare_HV92_Include_About.itex
@@ -1,9 +1,10 @@
 \addcontentsline{toc}{section}{Vorwort / Preface}
-\chapter*{Vorwort / Preface}
 
 \begin{multicols}{2}
+\prefacesection{Vorwort}
 TODO
 \columnbreak
+\prefacesection{Preface}
 TODO
 \end{multicols}
 \vfill
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex b/TeX_Eybler_FremitMare_HV92_Include_Backpage.itex
similarity index 100%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Backpage.itex
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex b/TeX_Eybler_FremitMare_HV92_Include_Bio.itex
similarity index 100%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Bio.itex
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex b/TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex
similarity index 99%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
rename to TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex
index 755b749c614cae1b009191a73453978d0426642d..f4dfadd6504e1dc1b3b1250876e8a9b3945bd77a 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex
@@ -58,3 +58,4 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
+
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex b/TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex
similarity index 100%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex
diff --git a/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex b/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex
new file mode 100644
index 0000000000000000000000000000000000000000..a7ae2eae363a637e9b230267bb0537198e4f8f56
--- /dev/null
+++ b/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex
@@ -0,0 +1,238 @@
+\footnotesize
+\chapter*{Quellen und Lesarten}
+\addcontentsline{toc}{section}{Quellen und Lesarten}
+
+\begin{multicols}{2}
+\subsection*{Quellen:}
+
+\begin{thebibliography}{AA}
+
+\bibitem[A]{Aut}
+Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
+\newblock TODO
+
+\bibitem[B]{HS1}
+   AutorIn              Eybler, Joseph von
+   Titel                Offertorium Nr.6' "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, Herrmann 93
+   Fussnote             Titel auf Umschlag:
+   Fussnote             Nro 6/ Offertorium/ Fremit mare/ a/ Soprano Concerto, e Clarinetto Concerto/ 4 Voci Ripieni/ 2 Violini. Viole. 2 Oboe/ 2 Tromboni. 2 Clarini, e Timpani/ Fagotto, Violoncello e Violone/ Organo. M.D.Cella:/ Del Sig: Giuseppe Eybler/ Vice Maestro della Caplla della Imp:le/ in Vienna.
+   Fussnote             Ms,1814a,wm: GFA, einköpfiger Adler.
+   Fussnote             parts: 1Ssol,3S,5A,5T,5B,3vl1,3vl2,1vla1+2,1vlc+vlne,1vlne,1ob1,1ob2, 1clno1,1clno2,1trb1,1trb2,1timp,1org,1MDC, b) (1824, Schreiber: Perschl): 1Ssol,1vlc+vlne,1cl1,1cl2,1fag1+2.
+   Fussnote             Particell, 18fol.; Schreiber: Frühwald, wm: VF (1821)
+   Fussnote             "Fremit mare"
+   Fussnote             Solo:S,cl; Chor:S,A,T,B,2vl,vla,vlc,vlne,2ob,2fag,2clno,2trb,timp,org.
+   Fussnote             W:Hbk VIII/ 96a
+   1.Signatur           HK.2525 Mus
+   1.SW-Kette           Musikhandschrift /
+
+\bibitem[C]{Druck}
+   AutorIn              Eybler, Joseph von
+   Titel                Herrmann 93. Offertorium "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, 10 Stimmen. Wien, chem. Druckerei, Nr. 2137
+   1.Signatur           HK.2525 Mus
+
+\bibitem[D]{THSti}
+Originalausgabe (Stimmen), Wien, Tobias Haslinger, T.H.TODO, Reihe Musica Sacra, erschienen TODO.
+\newblock Titel:
+\begin{sourcetitle}
+TODO
+Offertorium\sbreak
+(Tui sunt coeli, et tua est terra)\sbreak
+für 4 Singstimmen,\sbreak
+2 Violinen, Viola, Violoncello und Contrabass,\sbreak
+2 Clarinetten, 2 Fagotte, 2 Hörner, 2 Trompeten,\sbreak
+Pauken und Orgel\sbreak
+von\sbreak
+JOS. EYBLER,\sbreak
+k.k. erstem Hofkapellmeister.\sbreak
+\textnumero. 4.\sbreak
+\textnumero 5248 --- Eigenthum des Verlegers. --- Preis \preisfrac{fl 2.\_ C.M.}{{\em[Rthl]}\,1.8\,gr.}\sbreak
+Wien, bei Tobias Haslinger,\sbreak
+Musikverleger,\sbreak
+im Hause der ersten österr. Sparkasse.
+\end{sourcetitle}
+\newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung,
+Signatur: TODO
+
+
+\end{thebibliography}
+
+\subsection*{Quellendiskussion}
+
+Als Primärquellen dieser Ausgabe dienen der Autograph \cite{Aut},
+der handschriftliche Stimmensatz der Hofkapelle \cite{HS1} (laut obigen
+Aufführungsdaten dürfte die Uraufführung mit diesem Material stattgefunden
+haben und der Stimmensatz von Eybler selbst in der Hofkapelle benutzt
+worden sein) sowie die von Eybler autorisierten und korrigierten Drucke
+\cite{THPart,THSti} bei Tobias Haslinger.
+
+Bei Unterschieden stimmen meist jeweils die Einzelstimmen \cite{HS1,THSti}
+sowie die Partituren \cite{Aut,THPart} überein. So sind etwa klassische
+Abschreibfehler in \cite{HS1} oft in den Druck der Einzelstimme
+übernommen, nicht jedoch in die Partitur.
+Dies lässt vermuten, dass der Autograph \cite{Aut} die unmittelbare Druckvorlage
+für die Partitur \cite{THPart} und der handschriftliche Stimmensatz \cite{HS1}
+für die Stimmen \cite{THSti} darstellen.
+
+Als einzige autographe Quelle erhält der Autograph entsprechend den
+höchsten Stellenwert, die restlichen Quellen erhalten aber beinahe denselben
+Wert als ebenfalls von Eybler benutzte Quellen.
+Entsprechende Unterschiede werden in den  Einzelbemerkungen diskutiert.
+
+TODO
+
+
+\subsubsection*{Allgemeine Bemerkungen}
+
+Diese Ausgabe versucht das Stück so nahe wie möglich an die Notation und
+Intentionen Eyblers zurückzuführen, an manchen Stellen unterscheidet sich jedoch
+die moderne Notationspraxis von der Notation Eyblers. Konkret wurden (strichliert
+gekennzeichnete) Melismabögen in allen Vokalstimmen ergänzt, wenn eine Silbe
+auf mehrere Noten zu singen ist. Ergänzte Dynamikangaben und sonstige
+Ergänzungen (abgesehen von Warnakzidenzien) des Herausgebers sind
+in eckige Klammern gesetzt bzw. strichliert gedruckt und in den Einzelbemerkungen
+aufgeführt, ebenso sind alle Unterschiede zum Autograph \cite{Aut} (auch
+wenn sie durch eine oder alle anderen Quellen eindeutig belegt werden)
+gekennzeichnet. Unterschiede in den Quellen werden -- wenn die Version des
+Autographs übernommen wurde -- nicht explizit gekennzeichnet, allerdings
+in den Einzelbemerkungen erwähnt.
+
+Notenschlüssel und die Stimmung von transponierenden Instrumenten wurden
+an den modernen Usus angepasst.
+
+
+\paragraph*{Vokalstimmen, Text und Melismen}
+
+\begin{enumerate}
+\item Alle Quellen vernachlässigen zahlreiche Beistrich. Die
+vorliegende Ausgabe setzt (ohne weitere Kennzeichnung) Beistriche und Punkte
+dort, wo sie grammatikalisch korrekt sind.
+
+\item In den Vokalstimmen sind in allen Quellen \cite{Aut,HS1,THPart,THSti}
+Melismen teilweise nicht durch die moderne Konvention eines
+Bogens gekennzeichnet. Folgende Bögen wurden gemäß der modernen
+Konvention zur visuellen Verdeutlichung von Melismen ergänzt:
+TODO
+
+Bögen, die sich nicht im Autograph finden, sind strichliert ergänzt.
+
+\item In den Vokalstimmen sind in allen Quellen \cite{Aut,HS1,THPart,THSti} teilweise
+Legatobögen an Stellen gesetzt, wo keine Melismen stattfinden. Die
+vorliegende Ausgabe unterbricht die Bögen wie von der Silbenzuteilung vorgegeben
+und hält sich nicht an die (für Sänger ungewohnte) Version der ursprünglichen
+Ausgabe. Dies ist der Fall an folgenden Stellen:
+TODO
+
+\item In den Vokalstimmen sind bei zahlreichen durch einen Balken verbundenen
+Achtelnoten in der Partitur \cite{THPart} zusätzlich Bögen gesetzt, in den
+Einzelstimmen \cite{THSti}, den hs. Stimmen \cite{HS1} und dem Autograph
+\cite{Aut} jedoch nicht.
+Diese  Bögen werden nicht übernommen in den Takten TODO.
+
+\end{enumerate}
+
+
+
+
+
+\paragraph*{Akzidenzien}
+
+\begin{enumerate}
+\item Warnakzidenzien sind gemäß dem Autograph \cite{Aut} gesetzt, jedenfalls
+sind Auflösungszeichen im folgenden Takt aber immer gesetzt (ohne Kennzeichnung).
+Außerdem werden in den Quellen tw. Akzidenzien nicht neu gesetzt, wenn der
+neue Takt mit derselben versetzten Note beginnt. Diese Akzidenzien werden in
+der vorliegenden Ausgabe ohne weitere Kennzeichnung ergänzt.
+
+\item In den Quellen sind tw. Akzidenzien nicht
+gesetzt, wenn im selben Takt bereits in einer anderen Oktav vorhanden:
+\begin{itemize}
+\item[\cite{Aut}:] TODO
+\item[\cite{HS1}:] TODO
+\item[\cite{THPart}:] TODO
+\item[\cite{THSti}:] TODO
+\end{itemize}
+Diese Akzidenzien werden in der vorliegenden Ausgabe konsistent ohne
+Kennzeichnung ergänzt.
+
+\item Ebenso sind tw. Akzidenzien in einem neuen Takt nicht
+wiederholt, wenn der vorhergehende Takt mit derselben versetzten Note geendet
+hat. Diese Akzidenzien wurden nach moderner Konvention konsistent ergänzt:
+TODO
+
+\end{enumerate}
+
+
+
+
+\paragraph*{Diverses}
+
+\begin{enumerate}
+\item Bögen über Vierergruppen sind in den Handschriften \cite{Aut,HS1} oft
+undeutlich nur über drei Noten gesetzt, vor allem wenn die erste Note einer
+Vierergruppe einen Triller erhält. Wenn die Intention einer gebundenen
+Vierergruppe in zumindest einer der Quellen eindeutig zu erkennen ist und der
+Bogen im Autograph vorkommt, wird ohne weitere Kennzeichnung ein Bogen über
+die gesamte Gruppe gesetzt.
+
+\item In den beiden Partituren \cite{Aut,THPart} sind zahlreiche
+Instrumentalstimme in colla-parte mit anderen Instrumenten oder Vokalstimmen
+(V2 mit V1, Va mit VcB/Org, etc.) mittels Faulenzer notiert. Die vorliegende
+Ausgabe schreibt die entsprechenden Passagen explizit aus.
+
+\item Die Triller-Erweiterungsinien in den Pauken sind in der vorliegenden
+Ausgabe vereinheitlich und nur auf mehreren gebundenen Noten mit Triller
+gesetzt. Teilweise sind in den Quellen auch bei Trillern auf einer einzigen
+Note Erweiterungslinien eingezeichnet, teilweise auch bei Trillern über
+gebundenen Noten keine Linien.
+
+\item Die verschiedenen Quellen benutzen tw. Tremolo-Schreibweise für
+aufeinanderfolgende Achtel- oder Sechzehntelnoten derselben Tonhöhe in den
+Streicherstimmen. Die vorliegende Ausgabe hält sich dabei an den Autograph
+und benutzt diese Notation in denselben Takten wie der Autograph \cite{Aut}.
+
+\end{enumerate}
+
+
+\subsubsection*{Einzelbemerkungen}
+
+
+
+\begin{vergleich}
+TODO
+\end{vergleich}
+
+
+
+\end{multicols}
+
+
+\section*{Danksagung}
+\begin{multicols}{2}
+An dieser Stelle sei all jenen Personen und Institutionen gedankt, ohne die die
+vorliegende Ausgabe nicht möglich gewesen wäre. Zum einen sei dabei der
+Musiksammlung der \href{http://www.onb.ac.at/}{Österreichischen Nationalbibliothek}
+für die unbürokratische Benutzung des riesigen Fundus und den
+Bediensteten für ihr stetiges Entgegenkommen in allen Belangen herzlich gedankt.
+%
+Zum anderen wäre eine Urtext-Ausgabe nicht möglich ohne Zugang zum Autograph,
+der im Archiv des \href{http://www.schottenstift.at/}{Wiener Schottenstifts}
+verwahrt ist. Dabei sei Herrn Dr. Martin Czernin, Archivar des Schottenstifts,
+herzlich gedankt für die Möglichkeit der Einsichtnahme in und des
+Quellenvergleichs mit dem Originalautograph Eyblers.
+%
+Auch \href{http://www.koscielny.eu/}{Christoph Koscielny}, einem weiteren
+Bewunderer Eyblers, sei für zahlreiche Diskussionen, Hinweise und
+Hilfestellungen sehr gedankt.
+
+Der Noten- und Textsatz dieser Ausgabe wurde vollständig in freier Software
+erstellt, wobei für den Notensatz LilyPond 2.13
+(\url{http://www.lilypond.org/}) zum Einsatz kam in Verbindung mit den
+OrchestralLily Paket (\url{http://reinhold.kainhofer.com/orchestrallily/}) des
+Editors. Der Textsatz und die Erstellung der druckfertigen Dateien erfolgte
+schließlich mit \LaTeX. Die unglaubliche Qualität und Flexibilität dieser
+beiden Programme sowie die tolle LilyPond-Community haben einen enormen Beitrag
+zu dieser Ausgabe geliefert.
+
+Und zu guter Letzt sei noch meiner Freundin Ana Aleksic herzlich gedankt für
+ihr Verständnis während der Erstellung dieser Ausgabe.
+\end{multicols}
diff --git a/TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex b/TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex
new file mode 100644
index 0000000000000000000000000000000000000000..f067a72a515ff46fa7c4078a599abff2742f3f3f
--- /dev/null
+++ b/TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex
@@ -0,0 +1,14 @@
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\begin{preface}
+\input{TeX_Eybler_FremitMare_HV92_Include_About.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Text.itex}
+\pagebreak
+\input{TeX_Eybler_FremitMare_HV92_Include_Bio.itex}
+\end{preface}
+
+\mainmatter
+\cleardoublepage
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Short.itex b/TeX_Eybler_FremitMare_HV92_Include_Preface_Short.itex
similarity index 100%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Short.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Preface_Short.itex
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex b/TeX_Eybler_FremitMare_HV92_Include_Text.itex
similarity index 61%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Text.itex
index ee47693c6e73eb76e1e103c7ad99c863204f25dc..d9eb1769b5347ea9016d664e7ae898905c6e2756 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
+++ b/TeX_Eybler_FremitMare_HV92_Include_Text.itex
@@ -1,15 +1,11 @@
 \subsection*{Text des \q{Fremit mare cum furore}: TODO}
 
-\begin{small}
+\begin{lyricstext}
 
-\subsection*{FremitMare}
-\nopagebreak
 \begin{lyricstable}
-TODO & TODO & TODO \\[0.5em]
-
+TODO & TODO & TODO \\\\[0.5em]
  & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)}
 \end{lyricstable}
 
-
-\end{small}
+\end{lyricstext}
 
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Todo.itex b/TeX_Eybler_FremitMare_HV92_Include_Todo.itex
similarity index 52%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Include_Todo.itex
rename to TeX_Eybler_FremitMare_HV92_Include_Todo.itex
index 65ff2603479ad42964e0d4a3b476085925383c0a..21a48eb0bcfe57c9bc523596a2dc3144a4bc08c5 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Todo.itex
+++ b/TeX_Eybler_FremitMare_HV92_Include_Todo.itex
@@ -1,10 +1,8 @@
 % \todos{
 % \chapter*{Offene Fragen}
-% 
-% \section*{Literaturvergleich mit dem Autograph:}
+%
 % \begin{itemize}
-% \item 
-% 
+% \item
+%
 % \end{itemize}
-% 
 % }
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Choral.tex b/TeX_Eybler_FremitMare_HV92_Score_Choral.tex
new file mode 100644
index 0000000000000000000000000000000000000000..f9a3b2e0cf3714e77b0e59779cc686461ad8f760
--- /dev/null
+++ b/TeX_Eybler_FremitMare_HV92_Score_Choral.tex
@@ -0,0 +1,24 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \ChoralScoreType},
+}
+
+\scoretype{\ChoralScoreType}
+\scorenumber{\scoreNumber\ChoralScoreNumber}
+\ChoralScoreSettings
+
+\begin{document}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
+
+\phantomsection
+\addcontentsline{toc}{section}{\ChoralScoreType}
+\includescore{Score_Choral}
+
+
+
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex b/TeX_Eybler_FremitMare_HV92_Score_Full.tex
similarity index 50%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex
rename to TeX_Eybler_FremitMare_HV92_Score_Full.tex
index cec3e2df603e868c28024d916da5d7823c32078e..b6ac6ebb2e6fcd8ea8d5db7cbe57d4ce61015e9a 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Full.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \FullScoreType},
@@ -11,15 +11,17 @@
 \FullScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
 
+\phantomsection
+\addcontentsline{toc}{section}{\FullScoreType}
 \includescore{Score_Full}
 
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex b/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
similarity index 82%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
rename to TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
index 5990540f432bfd1781c3e839daae615b66ac7397..949bd16775694a933d5799a1d4cf3b1c2503cf61 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
@@ -11,8 +11,8 @@
 \InstrumentalPartsSettings
 
 \begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
 
 \phantomsection
 \addcontentsline{toc}{section}{\ContinuoName}
@@ -67,7 +67,7 @@
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex b/TeX_Eybler_FremitMare_HV92_Score_Long.tex
similarity index 50%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex
rename to TeX_Eybler_FremitMare_HV92_Score_Long.tex
index ea23a6e5637f3972083cfc7364eb90126a657bd0..c991aee7eea87c484ff439260535b8d3445af8a6 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Long.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \LongScoreType},
@@ -11,15 +11,17 @@
 \LongScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
 
+\phantomsection
+\addcontentsline{toc}{section}{\LongScoreType}
 \includescore{Score_Long}
 
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.tex b/TeX_Eybler_FremitMare_HV92_Score_Original.tex
similarity index 51%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.tex
rename to TeX_Eybler_FremitMare_HV92_Score_Original.tex
index d485f545cfb7f3022d88bb498834c0dfe71b978d..4a199351847b53d5f782e25ac4bb6feac8204247 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Original.tex
@@ -1,6 +1,6 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
 \usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \OriginalScoreType},
@@ -11,15 +11,17 @@
 \OriginalScoreSettings
 
 \begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
 
+\phantomsection
+\addcontentsline{toc}{section}{\OriginalScoreType}
 \includescore{Score_Original}
 
 \cleardoublepage
 \backmatter
 \appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex}
 
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex b/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex
new file mode 100644
index 0000000000000000000000000000000000000000..500065163648b04f0e1571c0552d1d65dc75f8b4
--- /dev/null
+++ b/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex
@@ -0,0 +1,24 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage[vocalscore]{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \VocalScoreType},
+}
+
+\scoretype{\VocalScoreType}
+\scorenumber{\scoreNumber\VocalScoreNumber}
+\VocalScoreSettings
+
+\begin{document}
+\input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
+
+\phantomsection
+\addcontentsline{toc}{section}{\VocalScoreType}
+\includescore{Score_Vocal}
+
+
+
+\input{TeX_Eybler_FremitMare_HV92_Include_Backpage.itex}
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex b/TeX_Eybler_FremitMare_HV92_Settings.itex
similarity index 84%
rename from TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
rename to TeX_Eybler_FremitMare_HV92_Settings.itex
index 1cc56b8d2ae61b6edcc945a55542f1c5974ea333..f991a401e8bcc6d8484339da7621122248022968 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
+++ b/TeX_Eybler_FremitMare_HV92_Settings.itex
@@ -1,15 +1,15 @@
-\composer{Joseph Eybler}
-\composerdate{(1765-1846)}
 \title{Fremit mare cum furore}
 \subtitle{Offertorium, HV 92}
+\composer{Joseph Eybler}
+\composerdate{(1765-1846)}
 % \description{Für Chor (SATB) und Orgel oder Orchester}
 % \instrumentation{2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
 \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
-\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
 \year{2009}
 \scoreinfo{Urtext}
 
-\basename{Eybler_Offertorium_FremitMare_HV92}
+\basename{Eybler_FremitMare_HV92}
 
 \newcommand{\scoreNumber}[1]{EK-1092-#1}
 \newcommand{\scoreTitle}{Joseph Eybler (1765-1846): Fremit mare cum furore}
@@ -19,4 +19,4 @@
     pdfauthor={Reinhold Kainhofer <reinhold@kainhofer.com>}
 }
 
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Todo.itex}
+\input{TeX_Eybler_FremitMare_HV92_Include_Todo.itex}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex
deleted file mode 100644
index 3bb7d0183abc76269c18d7afa7b3a6396be834eb..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex
+++ /dev/null
@@ -1,68 +0,0 @@
-\footnotesize
-\chapter*{Quellen und Lesarten}
-\addcontentsline{toc}{section}{Quellen und Lesarten}
-
-\begin{multicols}{2}
-\subsection*{Quellen:}
-
-\begin{thebibliography}{AA}
-
-\bibitem[A]{Aut}
-Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
-\newblock TODO
-
-\bibitem[B]{HS1}
-   AutorIn              Eybler, Joseph von
-   Titel                Offertorium Nr.6' "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, Herrmann 93
-   Fussnote             Titel auf Umschlag:
-   Fussnote             Nro 6/ Offertorium/ Fremit mare/ a/ Soprano Concerto, e Clarinetto Concerto/ 4 Voci Ripieni/ 2 Violini. Viole. 2 Oboe/ 2 Tromboni. 2 Clarini, e Timpani/ Fagotto, Violoncello e Violone/ Organo. M.D.Cella:/ Del Sig: Giuseppe Eybler/ Vice Maestro della Caplla della Imp:le/ in Vienna.
-   Fussnote             Ms,1814a,wm: GFA, einköpfiger Adler.
-   Fussnote             parts: 1Ssol,3S,5A,5T,5B,3vl1,3vl2,1vla1+2,1vlc+vlne,1vlne,1ob1,1ob2, 1clno1,1clno2,1trb1,1trb2,1timp,1org,1MDC, b) (1824, Schreiber: Perschl): 1Ssol,1vlc+vlne,1cl1,1cl2,1fag1+2.
-   Fussnote             Particell, 18fol.; Schreiber: Frühwald, wm: VF (1821)
-   Fussnote             "Fremit mare"
-   Fussnote             Solo:S,cl; Chor:S,A,T,B,2vl,vla,vlc,vlne,2ob,2fag,2clno,2trb,timp,org.
-   Fussnote             W:Hbk VIII/ 96a
-   1.Signatur           HK.2525 Mus
-   1.SW-Kette           Musikhandschrift /
-
-\bibitem[C]{Druck}
-   AutorIn              Eybler, Joseph von
-   Titel                Herrmann 93. Offertorium "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, 10 Stimmen. Wien, chem. Druckerei, Nr. 2137
-   1.Signatur           HK.2525 Mus
-
-\bibitem[D]{TODO}
-Originalausgabe (Partitur), ORT, VERLAG, BESCHREIBUNG, erschienen TODO. 
-\newblock Titel: 
-\begin{sourcetitle}
-TITEL\sbreak
-ETC.
-\end{sourcetitle}
-\newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung, Signatur: TODO
-
-
-\end{thebibliography}
-
-DISKUSSION DER QUELLEN
-
-
-
-\subsubsection*{Allgemeine Bemerkungen}
-
-
-\begin{enumerate}
-\item
-TODO
-\end{enumerate}
-
-
-\subsubsection*{Einzelbemerkungen}
-
-\subsubsection*{FremitMare}
-
-\begin{vergleich}
-TODO
-\end{vergleich}
-
-
-
-\end{multicols}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex
deleted file mode 100644
index 5cab52cc5fded1fd8b39c00db010b08d380bf13a..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex
+++ /dev/null
@@ -1,12 +0,0 @@
-\frontmatter
-\maketitle
-
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
-\cleardoublepage
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
-\pagebreak
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
-
-\mainmatter
-\cleardoublepage
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.tex
deleted file mode 100644
index 12e9c9681e5299c4d07eb2f31a2c0dc7adac3db6..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
-
-\hypersetup{
-    pdftitle={\scoreTitle, \ChoralScoreType},
-}
-
-\scoretype{\ChoralScoreType}
-\scorenumber{\scoreNumber\ChoralScoreNumber}
-\ChoralScoreSettings
-
-\begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
-
-\includescore{Score_Choral}
-
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
-
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
-\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.tex
deleted file mode 100644
index 8e2048044b0dc91488965511f27606e7ed269e1c..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
-
-\hypersetup{
-    pdftitle={\scoreTitle, \ParticellScoreType},
-}
-
-\scoretype{\ParticellScoreType}
-\scorenumber{\scoreNumber\ParticellScoreNumber}
-\ParticellScoreSettings
-
-\begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
-
-\includescore{Score_Particell}
-
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
-
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
-\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.tex
deleted file mode 100644
index fb44759b0efcd75f169b573c77b37288c92aea5c..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
-
-\hypersetup{
-    pdftitle={\scoreTitle, \VocalScoreType},
-}
-
-\scoretype{\VocalScoreType}
-\scorenumber{\scoreNumber\VocalScoreNumber}
-\VocalScoreSettings
-
-\begin{document}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Coverpage.itex}
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
-
-\includescore{Score_Vocal}
-
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
-
-\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Backpage.itex}
-\end{document}
diff --git a/patches/Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily.patch b/patches/Eybler_FremitMare_HV92_Music_FremitMare.ily.patch
similarity index 99%
rename from patches/Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily.patch
rename to patches/Eybler_FremitMare_HV92_Music_FremitMare.ily.patch
index 4a08bef8b4f24ce6dc2cb667e344b6713ae5cdc1..04bac1bff1fece90db63be98b485cd52f5fe771e 100644
--- a/patches/Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily.patch
+++ b/patches/Eybler_FremitMare_HV92_Music_FremitMare.ily.patch
@@ -1,6 +1,6 @@
---- Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily.new	2009-07-31 20:12:10.000000000 +0200
-+++ Eybler_Offertorium_FremitMare_HV92_Music_FremitMare.ily	2009-05-24 17:50:24.000000000 +0200
-@@ -2,105 +2,2342 @@
+--- Eybler_FremitMare_HV92_Music_FremitMare.ily.new	2009-10-01 14:06:09.000000000 +0200
++++ Eybler_FremitMare_HV92_Music_FremitMare.ily	2009-10-01 14:02:07.000000000 +0200
+@@ -2,133 +2,2339 @@
  
  FremitMarePieceName = "FremitMare"
  FremitMarePieceNameTacet = "FremitMare tacet"
@@ -27,12 +27,10 @@
 +FremitMareTimeSignatureIV = \FremitMareTimeSignature
  
  FremitMareSettings = \notemode {
-   \tempo \FremitMareTempo 
--%   \partial 4
+-  \tempo \FremitMareTempo
++  \tempo \FremitMareTempo 
  }
  
--FremitMareObIMusic = \relative c' {
--  % TODO
 +FremitMareSettingsII = \notemode {
 +  \tempo \FremitMareTempoII
 +}
@@ -45,7 +43,10 @@
 +  \FremitMareTimeSignatureIV
 +}
 +FremitMareSettingsV = \notemode {}
-+
+ 
+-FremitMareObIMusic = \relative c' {
+-  s8
+-  % TODO
 +
 +FremitMareObIMusic = \relative d'' {
 +    d1\f | % 2
@@ -144,9 +145,10 @@
  }
  \addQuote "FremitMareObIMusic" { \FremitMareObIMusic }
  
+ 
 -FremitMareObIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareObIIMusic = \relative f' {
 +    f1\f | % 2
 +    d'1 | % 3
@@ -244,9 +246,10 @@
  }
  \addQuote "FremitMareObIIMusic" { \FremitMareObIIMusic }
  
+ 
 -FremitMareClMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareClMusic = \relative c'' {
 +    \transposition b
 +    R1*79 | \barNumberCheck #80
@@ -301,9 +304,10 @@
  }
  \addQuote "FremitMareClMusic" { \FremitMareClMusic }
  
+ 
 -FremitMareTrbIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareTrbIMusic = \relative e' {
 +    \transposition b
 +    e4\f r4 e4 r4 | % 2
@@ -365,9 +369,10 @@
  }
  \addQuote "FremitMareTrbIMusic" { \FremitMareTrbIMusic }
  
+ 
 -FremitMareTrbIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareTrbIIMusic = \relative e' {
 +    \transposition b
 +    e4\f r4 e4 r4 | % 2
@@ -429,10 +434,11 @@
  }
  \addQuote "FremitMareTrbIIMusic" { \FremitMareTrbIIMusic }
  
+ 
 -FremitMareTimMusic = \relative c' {
+-  s8
 -  % TODO
 +
-+
 +FremitMareTimMusic = \relative d {
 +    d4\f r4 d4 r4 | % 2
 +    d4 d4 d4 r4 | % 3
@@ -494,9 +500,10 @@
  }
  \addQuote "FremitMareTimMusic" { \FremitMareTimMusic }
  
+ 
 -FremitMareVIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareVIMusic = \relative d' {
 +    d16\f[ a16( h16 cis16] d16[ e16 f16 e16)] d16[ a16( h16 cis16] d16[ e16 f16 e16)] | % 2 
 +    d16([ e16 f16 e16)] d16([ e16 f16 e16)] d16([ e16 f16 g16)] a16([ f16 e16 d16)] | % 3
@@ -704,9 +711,10 @@
  }
  \addQuote "FremitMareVIMusic" { \FremitMareVIMusic }
  
+ 
 -FremitMareVIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareVIIMusic = \relative a {
 +    <a d>2:16\f <a d>2:16 | % 2
 +    <a d>2:16 <a d>2:16 | % 3
@@ -914,9 +922,10 @@
  }
  \addQuote "FremitMareVIIMusic" { \FremitMareVIIMusic }
  
+ 
 -FremitMareVaMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareVaMusic = \relative f {
 +    f2:16\f f2:16 | % 2
 +    f2:16 f2:16 | % 3
@@ -1136,8 +1145,6 @@
  }
  \addQuote "FremitMareVaMusic" { \FremitMareVaMusic }
  
--FremitMareSMusic = \relative c' {
--  % TODO
 +% TODO:
 +PartPNineVoiceTwo =  \relative f' {
 +    s1*4 s1*4 s1*4 s1*5 s1*4 s1*4
@@ -1176,7 +1183,10 @@
 +    a4\! r8 a8 h8[ cis8 d8 cis8] s8*25 | \barNumberCheck #190
 +    s2.\< s4*9\! s8*39 s8*7\> s4*9\! \bar "|."
 +}
-+
+ 
+-FremitMareSMusic = \relative c' {
+-  s8
+-  % TODO
 +
 +FremitMareSMusic = \relative a' {
 +    R1*16 | % 17
@@ -1312,7 +1322,6 @@
  }
  \addQuote "FremitMareSMusic" { \FremitMareSMusic }
  
-+
  FremitMareSLyrics = \lyricmode {
 -  % TODO
 +   Fre -- mit ma -- re cum fu
@@ -1341,9 +1350,10 @@
 +    spe, so -- la spe. 
  }
  
+ 
 -FremitMareAMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareAMusic = \relative a' {
 +    R1*16 | % 17
 +    r2 r4 a8\f a8 | % 18
@@ -1478,9 +1488,10 @@
 +    so -- la spe, so -- la spe. 
  }
  
+ 
 -FremitMareTMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareTMusic = \relative a {
 +    R1*16 | % 17
 +    r2 r4 a8\f a8 | % 18
@@ -1615,9 +1626,10 @@
 +    -- la spe. 
  }
  
+ 
 -FremitMareBMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareBMusic = \relative a {
 +    R1*16 | % 17
 +    r2 r4 a8\f a8 | % 18
@@ -1750,9 +1762,10 @@
 +    vam ad -- huc so -- la spe, so -- la spe, so -- la spe. 
  }
  
+ 
 -FremitMareContinuoMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +FremitMareOIaMusic = \relative f {
 +    <f a d>4\f r4 <f a d>4 r4 | % 2
 +    <f a d>4 <f a d>4 <f a d>4 r4 | % 3
@@ -1958,11 +1971,8 @@
 +    <a d fis>4 r4 r2 | % 199
 +    <a d fis>4\pp r4 <a d fis>4 r4 | \barNumberCheck #200
 +    <a d fis>2 r2 \bar "|."
- }
--\addQuote "FremitMareContinuoMusic" { \FremitMareContinuoMusic }
- 
--FremitMareVcBMusic = \relative c' {
--  % TODO
++}
++
 +FremitMareOIIaMusic = \relative d {
 +    d4 r8 \grace { a16([ h16 cis16)] } d4 r8 r4 | % 2
 +    \grace { a16([ h16 cis16)] } d4 d4 d4 r4 | % 3
@@ -2168,10 +2178,14 @@
 +    d4 r4 r2 | % 199
 +    d4 r4 d4 r4 | \barNumberCheck #200
 +    d2 r2 \bar "|."
-+}
+ }
+-\addQuote "FremitMareContinuoMusic" { \FremitMareContinuoMusic }
 +% \addQuote "FremitMareOrganMusic" { \FremitMareOrganMusic }
-+
-+
+ 
+ 
+-FremitMareVcBMusic = \relative c' {
+-  s8
+-  % TODO
 +FremitMareVcBMusic = \relative d {
 +    d4\f r8
 +    \grace { a16([ h16 cis16)] } d4 r8 r4 | % 2
@@ -2382,5 +2396,3 @@
  }
  \addQuote "FremitMareVcBMusic" { \FremitMareVcBMusic }
  
- 
-+
diff --git a/patches/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily.patch b/patches/Eybler_FremitMare_HV92_Settings_Global.ily.patch
similarity index 59%
rename from patches/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily.patch
rename to patches/Eybler_FremitMare_HV92_Settings_Global.ily.patch
index 592b2b794bb798a43fc6b3ab2146600824f19ebe..4e4b712eafac81cc2a0084bd36c5bb3f0293b229 100644
--- a/patches/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily.patch
+++ b/patches/Eybler_FremitMare_HV92_Settings_Global.ily.patch
@@ -1,9 +1,9 @@
---- Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily.new	2009-07-31 20:12:10.000000000 +0200
-+++ Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily	2009-06-22 15:54:45.000000000 +0200
-@@ -27,3 +27,13 @@
- % CorKey = \key g \major
- % CorIKey = \CorKey
- % CorIIKey = \CorKey
+--- Eybler_FremitMare_HV92_Settings_Global.ily.new	2009-10-01 14:06:09.000000000 +0200
++++ Eybler_FremitMare_HV92_Settings_Global.ily	2009-10-01 14:06:41.000000000 +0200
+@@ -20,3 +20,13 @@
+ %% CorKey = \key g \major
+ %% CorIKey = \CorKey
+ %% CorIIKey = \CorKey
 +
 +ClInstrumentName = \markup\concat{"Clarinetto in B / Si" \smaller\flat}
 +TrbInstrumentName = \markup\concat{"Trombe in B / Si" \smaller\flat}
diff --git a/patches/Eybler_Offertorium_FremitMare_HV92_Score_Long.ly.patch b/patches/Eybler_Offertorium_FremitMare_HV92_Score_Long.ly.patch
deleted file mode 100644
index 8dab028e6d1609657e175affd6a0d46d803ec724..0000000000000000000000000000000000000000
--- a/patches/Eybler_Offertorium_FremitMare_HV92_Score_Long.ly.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Eybler_Offertorium_FremitMare_HV92_Score_Long.ly.new	2009-07-31 20:12:10.000000000 +0200
-+++ Eybler_Offertorium_FremitMare_HV92_Score_Long.ly	2009-07-31 20:05:18.000000000 +0200
-@@ -2,6 +2,7 @@
- \include "Eybler_Offertorium_FremitMare_HV92_Settings_FullScore.ily"
- \setCreateMIDI ##t
- \setCreatePDF ##t
-+#(set-global-staff-size 13)
- 
- \header {
-   scoretype = \LongScoreTitle
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Include_Bio.itex.patch b/patches/TeX_Eybler_FremitMare_HV92_Include_Bio.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7a701393db9c3b22d9ff00bc1902bcf8528e92bc
--- /dev/null
+++ b/patches/TeX_Eybler_FremitMare_HV92_Include_Bio.itex.patch
@@ -0,0 +1,18 @@
+--- TeX_Eybler_FremitMare_HV92_Include_Bio.itex.new	2009-10-01 14:06:09.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Include_Bio.itex	2009-07-24 00:46:47.000000000 +0200
+@@ -1,14 +1 @@
+-\section*{Das Leben von Joseph Eybler}
+-
+-\begin{multicols}{2}
+-TODO
+-\end{multicols}
+-
+-\section*{The life of Joseph Eybler}
+-
+-\begin{multicols}{2}
+-TODO
+-\end{multicols}
+-
+-Quellen / Sources:\\[0em]
+-TODO
++\input{../../Komponisten/Eybler/TeX_Eybler_Include_Biografie.itex}
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..73561272de944547c903d9858e9b75b08fee93a4
--- /dev/null
+++ b/patches/TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex.patch
@@ -0,0 +1,58 @@
+--- TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex.new	2009-10-01 14:06:09.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Include_ContentsMaterial.itex	2009-10-01 14:03:34.000000000 +0200
+@@ -15,36 +15,39 @@
+ \scorelistbox{
+ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+ 
++% \FullScoreName{} (-\FullScoreNumber),
+ \LongScoreName{} (-\LongScoreNumber),
+-\FullScoreName{} (-\FullScoreNumber),
+ \VocalScoreName{} (-\VocalScoreNumber),
+-\ChoralScoreName{} (-\ChoralScoreNumber),
+-\OriginalScoreName{} (-\OriginalScoreNumber);
++\ParticellScoreName{} (-\ParticellScoreNumber),
++\ChoralScoreName{} (-\ChoralScoreNumber);
++% \OriginalScoreName{} (-\OriginalScoreNumber),
+ 
++\SName{} (-\SNumber),
++\AName{} (-\ANumber),
++\TName{} (-\TNumber),
++\BName{} (-\BNumber);
++
++\InstrumentsName{} (-\InstrumentsNumber),
++\ContinuoName{} (-\ContinuoNumber),
++\VIName{} (-\VINumber),
++\VIIName{} (-\VIINumber),
++\VaName{} (-\VaNumber),
++\VcBName{} (-\VcBNumber),
+ \ObIName{} (-\ObINumber),
+ \ObIIName{} (-\ObIINumber),
+ \ClName{} (-\ClNumber),
+ \TrbIName{} (-\TrbINumber),
+ \TrbIIName{} (-\TrbIINumber),
+-\TimName{} (-\TimNumber),
+-\VIName{} (-\VINumber),
+-\VIIName{} (-\VIINumber),
+-\VaName{} (-\VaNumber),
+-\SName{} (-\SNumber),
+-\AName{} (-\ANumber),
+-\TName{} (-\TNumber),
+-\BName{} (-\BNumber),
+-\ContinuoName{} (-\ContinuoNumber),
+-\VcBName{} (-\VcBNumber).
+-
++\TimName{} (-\TimNumber).
+ }
+ \end{center}
+ 
+ \vfill
+ \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+ \begin{hauptquellen}
+-\item TODO: Fremit mare cum furore, Autograph. TODO.
+-\item TODO: Fremit mare cum furore, Originalausgabe (Partitur), Verlag, Ort, Jahr.
++\item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
++\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: HK.2525 Mus.
++\item Offertorium \q{Fremit mare} (d), Originalausgabe, chem. Druckerei, Wien, 1814. Stimmensatz (Nr. 2137).
+ \end{hauptquellen}
+ 
+ \vfill
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex.patch b/patches/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e52bd3fe3d0f4dd1a9a834a0d7d529366afb3119
--- /dev/null
+++ b/patches/TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex.patch
@@ -0,0 +1,81 @@
+--- TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex.new	2009-10-01 14:06:09.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Include_KritBericht.itex	2009-10-01 14:03:55.000000000 +0200
+@@ -12,61 +12,23 @@
+ \newblock TODO
+ 
+ \bibitem[B]{HS1}
+-Handschriftlicher Stimmensatz (aus dem Hofmusikkapellenarchiv) im Besitz der
+-Musiksammlung der Österreichischen Nationalbibliothek (Signatur: HK TODO Mus);
+-Sämtliches Material ist aufbewahrt zwischen zwei Pappdeckeln:
+-\begin{sourcetitle}
+-TODO
+-\textnumero 21\sbreak
+-Offertorium in C\sbreak
+-de Nativitate Domini nostri J.Chr.\sbreak
+-a\sbreak
+-4 Voci\sbreak
+-2 Violini\sbreak
+-Viola\sbreak
+-2 Clarinetti\sbreak
+-2 Corni\sbreak
+-2 Fagotti\sbreak
+-Clarini e Tympani\sbreak
+-con\sbreak
+-Organo e Violone.\sbreak
+-Del Sig\textsuperscript{re} Gius. Eybler, M.di C.\textsuperscript{la} di Corte I. e R.\sbreak
+-1827.\sbreak
+-Part. 40.
+-\end{sourcetitle}
+-TODO Aufführungsdaten auf Umschlags-Innenseite: Erster Eintrag
+-\q{TODO}, letzter Eintrag \q{TODO}
+-
+-Vollständiger Stimmensatz von einer Hand (TODO, Schreiber Perschl\footnote{lt. Katalog der
+-ÖNB; selber Schreiber wie des Großteils des
+-Bestandes des ehem. Hofmusikkapellen-Archivs.}):
+-5 S, 5 A, 5 T, 5 B; 3 Vl.1, 3 Vl.2, Va, Vc, Vlne, Vc+Cb; Cl.1, Cl.2, Fg. 1+2
+-(auf einer Akkolade mit zwei Systemen); Cor.1, Cor.2, Clno.1, Clno.2; Tym; Org.; M.D.C.;
+-
+-Alle Stimmen mit \q{K.k.Hofmusikkapellen=\textbar{}Archiv}
+-gestempelt und großteils am Ende des Stückes versehen mit \q{Jos. Eybler comp. 1827}.
+-
+-
+-\bibitem[C]{THPart}
+-Originalausgabe (Partitur), Wien, Tobias Haslinger, T.H.TODO, TODO S., Reihe Musica Sacra, erschienen TODO.
+-\newblock Titel:
+-\begin{sourcetitle}
+-TODO
+-OFFERTORIUM\sbreak
+-von\sbreak
+-Joseph Eybler\sbreak
+-k.k. erstem Hofcapellmeister.\sbreak
+-\textnumero 5245 --- \textnumero TODO --- Preis \preisfrac{f 1.30 C.M.}{{\em[Rthl.]} 1.\_ gr.}\sbreak
+-Partitur\sbreak
+-WIEN, BEI TOBIAS HASLINGER,\sbreak
+-Musikverleger,\sbreak
+-am Graben \textnumero 572 im Hause der ersten oesterr. Sparkasse.\sbreak
+-Warsow Scrips. Pfoehl sculps.
+-\end{sourcetitle}
+-\newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung,
+-Signatur: TODO
+-
+-
++   AutorIn              Eybler, Joseph von
++   Titel                Offertorium Nr.6' "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, Herrmann 93
++   Fussnote             Titel auf Umschlag:
++   Fussnote             Nro 6/ Offertorium/ Fremit mare/ a/ Soprano Concerto, e Clarinetto Concerto/ 4 Voci Ripieni/ 2 Violini. Viole. 2 Oboe/ 2 Tromboni. 2 Clarini, e Timpani/ Fagotto, Violoncello e Violone/ Organo. M.D.Cella:/ Del Sig: Giuseppe Eybler/ Vice Maestro della Caplla della Imp:le/ in Vienna.
++   Fussnote             Ms,1814a,wm: GFA, einköpfiger Adler.
++   Fussnote             parts: 1Ssol,3S,5A,5T,5B,3vl1,3vl2,1vla1+2,1vlc+vlne,1vlne,1ob1,1ob2, 1clno1,1clno2,1trb1,1trb2,1timp,1org,1MDC, b) (1824, Schreiber: Perschl): 1Ssol,1vlc+vlne,1cl1,1cl2,1fag1+2.
++   Fussnote             Particell, 18fol.; Schreiber: Frühwald, wm: VF (1821)
++   Fussnote             "Fremit mare"
++   Fussnote             Solo:S,cl; Chor:S,A,T,B,2vl,vla,vlc,vlne,2ob,2fag,2clno,2trb,timp,org.
++   Fussnote             W:Hbk VIII/ 96a
++   1.Signatur           HK.2525 Mus
++   1.SW-Kette           Musikhandschrift /
++
++\bibitem[C]{Druck}
++   AutorIn              Eybler, Joseph von
++   Titel                Herrmann 93. Offertorium "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, 10 Stimmen. Wien, chem. Druckerei, Nr. 2137
++   1.Signatur           HK.2525 Mus
+ 
+ \bibitem[D]{THSti}
+ Originalausgabe (Stimmen), Wien, Tobias Haslinger, T.H.TODO, Reihe Musica Sacra, erschienen TODO.
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch b/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b8df66514e6cd7ef431b25c82b816ea87293f9ff
--- /dev/null
+++ b/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch
@@ -0,0 +1,100 @@
+--- TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.new	2009-10-01 14:06:10.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Score_Instruments.tex	2009-10-01 14:04:51.000000000 +0200
+@@ -14,72 +14,54 @@
+ \input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
+ \input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
+ 
+-
+-
+-
+-
+-
+-\phantomsection
+-\addcontentsline{toc}{section}{\ObIName}
+-\includescore{Instrument_ObI}
+-
+ \phantomsection
+-\addcontentsline{toc}{section}{\ObIIName}
+-\includescore{Instrument_ObII}
++\addcontentsline{toc}{section}{\ContinuoName}
++\includescore{Instrument_Continuo}
+ 
+ \phantomsection
+-\addcontentsline{toc}{section}{\ClName}
+-\includescore{Instrument_Cl}
+-
++\addcontentsline{toc}{section}{\SName}
++\includescore{Instrument_S}
+ \phantomsection
+-\addcontentsline{toc}{section}{\TrbIName}
+-\includescore{Instrument_TrbI}
+-
++\addcontentsline{toc}{section}{\AName}
++\includescore{Instrument_A}
+ \phantomsection
+-\addcontentsline{toc}{section}{\TrbIIName}
+-\includescore{Instrument_TrbII}
+-
++\addcontentsline{toc}{section}{\TName}
++\includescore{Instrument_T}
+ \phantomsection
+-\addcontentsline{toc}{section}{\TimName}
+-\includescore{Instrument_Tim}
++\addcontentsline{toc}{section}{\BName}
++\includescore{Instrument_B}
+ 
+ \phantomsection
+ \addcontentsline{toc}{section}{\VIName}
+ \includescore{Instrument_VI}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\VIIName}
+ \includescore{Instrument_VII}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\VaName}
+ \includescore{Instrument_Va}
+-
+ \phantomsection
+-\addcontentsline{toc}{section}{\SName}
+-\includescore{Instrument_S}
++\addcontentsline{toc}{section}{\VcBName}
++\includescore{Instrument_VcB}
+ 
+ \phantomsection
+-\addcontentsline{toc}{section}{\AName}
+-\includescore{Instrument_A}
+-
++\addcontentsline{toc}{section}{\ObIName}
++\includescore{Instrument_ObI}
+ \phantomsection
+-\addcontentsline{toc}{section}{\TName}
+-\includescore{Instrument_T}
+-
++\addcontentsline{toc}{section}{\ObIIName}
++\includescore{Instrument_ObII}
+ \phantomsection
+-\addcontentsline{toc}{section}{\BName}
+-\includescore{Instrument_B}
+-
++\addcontentsline{toc}{section}{\ClName}
++\includescore{Instrument_Cl}
+ \phantomsection
+-\addcontentsline{toc}{section}{\ContinuoName}
+-\includescore{Instrument_Continuo}
+-
++\addcontentsline{toc}{section}{\TrbIName}
++\includescore{Instrument_TrbI}
+ \phantomsection
+-\addcontentsline{toc}{section}{\VcBName}
+-\includescore{Instrument_VcB}
+-
+-
++\addcontentsline{toc}{section}{\TrbIIName}
++\includescore{Instrument_TrbII}
++\phantomsection
++\addcontentsline{toc}{section}{\TimName}
++\includescore{Instrument_Tim}
+ 
+ 
+ \cleardoublepage
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Settings.itex.patch b/patches/TeX_Eybler_FremitMare_HV92_Settings.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..da1e50432af11c319e7d416b45372e04dbf872af
--- /dev/null
+++ b/patches/TeX_Eybler_FremitMare_HV92_Settings.itex.patch
@@ -0,0 +1,13 @@
+--- TeX_Eybler_FremitMare_HV92_Settings.itex.new	2009-10-01 14:06:09.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Settings.itex	2009-10-01 14:05:46.000000000 +0200
+@@ -2,8 +2,8 @@
+ \subtitle{Offertorium, HV 92}
+ \composer{Joseph Eybler}
+ \composerdate{(1765-1846)}
+-% \description{Per Coro (SATB) ed Organo o Orchestra}
+-% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)}
++% \description{Für Chor (SATB) und Orgel oder Orchester}
++% \instrumentation{2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
+ \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+ \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+ \year{2009}
diff --git a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex.patch
deleted file mode 100644
index 57c78792552d3ff1f4176d9f27fb61d78b764cc5..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex.new	2009-08-02 13:25:42.000000000 +0200
-+++ TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex	2009-08-01 22:52:51.000000000 +0200
-@@ -15,37 +15,40 @@
- \scorelistbox{
- Zu diesem Werk liegt folgendes Aufführungsmaterial vor:
- 
--\FullScoreName{} (\scoreNumber\FullScoreNumber),
-+% \FullScoreName{} (\scoreNumber\FullScoreNumber),
- \LongScoreName{} (\scoreNumber\LongScoreNumber),
- \VocalScoreName{} (\scoreNumber\VocalScoreNumber),
- \ParticellScoreName{} (\scoreNumber\ParticellScoreNumber),
--\ChoralScoreName{} (\scoreNumber\ChoralScoreNumber),
--\OriginalScoreName{} (\scoreNumber\OriginalScoreNumber),
-+\ChoralScoreName{} (\scoreNumber\ChoralScoreNumber);
-+% \OriginalScoreName{} (\scoreNumber\OriginalScoreNumber),
-+
-+\SName{} (\scoreNumber\SNumber),
-+\AName{} (\scoreNumber\ANumber),
-+\TName{} (\scoreNumber\TNumber),
-+\BName{} (\scoreNumber\BNumber);
-+
- \InstrumentsName{} (\scoreNumber\InstrumentsNumber),
-+\ContinuoName{} (\scoreNumber\ContinuoNumber),
-+\VIName{} (\scoreNumber\VINumber),
-+\VIIName{} (\scoreNumber\VIINumber),
-+\VaName{} (\scoreNumber\VaNumber),
-+\VcBName{} (\scoreNumber\VcBNumber),
- \ObIName{} (\scoreNumber\ObINumber),
- \ObIIName{} (\scoreNumber\ObIINumber),
- \ClName{} (\scoreNumber\ClNumber),
- \TrbIName{} (\scoreNumber\TrbINumber),
- \TrbIIName{} (\scoreNumber\TrbIINumber),
--\TimName{} (\scoreNumber\TimNumber),
--\VIName{} (\scoreNumber\VINumber),
--\VIIName{} (\scoreNumber\VIINumber),
--\VaName{} (\scoreNumber\VaNumber),
--\SName{} (\scoreNumber\SNumber),
--\AName{} (\scoreNumber\ANumber),
--\TName{} (\scoreNumber\TNumber),
--\BName{} (\scoreNumber\BNumber),
--\ContinuoName{} (\scoreNumber\ContinuoNumber),
--\VcBName{} (\scoreNumber\VcBNumber),
--
-+\TimName{} (\scoreNumber\TimNumber).
- }
- \end{center}
- 
- \vfill
- \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
--\begin{thebibliography}{TODO}
--\bibitem[TODO]{TODOPartitur} TODO: Fremit mare cum furore, Originalausgabe (Partitur), Verlag, Ort, Jahr.
--\end{thebibliography}
-+\begin{itemize}
-+\item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
-+\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: HK.2525 Mus.
-+\item Offertorium \q{Fremit mare} (d), Originalausgabe, chem. Druckerei, Wien, 1814. Stimmensatz (Nr. 2137).
-+\end{itemize}
- 
- \vfill
- 
diff --git a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex.patch b/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex.patch
deleted file mode 100644
index c3c4bd22fb46aa04c39c36a9d00a63eff6f75d60..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex.new	2009-08-02 13:25:42.000000000 +0200
-+++ TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex	2009-08-02 13:25:35.000000000 +0200
-@@ -11,8 +11,27 @@
- Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
- \newblock TODO
- 
--\bibitem[B]{TODO}
--Originalausgabe (Stimmen), ORT, VERLAG, BESCHREIBUNG, erschienen TODO. 
-+\bibitem[B]{HS1}
-+   AutorIn              Eybler, Joseph von
-+   Titel                Offertorium Nr.6' "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, Herrmann 93
-+   Fussnote             Titel auf Umschlag:
-+   Fussnote             Nro 6/ Offertorium/ Fremit mare/ a/ Soprano Concerto, e Clarinetto Concerto/ 4 Voci Ripieni/ 2 Violini. Viole. 2 Oboe/ 2 Tromboni. 2 Clarini, e Timpani/ Fagotto, Violoncello e Violone/ Organo. M.D.Cella:/ Del Sig: Giuseppe Eybler/ Vice Maestro della Caplla della Imp:le/ in Vienna.
-+   Fussnote             Ms,1814a,wm: GFA, einköpfiger Adler.
-+   Fussnote             parts: 1Ssol,3S,5A,5T,5B,3vl1,3vl2,1vla1+2,1vlc+vlne,1vlne,1ob1,1ob2, 1clno1,1clno2,1trb1,1trb2,1timp,1org,1MDC, b) (1824, Schreiber: Perschl): 1Ssol,1vlc+vlne,1cl1,1cl2,1fag1+2.
-+   Fussnote             Particell, 18fol.; Schreiber: Frühwald, wm: VF (1821)
-+   Fussnote             "Fremit mare"
-+   Fussnote             Solo:S,cl; Chor:S,A,T,B,2vl,vla,vlc,vlne,2ob,2fag,2clno,2trb,timp,org.
-+   Fussnote             W:Hbk VIII/ 96a
-+   1.Signatur           HK.2525 Mus
-+   1.SW-Kette           Musikhandschrift /
-+
-+\bibitem[C]{Druck}
-+   AutorIn              Eybler, Joseph von
-+   Titel                Herrmann 93. Offertorium "Fremit mare" (d) für Sopransolo, Chor, Orchester u. Orgel, 10 Stimmen. Wien, chem. Druckerei, Nr. 2137
-+   1.Signatur           HK.2525 Mus
-+
-+\bibitem[D]{TODO}
-+Originalausgabe (Partitur), ORT, VERLAG, BESCHREIBUNG, erschienen TODO. 
- \newblock Titel: 
- \begin{sourcetitle}
- TITEL\sbreak
diff --git a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex.patch b/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex.patch
deleted file mode 100644
index 350849c29a60e38b94e59110ae1fb248a91fa903..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex.new	2009-07-31 20:12:10.000000000 +0200
-+++ TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex	2009-07-23 20:45:24.000000000 +0200
-@@ -1,14 +1 @@
--\section*{Das Leben von Joseph Eybler (1765-1846)}
--
--\begin{multicols}{2}
--TODO
--\end{multicols}
--
--\section*{The life of Joseph Eybler (1765-1846)}
--
--\begin{multicols}{2}
--TODO
--\end{multicols}
--
--Quellen / Sources:\\[0em]
--TODO
-+\input{../../Komponisten/Eybler/TeX_Eybler_Include_Biografie.itex}