diff --git a/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly b/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly
index ce432cd450d5b546cb8f16ea065adf0f56ca35b2..a77c968e88689ffb5d42bb993ad448128ee50ce3 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly
@@ -1,5 +1,5 @@
 \version "2.13.1"
-\include "Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily"
+\include "Eybler_OmnesDeSabaVenient_HV40_Settings_VocalVoice.ily"
 
 \header {
   instrument = \SSoloInstrumentName
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily b/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily
index 3a047094b0216be788ffdc2b1dac2c95872c6c73..327918776ee11225096c5e3604ebce467a100bda 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily
+++ b/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily
@@ -99,6 +99,7 @@ OmnesDeSabaVenientObIMusic = \relative c'' {
 }
 \addQuote "OmnesDeSabaVenientObIMusic" { \OmnesDeSabaVenientObIMusic }
 
+
 OmnesDeSabaVenientObIIMusic = \relative c' {
     R1 | % 2
     e4\p e8.[ e16] e4 e4 | % 3
@@ -188,6 +189,7 @@ OmnesDeSabaVenientObIIMusic = \relative c' {
 }
 \addQuote "OmnesDeSabaVenientObIIMusic" { \OmnesDeSabaVenientObIIMusic }
 
+
 OmnesDeSabaVenientFagIMusic = \relative c' {
   R1 | % 2
   g4\p g8.[ g16] g4 g | % 3
@@ -1279,6 +1281,7 @@ OmnesDeSabaVenientSSoloMusic = \relative c'' {
 }
 \addQuote "OmnesDeSabaVenientSSoloMusic" { \OmnesDeSabaVenientSSoloMusic }
 
+
 OmnesDeSabaVenientSMusic = \relative c' {
     \cueText "Tutti"
     R1 | % 2
@@ -1370,7 +1373,6 @@ OmnesDeSabaVenientSMusic = \relative c' {
 }
 \addQuote "OmnesDeSabaVenientSMusic" { \OmnesDeSabaVenientSMusic }
 
-
 OmnesDeSabaVenientSLyrics = \lyricmode {
   Om -- nes de Sa -- ba ve -- ni -- ent,
   om -- nes de Sa -- ba ve -- ni -- ent,
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Score_Choral.ly b/Eybler_OmnesDeSabaVenient_HV40_Score_Choral.ly
index 26fc60e16a690318eddf3ca13d934945d39450b9..7c7149c1cbcfce297ad37a5f2b4144f2ac8b4ff0 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Score_Choral.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Score_Choral.ly
@@ -9,4 +9,3 @@
 }
 
 \createScore #"OmnesDeSabaVenient" #'("ChoralScore")
-
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Score_Full.ly b/Eybler_OmnesDeSabaVenient_HV40_Score_Full.ly
index 0ea975920a47c5e7ddb98140279bad1a82181ebf..dfab0d94cf1f03b192d9b2249dfbf50c6fc76fe5 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Score_Full.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Score_Full.ly
@@ -9,4 +9,3 @@
 }
 
 \createNoCuesScore #"OmnesDeSabaVenient" #'("FullScore")
-
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Score_Long.ly b/Eybler_OmnesDeSabaVenient_HV40_Score_Long.ly
index c3849c8eab07550e16081c938ae73de97883bcd2..49f6d2c36d0918e424ffafae4812cc0b07aefeff 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Score_Long.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Score_Long.ly
@@ -9,4 +9,3 @@
 }
 
 \createNoCuesScore #"OmnesDeSabaVenient" #'("LongScore")
-
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly b/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly
index 031d1b5aaf3af817b5ea485b145ea2d03b2f692f..f1156271a8f3c83e65b48d84f7e1d74e80e7f44c 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly
@@ -13,4 +13,3 @@ TClef = \clef "tenor"
 #(oly:modify_score_structure '("BrLong" "StaffGroup" ("TbeLong"  "CorLong")))
 
 \createNoCuesScore #"OmnesDeSabaVenient" #'("Tim" "BrLong" "WdLong" "Str" "Ch" "Continuo")
-
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.ly b/Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.ly
index 1fd5fc92f1ea0ad9baa7adfda0db7d8a93e741a0..db1b180eab7218b55e8dcd76a463ceb9b7713640 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.ly
+++ b/Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.ly
@@ -9,4 +9,3 @@
 }
 
 \createScore #"OmnesDeSabaVenient" #'("VocalScore")
-
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily b/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily
index 48cc6acb820ac1dbd48f1b313eb1cc28ab4ecd51..f431c7613021db3fe34978fffd584d59490eb668 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily
+++ b/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily
@@ -9,27 +9,14 @@ scorenumber="EK-1040"
   subtitle = "Graduale, HV 40"
   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...
 
-#(oly:modify_score_structure '("BassGroup" "StaffGroup" ("Continuo")))
-#(oly:remove_from_score_structure "Solo")
-
-
-CorKey = \key g \major
-CorIKey = \CorKey
-CorIIKey = \CorKey
-CorTransposeTo = g
-CorITransposeTo = \CorTransposeTo
-CorIITransposeTo = \CorTransposeTo
-
-TbeKey = \key d \major
-TbeIKey = \TbeKey
-TbeIIKey = \TbeKey
-TbeTransposeTo = d'
-TbeITransposeTo = \TbeTransposeTo
-TbeIITransposeTo = \TbeTransposeTo
+%% Add custom keys here, e.g.
+%% CorKey = \key g \major
+%% CorIKey = \CorKey
+%% CorIIKey = \CorKey
diff --git a/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily b/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily
index 65174d40041d4df02509525671900490c312e7e2..7ad11fe2f9f1f9c60e471703ac8d602b6a415ab1 100644
--- a/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily
+++ b/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily
@@ -1,7 +1,2 @@
 \include "orchestrallily/oly_settings_instrument.ily"
 \include "Eybler_OmnesDeSabaVenient_HV40_Settings.ily"
-
-\paper {
-  #(define page-breaking ly:optimal-breaking)
-}
-
diff --git a/Makefile b/Makefile
index 567d27332706218f6398d5181a2a83065d15ed4c..c908d3d54704eff8a86195ebeb7d34f5b79924ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,28 @@
-base = Eybler_OmnesDeSabaVenient_HV40
-SRCS = Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily $(base)_Settings.ily
 OUT=out
 
+base = Eybler_OmnesDeSabaVenient_HV40
+SRCS = Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily Eybler_OmnesDeSabaVenient_HV40_Settings.ily Eybler_OmnesDeSabaVenient_HV40_Settings_VocalScore.ily Eybler_OmnesDeSabaVenient_HV40_Settings_ChoralScore.ily Eybler_OmnesDeSabaVenient_HV40_Settings_VocalVoice.ily Eybler_OmnesDeSabaVenient_HV40_Settings_FullScore.ily Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily $(base)_Settings.ily
 instruments = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va SSolo S A T B Continuo VcB TrbI TrbIII O
-scores = Full Long Vocal Particell Choral Original
+scores = Long Full Vocal Choral Original
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+
+
+texbase = Eybler_OmnesDeSabaVenient_HV40
+texscores = Long Full Vocal Choral Original
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
+     $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
-pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(scores:%=$(OUT)/$(base)_Score_%.pdf)
-texs = $(scores:%=TeX_$(base)_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_$(base)_Score_%.pdf) $(OUT)/TeX_$(base)_Score_Instruments.pdf
 
-additionalscores = $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Music_FagAlternatives.pdf
+additionalscores = $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Music_FagAlternatives.pdf 
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex 
 instruments: $(instruments)
 scores: $(scores)
 
+
 clean:
 	rm -rf $(OUT)
 
@@ -25,7 +32,8 @@ $(OUT) :
 $(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
@@ -35,7 +43,9 @@ $(additionalscores): $(OUT)/%.pdf: %.ly
 	lilypond -dbackend=eps -o $(basename $@) $<
 
 tex: $(additionalscores) latex
-latex: $(texpdfs)
+latex: $(pdfs) $(texpdfs)
+latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
 	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex
index cc3c4175b65aad1b9076370f52fd65eb266f8527..f5084155e1f31a41867a0bb54de578831109f92b 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex
@@ -33,11 +33,8 @@ einem Orgelpunkt im Continuo und einem abschließenden leisen \q{Alleluja} des
 Chores im Nichts und die Karawane in der Ferne verschwindet.
 
 \columnbreak
-
 \prefacesection{Preface}
-
 TODO
-
 \end{multicols}
 
 % \vfill
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex
similarity index 100%
rename from TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex
rename to TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex
index 99248356a429c7bf47db14bc998de79bc1033b8a..9b9ad6f7e6727cc2f83df52705f36b84df1ee763 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex
@@ -63,3 +63,4 @@ Zusätzlich: Generalbassaussetzung von M. Hößl (-20), \TrbIName{} aus dem Hofm
 Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
+
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex
index b0e21f9184abad7a91f0a05f84393f92c517c2b2..4f3e477bb20562b57185f12eebdf5236c4f7d535 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex
@@ -532,23 +532,19 @@ für die unbürokratische Benutzung des riesigen Fundus (Autograph,
 Handschriften und Drucke dieses Werkes) und den Bediensteten für ihr stetiges 
 Entgegenkommen in allen Belangen herzlich gedankt.
 %
-Auch \href{http://www.koscielny.eu/}{Christoph Koscielny}, einem weiteren 
-Bewunderer Eyblers, sei für zahlreiche Diskussionen, Hinweise und 
+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 
+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 
+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}
-
-
-\includepdf{Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI}
-% \includepdf{Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII}
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex
index a4b0b8c09ff43172bbbaad0cd5b813bf8efff064..cee89e2d604249c0b8811a912ca5d0684cc70456 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex
@@ -7,7 +7,7 @@
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex}
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex}
 \pagebreak
-\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex}
+\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex}
 \end{preface}
 
 \mainmatter
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex
index 272e57602463cda5fe1adf5e60ee9dbec95edd2e..7fe17e8eed5b48c569c6bd7123baba8e6c2ba8f1 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex
@@ -1,6 +1,6 @@
 \subsection*{Text des \q{Omnes de Saba venient}: Jes 60:6, 60:1 und Mt 2:2}
-\begin{lyricstext}
 
+\begin{lyricstext}
 \renewenvironment{lyricstable}{\begin{tabular}{p{0.27\textwidth}p{0.335\textwidth}p{0.315\textwidth}}}{\end{tabular}}
 
 \begin{lyricstable}
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
index 396b8dd371f4d709227b0acd801ab68b0972bed0..032a9d2a63d58edfceea5f6b9fb602746edb1577 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
@@ -18,10 +18,7 @@
 \addcontentsline{toc}{section}{\ChoralScoreType}
 \includescore{Score_Choral}
 
-% \cleardoublepage
-% \backmatter
-% \appendix
-% \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
+
 
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
index afe697f8212b9426f499334901f1646d06434d26..c4588473a153e2eb368b8f3559723f0ed29384e1 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
@@ -18,5 +18,7 @@
 \addcontentsline{toc}{section}{\VocalScoreType}
 \includescore{Score_Vocal}
 
+
+
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex
index 91826785dcfa00b97df03e6fa398676f5ed667cc..c9ba0b3c317dd1462746e7499d4800de21322f6e 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex
@@ -1,11 +1,11 @@
-\composer{Joseph Eybler}
-\composerdate{(1765-1846)}
 \title{Omnes de Saba venient}
 \subtitle{Graduale, HV 40}
+\composer{Joseph Eybler}
+\composerdate{(1765-1846)}
 \description{Per Solo (S), Coro (SATB) e Orchestra}
 \instrumentation{2 Oboi, 2 Fagotti\\2 Corni, 2 Trombe, Timpani\\2 Violini, Viole, Violoncello\\Contrabasso ed Organo}
 \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}
 
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.patch
index 2cdb225046e1a5e617e6fc5d67125cdf414835be..c2bb53b243b64eb15e1ede2244ce63d9598754e3 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly	2009-08-11 19:39:18.000000000 +0200
+--- Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Instrument_O.ly	2009-09-30 18:36:11.000000000 +0200
 @@ -4,6 +4,7 @@
  \header {
    instrument = \OInstrumentName
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.patch
index 6b45d31a4633396c6d2128a763fb4992e592c8b4..d618d56a3c7f9e2c4777cde92b319138aa32ff6f 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly	2009-09-24 14:19:26.000000000 +0200
+--- Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Instrument_SSolo.ly	2009-10-01 18:10:50.000000000 +0200
 @@ -5,6 +5,12 @@
    instrument = \SSoloInstrumentName
    scorenumber = \markup{\scoreNumber \SSoloNumber}
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.patch
index f53df21d36cfe68255bee5177a5d2f552bfbf590..421d4902cb8fa32a013a4ef694714af1390c08c2 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly	2009-08-11 19:39:18.000000000 +0200
+--- Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI.ly	2009-09-30 18:37:52.000000000 +0200
 @@ -4,7 +4,11 @@
  \header {
    instrument = \TrbIInstrumentName
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.patch
index 5ab28986289987bb8a3d269a87135671b5e3e5e4..e9be5035dce02e418af873d4dd1c60a0c968f99d 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly	2009-08-11 19:39:18.000000000 +0200
+--- Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII.ly	2009-09-30 18:37:05.000000000 +0200
 @@ -2,9 +2,13 @@
  \include "Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily"
  
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.patch
index d615c543ea406c0a3398ceb5d9598b71e177d0fd..05f9d7768c3506d5837c4e3b8d51bf212ac19118 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.patch
@@ -1,5 +1,5 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly	2009-09-24 14:34:59.000000000 +0200
+--- Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Instrument_VII.ly	2009-09-30 18:38:30.000000000 +0200
 @@ -6,5 +6,15 @@
    scorenumber = \markup{\scoreNumber \VIINumber}
  }
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VcB.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VcB.ly.patch
deleted file mode 100644
index 6cbbb4158421ebf26cf2a69600428175b13151d9..0000000000000000000000000000000000000000
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Instrument_VcB.ly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Eybler_OmnesDeSabaVenient_HV40_Instrument_VcB.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Instrument_VcB.ly	2009-08-09 16:43:58.000000000 +0200
-@@ -2,7 +2,7 @@
- \include "Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily"
- 
- \header {
--  instrument = \VcBInstrumentName
-+  instrument = "Cello e Contrabbasso"
-   scorenumber = \markup{\scoreNumber \VcBNumber}
- }
- 
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.patch
index 31270b590b7277561aeede35bc1922ea51642f69..385fb01da2dfd42afd1b844e94fa549e8fe93233 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.patch
@@ -1,6 +1,6 @@
---- Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily	2009-09-16 10:22:10.000000000 +0200
-@@ -1,140 +1,2310 @@
+--- Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily	2009-09-30 18:38:41.000000000 +0200
+@@ -1,188 +1,2312 @@
  \version "2.13.1"
  
 -OmnesDeSabaVenientPieceName = "OmnesDeSabaVenient"
@@ -18,7 +18,9 @@
 +  \tempo \OmnesDeSabaVenientTempo 4=100
  }
  
+-
 -OmnesDeSabaVenientObIMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientObIMusic = \relative c'' {
 +    R1 | % 2
@@ -109,7 +111,9 @@
  }
  \addQuote "OmnesDeSabaVenientObIMusic" { \OmnesDeSabaVenientObIMusic }
  
+ 
  OmnesDeSabaVenientObIIMusic = \relative c' {
+-  s8
 -  % TODO
 +    R1 | % 2
 +    e4\p e8.[ e16] e4 e4 | % 3
@@ -199,7 +203,9 @@
  }
  \addQuote "OmnesDeSabaVenientObIIMusic" { \OmnesDeSabaVenientObIIMusic }
  
+ 
  OmnesDeSabaVenientFagIMusic = \relative c' {
+-  s8
 -  % TODO
 +  R1 | % 2
 +  g4\p g8.[ g16] g4 g | % 3
@@ -297,7 +303,9 @@
  }
  \addQuote "OmnesDeSabaVenientFagIMusic" { \OmnesDeSabaVenientFagIMusic }
  
+-
 -OmnesDeSabaVenientFagIIMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientFagIIMusic = \relative c {
 +  R1 | % 2
@@ -396,7 +404,9 @@
  }
  \addQuote "OmnesDeSabaVenientFagIIMusic" { \OmnesDeSabaVenientFagIIMusic }
  
+-
 -OmnesDeSabaVenientCorIMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientCorIMusic = \relative g' {
 +    \transposition f
@@ -495,9 +505,10 @@
  }
  \addQuote "OmnesDeSabaVenientCorIMusic" { \OmnesDeSabaVenientCorIMusic }
  
+ 
 -OmnesDeSabaVenientCorIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +OmnesDeSabaVenientCorIIMusic = \relative h {
 +    \transposition f
 +    R1 | % 2
@@ -594,9 +605,10 @@
  }
  \addQuote "OmnesDeSabaVenientCorIIMusic" { \OmnesDeSabaVenientCorIIMusic }
  
+ 
 -OmnesDeSabaVenientTbeIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +OmnesDeSabaVenientTbeIMusic = \relative d'' {
 +    \transposition b
 +    R1*7 | % 8
@@ -656,9 +668,10 @@
  }
  \addQuote "OmnesDeSabaVenientTbeIMusic" { \OmnesDeSabaVenientTbeIMusic }
  
+ 
 -OmnesDeSabaVenientTbeIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +OmnesDeSabaVenientTbeIIMusic = \relative d' {
 +    \transposition b
 +    R1*7 | % 8
@@ -718,9 +731,10 @@
  }
  \addQuote "OmnesDeSabaVenientTbeIIMusic" { \OmnesDeSabaVenientTbeIIMusic }
  
+ 
 -OmnesDeSabaVenientTimMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +AlternativeOmnesDeSabaVenientTrbIMusic = \relative c'' {
 +  R1*7 | % 8
 +  g2\f a | % 9
@@ -941,7 +955,9 @@
  }
  \addQuote "OmnesDeSabaVenientTimMusic" { \OmnesDeSabaVenientTimMusic }
  
+-
  OmnesDeSabaVenientVIMusic = \relative c' {
+-  s8
 -  % TODO
 +    c8\p c4 c4 c4 c8 | % 2
 +    c4 r4 r2 | % 3
@@ -1049,9 +1065,10 @@
  }
  \addQuote "OmnesDeSabaVenientVIMusic" { \OmnesDeSabaVenientVIMusic }
  
+ 
 -OmnesDeSabaVenientVIIMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +OmnesDeSabaVenientVIIMusic = \relative g {
 +    g8\p g4 g4 g4 g8 | % 2
 +    g4 r4 r2 | % 3
@@ -1159,9 +1176,10 @@
  }
  \addQuote "OmnesDeSabaVenientVIIMusic" { \OmnesDeSabaVenientVIIMusic }
  
+ 
 -OmnesDeSabaVenientVaMusic = \relative c' {
+-  s8
 -  % TODO
-+
 +OmnesDeSabaVenientVaMusic = \relative e {
 +    e8\p e4 e4 e4 e8 | % 2
 +    e4 r4 r2 | % 3
@@ -1271,10 +1289,15 @@
  }
  \addQuote "OmnesDeSabaVenientVaMusic" { \OmnesDeSabaVenientVaMusic }
  
+ 
 -OmnesDeSabaVenientSSoloMusic = \relative c' {
+-  s8
+-  % TODO
+-}
+-\addQuote "OmnesDeSabaVenientSSoloMusic" { \OmnesDeSabaVenientSSoloMusic }
+ 
+-OmnesDeSabaVenientSSoloLyrics = \lyricmode {
 -  % TODO
-+
-+
 +% Split solo and choir
 +OmnesDeSabaVenientSSoloMusic = \relative c'' {
 +    s1*16 | % 17
@@ -1308,9 +1331,11 @@
 +    d4 r4 r2 | % 43
 +    s1*69 \bar "|." % 112
  }
- \addQuote "OmnesDeSabaVenientSSoloMusic" { \OmnesDeSabaVenientSSoloMusic }
++\addQuote "OmnesDeSabaVenientSSoloMusic" { \OmnesDeSabaVenientSSoloMusic }
+ 
  
  OmnesDeSabaVenientSMusic = \relative c' {
+-  s8
 -  % TODO
 +    \cueText "Tutti"
 +    R1 | % 2
@@ -1402,7 +1427,6 @@
  }
  \addQuote "OmnesDeSabaVenientSMusic" { \OmnesDeSabaVenientSMusic }
  
-+
  OmnesDeSabaVenientSLyrics = \lyricmode {
 -  % TODO
 -}
@@ -1530,9 +1554,10 @@
 +  }
 +  \context Lyrics = "OmnesDeSabaVenientSSoloLyricsBelow" \lyricsto "OmnesDeSabaVenientSSoloVoice" \OmnesDeSabaVenientSSoloLyrics
 +>>
-+
+ 
  
  OmnesDeSabaVenientAMusic = \relative c' {
+-  s8
 -  % TODO
 +    \cueText "Tutti"
 +    R1 | % 2
@@ -1633,8 +1658,10 @@
 -OmnesDeSabaVenientALyrics = \lyricmode {
 -  % TODO
 -}
+-
  
 -OmnesDeSabaVenientTMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientALyrics = \lyricmode { 
 +  Om -- nes de Sa -- ba ve -- ni -- ent, 
@@ -1769,8 +1796,10 @@
 -OmnesDeSabaVenientTLyrics = \lyricmode {
 -  % TODO
 -}
+-
  
 -OmnesDeSabaVenientBMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientTLyrics = \lyricmode { 
 +  Om -- nes de Sa -- ba ve -- ni -- ent,
@@ -1906,13 +1935,17 @@
 -OmnesDeSabaVenientBLyrics = \lyricmode {
 -  % TODO
 -}
+ 
 -
 -OmnesDeSabaVenientContinuoMusic = \relative c' {
+-  s8
 -  % TODO
 -}
 -\addQuote "OmnesDeSabaVenientContinuoMusic" { \OmnesDeSabaVenientContinuoMusic }
- 
+-
+-
 -OmnesDeSabaVenientVcBMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientBLyrics = \lyricmode { 
 +  Om -- nes de Sa -- ba ve -- ni -- ent, 
@@ -2211,8 +2244,8 @@
 +    c,4\p e4 g4 c4 | % 29
 +    c,4 r4 r2 | \barNumberCheck #30
 +    c4\cresc e4 g4 c4 | % 31
-+    e,4 r4 r2 | % 32
-+    f4\f r4 r2 | % 33
++    e,4\! r4 r2 | % 32
++    \dynamicsAllInside #-1 #-4.8 f4\f r4 r2 | % 33
 +    g4 r4 g,4 r4 | % 34
 +    c4 r4 r2 | % 35
 +    g4^\pizz r4 g'4 r4 | % 36
@@ -2298,18 +2331,24 @@
  }
  \addQuote "OmnesDeSabaVenientVcBMusic" { \OmnesDeSabaVenientVcBMusic }
  
++OmnesDeSabaVenientBCMusic = \OmnesDeSabaVenientVcBMusic
+ 
 -OmnesDeSabaVenientTrbIMusic = \relative c' {
+-  s8
 -  % TODO
 -}
 -\addQuote "OmnesDeSabaVenientTrbIMusic" { \OmnesDeSabaVenientTrbIMusic }
 -
+-
 -OmnesDeSabaVenientTrbIIIMusic = \relative c' {
+-  s8
 -  % TODO
 -}
 -\addQuote "OmnesDeSabaVenientTrbIIIMusic" { \OmnesDeSabaVenientTrbIIIMusic }
-+OmnesDeSabaVenientBCMusic = \OmnesDeSabaVenientVcBMusic
- 
+-
+-
 -OmnesDeSabaVenientOMusic = \relative c' {
+-  s8
 -  % TODO
 +OmnesDeSabaVenientBCFbMusic = \figuremode {
 +  \override TextScript #'outside-staff-priority = #999
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.patch
index b826bf6c72bf3556ce38db893fd7a5c8f2a7d69c..16bf99fc88f667f7cbbd5f54c3d39d51bb0f653c 100644
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.patch
+++ b/patches/Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.patch
@@ -1,14 +1,10 @@
---- Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly	2009-09-24 14:40:28.000000000 +0200
-@@ -7,6 +7,10 @@
-   scoretype = \OriginalScoreTitle
-   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
- }
-+SClef = \clef "soprano"
-+AClef = \clef "alto"
-+TClef = \clef "tenor"
+--- Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly.new	2009-10-01 18:34:08.000000000 +0200
++++ Eybler_OmnesDeSabaVenient_HV40_Score_Original.ly	2009-10-01 18:20:20.000000000 +0200
+@@ -10,5 +10,6 @@
+ SClef = \clef "soprano"
+ AClef = \clef "alto"
+ TClef = \clef "tenor"
 +#(oly:modify_score_structure '("BrLong" "StaffGroup" ("TbeLong"  "CorLong")))
  
 -\createNoCuesScore #"OmnesDeSabaVenient" #'("OriginalScore")
 +\createNoCuesScore #"OmnesDeSabaVenient" #'("Tim" "BrLong" "WdLong" "Str" "Ch" "Continuo")
- 
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily.patch
deleted file mode 100644
index 15cdf06b7f99f17ce42bb7252e0a1a75e9a9f88a..0000000000000000000000000000000000000000
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Settings_Global.ily	2009-09-24 14:35:51.000000000 +0200
-@@ -17,7 +17,20 @@
- 
- % Possibly adjust the \orchestralScoreStructure here...
- 
--% Add custom keys here, e.g.
--% CorKey = \key g \major
--% CorIKey = \CorKey
--% CorIIKey = \CorKey
-+#(oly:modify_score_structure '("BassGroup" "StaffGroup" ("Continuo")))
-+#(oly:remove_from_score_structure "Solo")
-+
-+
-+CorKey = \key g \major
-+CorIKey = \CorKey
-+CorIIKey = \CorKey
-+CorTransposeTo = g
-+CorITransposeTo = \CorTransposeTo
-+CorIITransposeTo = \CorTransposeTo
-+
-+TbeKey = \key d \major
-+TbeIKey = \TbeKey
-+TbeIIKey = \TbeKey
-+TbeTransposeTo = d'
-+TbeITransposeTo = \TbeTransposeTo
-+TbeIITransposeTo = \TbeTransposeTo
diff --git a/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily.patch b/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily.patch
deleted file mode 100644
index e97f212823c71ee9ec8520eef37d9994b181678c..0000000000000000000000000000000000000000
--- a/patches/Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily.new	2009-09-24 14:39:40.000000000 +0200
-+++ Eybler_OmnesDeSabaVenient_HV40_Settings_Instrument.ily	2009-09-24 14:34:54.000000000 +0200
-@@ -1,2 +1,7 @@
- \include "orchestrallily/oly_settings_instrument.ily"
- \include "Eybler_OmnesDeSabaVenient_HV40_Settings.ily"
-+
-+\paper {
-+  #(define page-breaking ly:optimal-breaking)
-+}
-+
diff --git a/patches/Makefile.patch b/patches/Makefile.patch
deleted file mode 100644
index 33d72d4a559eb934d1b47904c392f82f116b8cc8..0000000000000000000000000000000000000000
--- a/patches/Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.new	2009-09-24 14:39:40.000000000 +0200
-+++ Makefile	2009-09-24 14:41:18.000000000 +0200
-@@ -9,7 +9,7 @@
- texs = $(scores:%=TeX_$(base)_Score_%.tex)
- texpdfs = $(scores:%=$(OUT)/TeX_$(base)_Score_%.pdf) $(OUT)/TeX_$(base)_Score_Instruments.pdf
- 
--additionalscores = 
-+additionalscores = $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Music_FagAlternatives.pdf
- 
- .PHONY: all clean
- all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.patch
index d6962be9ca6a44d73c22fbb1ed8cd9652ae5d78c..983b9b954dba9e9163c7d63dff02a2e934ec0028 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.patch
@@ -1,10 +1,11 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex	2009-09-16 10:22:10.000000000 +0200
-@@ -2,8 +2,38 @@
- \chapter*{Vorwort / Preface}
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex.new	2009-10-01 18:34:08.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_About.itex	2009-09-30 18:41:18.000000000 +0200
+@@ -2,9 +2,39 @@
  
  \begin{multicols}{2}
+ \prefacesection{Vorwort}
 -TODO
++
 +Das vorliegende Graduale des Wiener Hofkapellmeisters Joseph Eybler (1765--1846)
 +ist eines siner bekanntesten kirchenmusikalischen Werke 
 +und hat sich -- im Gegensatz zu den meisten anderen seiner Werke -- in einigen 
@@ -33,10 +34,10 @@
 +Steigerung der \q{Alleluja}-Rufe des Chores, bevor das Stück schließlich nach 
 +einem Orgelpunkt im Continuo und einem abschließenden leisen \q{Alleluja} des 
 +Chores im Nichts und die Karawane in der Ferne verschwindet.
- \columnbreak
 +
+ \columnbreak
+ \prefacesection{Preface}
  TODO
-+
  \end{multicols}
 -\vfill
 +
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4cc27b567150df8defe84a08253a616403d41dce
--- /dev/null
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex.patch
@@ -0,0 +1,18 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex.new	2009-10-01 18:34:08.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Bio.itex	2009-07-23 20:46:00.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_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.patch
index 7a3f77dc88a3fa22c2c800f49e20b5f9db137c68..1c29ed0933929cb02e8ff5f2d0877dfdff25b943 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.patch
@@ -1,23 +1,23 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex	2009-09-17 22:14:22.000000000 +0200
-@@ -16,12 +16,22 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex.new	2009-10-01 18:34:09.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_ContentsMaterial.itex	2009-09-30 18:41:29.000000000 +0200
+@@ -15,12 +15,23 @@
+ \scorelistbox{
  Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
  
- \FullScoreName{} (-\FullScoreNumber),
 -\LongScoreName{} (-\LongScoreNumber),
+ \FullScoreName{} (-\FullScoreNumber),
  \VocalScoreName{} (-\VocalScoreNumber),
--\ParticellScoreName{} (-\ParticellScoreNumber),
 +\ParticellScoreName{} (-\ParticellScoreNumber);
 +
  \ChoralScoreName{} (-\ChoralScoreNumber),
--\OriginalScoreName{} (-\OriginalScoreNumber),
+-\OriginalScoreName{} (-\OriginalScoreNumber);
 +\SSoloName{} (-\SSoloNumber),
 +\SName{} (-\SNumber),
 +\AName{} (-\ANumber),
 +\TName{} (-\TNumber),
 +\BName{} (-\BNumber);
-+
- \InstrumentsName{} (-\InstrumentsNumber),
+ 
++\InstrumentsName{} (-\InstrumentsNumber),
 +\ContinuoName{} (-\ContinuoNumber),
 +\VIName{} (-\VINumber),
 +\VIIName{} (-\VIINumber),
@@ -26,7 +26,7 @@
  \ObIName{} (-\ObINumber),
  \ObIIName{} (-\ObIINumber),
  \FagIName{} (-\FagINumber),
-@@ -30,29 +40,19 @@
+@@ -29,29 +40,19 @@
  \CorIIName{} (-\CorIINumber),
  \TbeIName{} (-\TbeINumber),
  \TbeIIName{} (-\TbeIINumber),
@@ -43,7 +43,7 @@
 -\VcBName{} (-\VcBNumber),
 -\TrbIName{} (-\TrbINumber),
 -\TrbIIIName{} (-\TrbIIINumber),
--\OName{} (-\ONumber),
+-\OName{} (-\ONumber).
 +\TimName{} (-\TimNumber).
  
 +\vspace{0.5em}
@@ -62,8 +62,3 @@
  \end{hauptquellen}
  
  \vfill
-@@ -63,4 +63,3 @@
- Computersatz mit \@software\newline
- Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
- 
--
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.patch
index c2b9299b6c2e8e2a7cf66b2025d6e6d4336a536b..4253da0b7b92628f3ae5bf7c59bde848c183d6ce 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex	2009-09-16 10:22:10.000000000 +0200
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex.new	2009-10-01 18:34:08.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex	2009-10-01 18:22:23.000000000 +0200
 @@ -5,131 +5,207 @@
  \begin{multicols}{2}
  \subsection*{Quellen:}
@@ -200,7 +200,7 @@
 +\end{thebibliography}
 +
 +\subsubsection*{Weitere Quellen}
-+
+ 
 +\begin{thebibliography}{E}
 +\bibitem[E]{HS2}
 +Handschriftliche Stimmensatz aus Altmünster, Musiksammlung der Österreichischen
@@ -217,7 +217,7 @@
 +Gedruckter Stimmensatz (Tobias Haslinger 5049) mit 6 handschriftlichen Einzelstimmen, aus der Sammlung 
 +J. Winkler, Musiksammlung der Österreichischen Nationalbibliothek, Wien. 
 +Signatur: Signatur: MS10019-4° Mus.
- 
++
 +Hs. Stimmen: Sopr. ripieno, Ten., Bass, Vl. I, II, Trombone Basso.
  
  \end{thebibliography}
@@ -344,7 +344,7 @@
  
  \end{enumerate}
  
-@@ -175,100 +257,298 @@
+@@ -175,88 +257,280 @@
  \paragraph*{Akzidenzien}
  
  \begin{enumerate}
@@ -381,8 +381,8 @@
  \end{enumerate}
  
  
-+
-+
+ 
+ 
 +
  \paragraph*{Diverses}
  
@@ -459,12 +459,11 @@
 +geführt ist.}
 +\label{FgAlternatives}
 +\end{figure*}
-+
-+
  
--\subsubsection*{OmnesDeSabaVenient}
-+\subsubsection*{Einzelbemerkungen}
  
+ 
++\subsubsection*{Einzelbemerkungen}
++
  \begin{vergleich}
 -TODO
 -\end{vergleich}
@@ -494,13 +493,13 @@
 +8/9 V2: In der Einzelstimme in Handschrift \cite{HS1} und Druck \cite{TH5049} 
 +Bogen über den Taktstrich, nicht jedoch im  Autograph \cite{Aut}, daher 
 +nicht übernommen.
- 
++
 +9 V1/V2/Va: fz nur in \cite{TH5046} (nicht in \cite{Aut} oder \cite{TH5049}), 
 +nicht übernommen.
  
 +9 S: Die beiden Viertelnoten in den Partituren \cite{Aut,TH5046} korrekt c'' und g', im 
 +Stimmendruck \cite{TH5049} in S-Solo d'' und g', jedoch d'' und h' in S-Ripieno. 
-+
+ 
 +10: Im Autograph \cite{Aut} vorhandene Bögen sind in Cor, Ob und Fag nicht in 
 +den Druck \cite{TH5046,TH5049} und die Handschrift \cite{HS1} übernommen worden, in 
 +den Clarini jedoch schon. Ergänzt.
@@ -676,33 +675,5 @@
 +Handschriften und Drucke dieses Werkes) und den Bediensteten für ihr stetiges 
 +Entgegenkommen in allen Belangen herzlich gedankt.
  %
--Auch \href{http://www.koscielny.eu/}{Christoph Koscielny}, einem weiteren
--Bewunderer Eyblers, sei für zahlreiche Diskussionen, Hinweise und
-+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
-+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
-+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}
-+
-+
-+\includepdf{Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbI}
-+% \includepdf{Eybler_OmnesDeSabaVenient_HV40_Instrument_TrbIII}
+ Auch \href{http://www.koscielny.eu/}{Christoph Koscielny}, einem weiteren
+ Bewunderer Eyblers, sei für zahlreiche Diskussionen, Hinweise und
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex.patch
deleted file mode 100644
index f253992b97a7b88440f0ef913c5267605ae152e1..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Leben.itex	2009-07-24 00:46:10.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}
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.patch
index 7a643b373d6efcb13bf48054203723339f186f88..c9616747ad29b7bd91a4156128609d9f182be1d3 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.patch
@@ -1,23 +1,19 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex	2009-09-16 10:22:10.000000000 +0200
-@@ -1,14 +1,25 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex.new	2009-10-01 18:34:08.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Text.itex	2009-10-01 18:22:28.000000000 +0200
+@@ -1,10 +1,24 @@
 -\subsection*{Text des \q{Omnes de Saba venient}: TODO}
--
 +\subsection*{Text des \q{Omnes de Saba venient}: Jes 60:6, 60:1 und Mt 2:2}
- \begin{small}
  
--\subsection*{OmnesDeSabaVenient}
--\nopagebreak
+ \begin{lyricstext}
 +\renewenvironment{lyricstable}{\begin{tabular}{p{0.27\textwidth}p{0.335\textwidth}p{0.315\textwidth}}}{\end{tabular}}
-+
+ 
  \begin{lyricstable}
 -TODO & TODO & TODO \\\\[0.5em]
 - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)}
--\end{lyricstable}
 +\hspace{-2.5em}\textsuperscript{Jes 60:6}Omnes de Saba venient, & Sie werden aus Saba alle kommen,  & All they from Sheba shall come:  \\
 +aurem et thus deferentes & Gold und Weihrauch bringen  & they shall bring gold and incense; \\
 +et laudem Domino annuntiantes. & und des Herrn Lob verkündigen. & and shew forth the praises of the Lord. \\[0.3em]
- 
++
 +\hspace{-2.5em}\textsuperscript{Jes 60:1}Surge et illuminare Jerusalem, & Mache dich auf und werde licht, Jerusalem, & Arise and shine, Jerusalem; \\
 +quia gloria Domini & denn die Herrlichkeit des Herrn & for the glory of the Lord \\
 +super te orta est. & gehet auf über dir. & is risen upon thee. \\[0.3em]
@@ -29,7 +25,6 @@
 +Alleluja. & Alleluja. & Alleluja.\\[0.3em]
 +
 +& \footnotesize\em{(Luthersche Bibelübersetzung 1545)} & \footnotesize\em{(King James Version)}
-+\end{lyricstable}
- 
- \end{small}
+ \end{lyricstable}
  
+ \end{lyricstext}
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.patch
index 2b719e454d1e9079aeb8c4048663d8c7a90cef46..d30b4a6fd50018487d107380e3e3526ae952d2be 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.patch
@@ -1,15 +1,13 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex	2009-08-13 21:15:30.000000000 +0200
-@@ -1,10 +1,14 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex.new	2009-10-01 18:34:08.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Todo.itex	2009-09-29 16:07:29.000000000 +0200
+@@ -1,8 +1,12 @@
 -% \todos{
 -% \chapter*{Offene Fragen}
 -%
--% \section*{Literaturvergleich mit dem Autograph:}
 -% \begin{itemize}
 -% \item
 -%
 -% \end{itemize}
--%
 -% }
 +\todos{
 +\chapter*{Open issues}
@@ -18,9 +16,7 @@
 +\item Vorwort übersetzen
 +\item Layout fertig machen
 +\item Richtige Transposition für transponierende Instrumente!
-+\item Overrides are NOT quoted, so slashed graces in SSolo are not slashed!!!
 +\item Leere Zeilen während Fugenbeginns nicht entfernen, nur während SSolo!
-+\item Danksagung schreiben!
 +\item Incipits!
 +\end{itemize}
 +
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex.patch
deleted file mode 100644
index 85ff96e9851b66aa4955f208eee8297275ff564f..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex	2009-09-24 14:25:46.000000000 +0200
-@@ -18,10 +18,10 @@
- \addcontentsline{toc}{section}{\ChoralScoreType}
- \includescore{Score_Choral}
- 
--\cleardoublepage
--\backmatter
--\appendix
--\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
-+% \cleardoublepage
-+% \backmatter
-+% \appendix
-+% \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
- 
- \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
- \end{document}
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch
index 3545801f19fcc1f2b13833190e03cd7cc2fe69cb..53ce2c8aba57e0f9eea3951438015af5ec47fde4 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch
@@ -1,12 +1,13 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex	2009-08-13 21:11:08.000000000 +0200
-@@ -15,6 +15,39 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.new	2009-10-01 18:34:09.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex	2009-09-30 18:30:59.000000000 +0200
+@@ -14,106 +14,73 @@
+ \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
  \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
  
- \phantomsection
++\phantomsection
 +\addcontentsline{toc}{section}{\ContinuoName}
 +\includescore{Instrument_Continuo}
-+
+ 
 +\phantomsection
 +\addcontentsline{toc}{section}{\SSoloName}
 +\includescore{Instrument_SSolo}
@@ -22,7 +23,9 @@
 +\phantomsection
 +\addcontentsline{toc}{section}{\BName}
 +\includescore{Instrument_B}
-+
+ 
+-
+-
 +\phantomsection
 +\addcontentsline{toc}{section}{\VIName}
 +\includescore{Instrument_VI}
@@ -35,55 +38,97 @@
 +\phantomsection
 +\addcontentsline{toc}{section}{\VcBName}
 +\includescore{Instrument_VcB}
-+
-+\phantomsection
+ 
+ \phantomsection
  \addcontentsline{toc}{section}{\ObIName}
  \includescore{Instrument_ObI}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\ObIIName}
+ \includescore{Instrument_ObII}
+-
  \phantomsection
-@@ -41,51 +74,13 @@
+ \addcontentsline{toc}{section}{\FagIName}
+ \includescore{Instrument_FagI}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\FagIIName}
+ \includescore{Instrument_FagII}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\CorIName}
+ \includescore{Instrument_CorI}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\CorIIName}
+ \includescore{Instrument_CorII}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\TbeIName}
+ \includescore{Instrument_TbeI}
+-
+ \phantomsection
+ \addcontentsline{toc}{section}{\TbeIIName}
+ \includescore{Instrument_TbeII}
+-
  \phantomsection
  \addcontentsline{toc}{section}{\TimName}
  \includescore{Instrument_Tim}
+ 
 -\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}{\SSoloName}
 -\includescore{Instrument_SSolo}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\SName}
 -\includescore{Instrument_S}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\AName}
 -\includescore{Instrument_A}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\TName}
 -\includescore{Instrument_T}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\BName}
 -\includescore{Instrument_B}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\ContinuoName}
 -\includescore{Instrument_Continuo}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\VcBName}
 -\includescore{Instrument_VcB}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\TrbIName}
 -\includescore{Instrument_TrbI}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\TrbIIIName}
 -\includescore{Instrument_TrbIII}
+-
 -\phantomsection
 -\addcontentsline{toc}{section}{\OName}
 -\includescore{Instrument_O}
- 
+-
+-
+-
  
  \cleardoublepage
  \backmatter
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Particell.tex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Particell.tex.patch
deleted file mode 100644
index a7efd27d5f97c63109c6ba5555c055b7e21d898c..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Particell.tex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Particell.tex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Particell.tex	2009-08-09 17:14:44.000000000 +0200
-@@ -18,10 +18,5 @@
- \addcontentsline{toc}{section}{\ParticellScoreType}
- \includescore{Score_Particell}
- 
--\cleardoublepage
--\backmatter
--\appendix
--\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
--
- \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
- \end{document}
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex.patch
deleted file mode 100644
index b81adb71ff73f54f4ce2964f727846db1bb3b295..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex	2009-08-09 17:14:49.000000000 +0200
-@@ -18,10 +18,5 @@
- \addcontentsline{toc}{section}{\VocalScoreType}
- \includescore{Score_Vocal}
- 
--\cleardoublepage
--\backmatter
--\appendix
--\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
--
- \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
- \end{document}
diff --git a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.patch b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.patch
index df66e1582ac912650bbf38b7eebfaf08d7be797b..3360e281c19667af2503ca26428d103fa282c6e7 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.patch
@@ -1,26 +1,13 @@
---- TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.new	2009-09-24 14:39:40.000000000 +0200
-+++ TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex	2009-09-17 22:55:27.000000000 +0200
-@@ -1,15 +1,14 @@
--\composer{Joseph Eybler (1765-1846)}
--%\composerdate{(TODO-TODO)}
--% \poet{}
--% \poetdate{}
-+\composer{Joseph Eybler}
-+\composerdate{(1765-1846)}
- \title{Omnes de Saba venient}
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex.new	2009-10-01 18:34:09.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex	2009-10-01 18:23:10.000000000 +0200
+@@ -2,8 +2,8 @@
  \subtitle{Graduale, HV 40}
--% \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{Reinhold Kainhofer}
--\publisher{Edition Kainhofer, Vienna}
+ \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{Per Solo (S), Coro (SATB) e Orchestra}
 +\instrumentation{2 Oboi, 2 Fagotti\\2 Corni, 2 Trombe, Timpani\\2 Violini, Viole, Violoncello\\Contrabasso ed Organo}
-+\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
-+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna}
+ \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+ \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
  \year{2009}
--% \scoreinfo{Urtext \& Erstdruck}
-+\scoreinfo{Urtext}
-+
- \basename{Eybler_OmnesDeSabaVenient_HV40}
- 
- \newcommand{\scoreNumber}[1]{EK-1040-#1}