diff --git a/Eybler_FremitMare_HV92_Score_Original.ly b/Eybler_FremitMare_HV92_Score_Original.ly
index 568d06415880d245e81dbee04d3e0b3f705d7cfd..860408316b987d2bff461b79209f4a000d571796 100644
--- a/Eybler_FremitMare_HV92_Score_Original.ly
+++ b/Eybler_FremitMare_HV92_Score_Original.ly
@@ -7,5 +7,8 @@
   scoretype = \OriginalScoreTitle
   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
 }
+SClef = \clef "soprano"
+AClef = \clef "alto"
+TClef = \clef "tenor"
 
 \createNoCuesScore #"FremitMare" #'("OriginalScore")
diff --git a/Eybler_FremitMare_HV92_Settings_Instrument.ily b/Eybler_FremitMare_HV92_Settings_Instrument.ily
index 7815c589a1a871f0dc1aa4241fd67df024322aba..0579897c839353f93463bd7c717239e9479d6665 100644
--- a/Eybler_FremitMare_HV92_Settings_Instrument.ily
+++ b/Eybler_FremitMare_HV92_Settings_Instrument.ily
@@ -1,2 +1,6 @@
 \include "orchestrallily/oly_settings_instrument.ily"
 \include "Eybler_FremitMare_HV92_Settings.ily"
+
+\paper {
+  #(define page-breaking ly:optimal-breaking)
+}
diff --git a/Makefile b/Makefile
index 5c4d2f69df09a6fc5f359bf39bb0680fc68f6a83..f3c0f2ad1c5c8faca5d20784b09a3ba22a3500b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 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
+SRCS = $(base)_Music_FremitMare.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
 instruments = ObI ObII Cl TrbI TrbII Tim VI VII Va S A T B Continuo VcB
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
-     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+     $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
 
 texbase = Eybler_FremitMare_HV92
@@ -18,7 +18,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
 additionalscores = 
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) $(additionalscores) tex 
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
@@ -26,6 +26,8 @@ scores: $(scores)
 clean:
 	rm -rf $(OUT)
 
+lily: $(pdfs) $(additionalscores)
+
 $(OUT) :
 	mkdir -p $(OUT)
 
@@ -47,5 +49,5 @@ latex: $(pdfs) $(texpdfs)
 latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: latex --output-directory=$(OUT)/ $<
 
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Choral.tex b/TeX_Eybler_FremitMare_HV92_Score_Choral.tex
index f9a3b2e0cf3714e77b0e59779cc686461ad8f760..43ffb701050edff0e75fe29536db50148ab5f0f8 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Choral.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,11 +14,11 @@
 \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_FremitMare_HV92_Score_Full.tex b/TeX_Eybler_FremitMare_HV92_Score_Full.tex
index b6ac6ebb2e6fcd8ea8d5db7cbe57d4ce61015e9a..71145c3734d4b081272e488008316d1f88f97a57 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Full.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \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
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex b/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
index 949bd16775694a933d5799a1d4cf3b1c2503cf61..e5bfaa9f182695ba2eedabecebe129c1a46d00b0 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,6 +14,8 @@
 \input{TeX_Eybler_FremitMare_HV92_Include_Coverpage.itex}
 \input{TeX_Eybler_FremitMare_HV92_Include_Preface_Long.itex}
 
+
+
 \phantomsection
 \addcontentsline{toc}{section}{\ContinuoName}
 \includescore{Instrument_Continuo}
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Long.tex b/TeX_Eybler_FremitMare_HV92_Score_Long.tex
index c991aee7eea87c484ff439260535b8d3445af8a6..afa6252cd7011eec3372e64141f9f08a71c87119 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Long.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Long.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \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
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Original.tex b/TeX_Eybler_FremitMare_HV92_Score_Original.tex
index 4a199351847b53d5f782e25ac4bb6feac8204247..cd40f7c37df525aefd652a39e86d015560839fc7 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Original.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Original.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \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
diff --git a/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex b/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex
index 500065163648b04f0e1571c0552d1d65dc75f8b4..c172541a1fc4cd93a847eb32b3e9d408005ac38d 100644
--- a/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex
+++ b/TeX_Eybler_FremitMare_HV92_Score_Vocal.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{orchestrallily/editionkainhofer}
+\usepackage[vocalscore]{editionkainhofer}
 \input{TeX_Eybler_FremitMare_HV92_Settings.itex}
 
 \hypersetup{
@@ -14,11 +14,11 @@
 \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/out/Eybler_FremitMare_HV92_Instrument_A.pdf b/out/Eybler_FremitMare_HV92_Instrument_A.pdf
index 71efb2174cf67d8cca3521c01e0a701f7bdcbc1b..dab9acc3d01691f97ec93a3ddadcad6c60c9c346 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_A.pdf and b/out/Eybler_FremitMare_HV92_Instrument_A.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_B.pdf b/out/Eybler_FremitMare_HV92_Instrument_B.pdf
index 238bb1c9da05b743fa2cb2429b5a6c71428a00ad..591d88ce978ee4cc18358caa2052febe6712875b 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_B.pdf and b/out/Eybler_FremitMare_HV92_Instrument_B.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_Cl.pdf b/out/Eybler_FremitMare_HV92_Instrument_Cl.pdf
index b6bed32eb7e9e62e551c4aee53064c00ff597209..02f8568a2739aa3645d03ae7771fa4878f051f3f 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_Cl.pdf and b/out/Eybler_FremitMare_HV92_Instrument_Cl.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_Continuo.pdf b/out/Eybler_FremitMare_HV92_Instrument_Continuo.pdf
index ab69a9e942e0204f7d9fe939344c6a435f803128..c9d8e433eaebdc98ce8c7ab8dee18c09865e9bea 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_Continuo.pdf and b/out/Eybler_FremitMare_HV92_Instrument_Continuo.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_ObI.pdf b/out/Eybler_FremitMare_HV92_Instrument_ObI.pdf
index 31d80bbd5c26ba4451a2113dcff23e4c341e0097..e2f25c9a19d19b202d540b23aa296df6e966b7a3 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_ObI.pdf and b/out/Eybler_FremitMare_HV92_Instrument_ObI.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_ObII.pdf b/out/Eybler_FremitMare_HV92_Instrument_ObII.pdf
index 44fea0925b93c2c2a22114ab565e7e692b6f2c70..034b3321a4da88bae41a6b3bb45aa95fea126902 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_ObII.pdf and b/out/Eybler_FremitMare_HV92_Instrument_ObII.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_S.pdf b/out/Eybler_FremitMare_HV92_Instrument_S.pdf
index 3c99b6fe24d1e1bc74a78e2d9fff02365bfca70e..869802cd3851b14d24e9d846e1fea61a4d35af80 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_S.pdf and b/out/Eybler_FremitMare_HV92_Instrument_S.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_T.pdf b/out/Eybler_FremitMare_HV92_Instrument_T.pdf
index 127d7eec9737c2692cfcece39ad0244f74050597..4a1560c656e27545fa4a090e8589af3bb8182561 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_T.pdf and b/out/Eybler_FremitMare_HV92_Instrument_T.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_Tim.pdf b/out/Eybler_FremitMare_HV92_Instrument_Tim.pdf
index ef69f2a37b8c3aca9557e40c9a526863a1ba60e7..80313b108b4f5dc61450daff7a95e685fafb864d 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_Tim.pdf and b/out/Eybler_FremitMare_HV92_Instrument_Tim.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_TrbI.pdf b/out/Eybler_FremitMare_HV92_Instrument_TrbI.pdf
index b99316223e7a9f69bc668e9b166e247f2ef573e5..a2d5f668deeb5a6b15da15dfb3a8244a0bbe0662 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_TrbI.pdf and b/out/Eybler_FremitMare_HV92_Instrument_TrbI.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_TrbII.pdf b/out/Eybler_FremitMare_HV92_Instrument_TrbII.pdf
index a82b0fa5fb6c01465e4a9041b86e46f7380386d8..171cfd04720b387b0bd2e60e561e1d675d48f46f 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_TrbII.pdf and b/out/Eybler_FremitMare_HV92_Instrument_TrbII.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_VI.pdf b/out/Eybler_FremitMare_HV92_Instrument_VI.pdf
index 66df5fbe77159e2c47187baca6b12fcd031e2a19..4e96ab8d8bd22e5e47180db4646f930c25b483e8 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_VI.pdf and b/out/Eybler_FremitMare_HV92_Instrument_VI.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_VII.pdf b/out/Eybler_FremitMare_HV92_Instrument_VII.pdf
index 90e91206bf9de8881990d62907429f7f0099de6e..07faa3e9757d4b7a42fd6392ce992086e04cab43 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_VII.pdf and b/out/Eybler_FremitMare_HV92_Instrument_VII.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_Va.pdf b/out/Eybler_FremitMare_HV92_Instrument_Va.pdf
index ae2bdd74c5c881f4545a3eadd4703c70b6cdd2d0..20a1ef4b3585888b08924cf41cfc8b1916422870 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_Va.pdf and b/out/Eybler_FremitMare_HV92_Instrument_Va.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Instrument_VcB.pdf b/out/Eybler_FremitMare_HV92_Instrument_VcB.pdf
index 8424022f3cbf551ea43f0ffe6bc52d8c5688f4bd..95eb795a82cfeb421d32627f8c972f5e023c5bf8 100644
Binary files a/out/Eybler_FremitMare_HV92_Instrument_VcB.pdf and b/out/Eybler_FremitMare_HV92_Instrument_VcB.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Choral.midi b/out/Eybler_FremitMare_HV92_Score_Choral.midi
index a9c15cdc0fd3e652d4944301b097080d1d9c99a6..64b53b129b60e3b1ea4085a6487c79117b9cc2e4 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Choral.midi and b/out/Eybler_FremitMare_HV92_Score_Choral.midi differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Choral.pdf b/out/Eybler_FremitMare_HV92_Score_Choral.pdf
index dde0a2d27878556c92b9a126ea39f77a66f79f5a..fb5b4573f74f3bb62e9f405b2430a1b756a0892f 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Choral.pdf and b/out/Eybler_FremitMare_HV92_Score_Choral.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Full.midi b/out/Eybler_FremitMare_HV92_Score_Full.midi
index 9b4f6c6eefe362ae86002410fe307d994662d099..a296a41fc084ed2cdb9853e55ca29a14d1d19a39 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Full.midi and b/out/Eybler_FremitMare_HV92_Score_Full.midi differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Full.pdf b/out/Eybler_FremitMare_HV92_Score_Full.pdf
index deb20119c6be31327689e23d3c0e8ac988db8ff3..458deffd41fbf47a6ead9381ce16bdec44cc4639 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Full.pdf and b/out/Eybler_FremitMare_HV92_Score_Full.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Long.midi b/out/Eybler_FremitMare_HV92_Score_Long.midi
index 8c288f48d0e4a63f89c5dfdb1fe7edb6c1dabd61..4ee8b675862c86f02f1ddab483c499e600813220 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Long.midi and b/out/Eybler_FremitMare_HV92_Score_Long.midi differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Long.pdf b/out/Eybler_FremitMare_HV92_Score_Long.pdf
index f1bd9fa24ddfef20d00f0eb412326029a540ebb5..c79d1c7db6ebe81eae9d81ec02b0e0775d132fb9 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Long.pdf and b/out/Eybler_FremitMare_HV92_Score_Long.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Original.midi b/out/Eybler_FremitMare_HV92_Score_Original.midi
index d9c586759ef571076f1328563eea1ee0146c7911..77feb6f50ed9124926eba38ec064636eec95b50e 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Original.midi and b/out/Eybler_FremitMare_HV92_Score_Original.midi differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Original.pdf b/out/Eybler_FremitMare_HV92_Score_Original.pdf
index dc3125f9dd1fc32f409f4337dee30ee1ce83f2c2..8b3b7013610a6253aced5e6265d8b44a7da05d41 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Original.pdf and b/out/Eybler_FremitMare_HV92_Score_Original.pdf differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Vocal.midi b/out/Eybler_FremitMare_HV92_Score_Vocal.midi
index a9c15cdc0fd3e652d4944301b097080d1d9c99a6..64b53b129b60e3b1ea4085a6487c79117b9cc2e4 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Vocal.midi and b/out/Eybler_FremitMare_HV92_Score_Vocal.midi differ
diff --git a/out/Eybler_FremitMare_HV92_Score_Vocal.pdf b/out/Eybler_FremitMare_HV92_Score_Vocal.pdf
index ccd3ecc685d6cc93ae70d6542639d15ec6daf2da..9c0b1dc520bca8a901f690bee5d91a3bff23a001 100644
Binary files a/out/Eybler_FremitMare_HV92_Score_Vocal.pdf and b/out/Eybler_FremitMare_HV92_Score_Vocal.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Choral.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Choral.pdf
index 63063671eb3f13cc0bef30763bac7f72e1621d14..b6925d6e09fa0ed72ee932fce97be542d4dcff51 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Choral.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Choral.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Full.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Full.pdf
index 826ceea098ea215a19c2bb58ae8095fba5a65af3..34b96388dc0da7698eb7f38a6d5d790729a3d797 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Full.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Full.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Instruments.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Instruments.pdf
index b9e03eb23996ecc8555e382c7a22a91bba3b7110..ada90f0c2a0ab460a683e22329cabe00349a49ba 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Instruments.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Instruments.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Long.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Long.pdf
index bfee2b687854e1a19c3b2d0f3211a7df208f75c7..18e1babda2138afb14eb125836868f794b41b989 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Long.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Long.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Original.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Original.pdf
index 76f988e85567fde5cd3beb9372a9b23a0ff66a58..08b8a65c8e55638e2a3cb2788c674d496dd4d488 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Original.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Original.pdf differ
diff --git a/out/TeX_Eybler_FremitMare_HV92_Score_Vocal.pdf b/out/TeX_Eybler_FremitMare_HV92_Score_Vocal.pdf
index 805b2a66eb3b45b8201df80f1bd7bce2f8281615..7fe22db605e9cca870db5471f4715bfac6726260 100644
Binary files a/out/TeX_Eybler_FremitMare_HV92_Score_Vocal.pdf and b/out/TeX_Eybler_FremitMare_HV92_Score_Vocal.pdf differ
diff --git a/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch b/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch
index b8df66514e6cd7ef431b25c82b816ea87293f9ff..b61f8c128de6cbe297bea7d06c4b17105659facb 100644
--- a/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.patch
@@ -1,40 +1,30 @@
---- 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}
+--- TeX_Eybler_FremitMare_HV92_Score_Instruments.tex.new	2009-10-05 19:32:28.000000000 +0200
++++ TeX_Eybler_FremitMare_HV92_Score_Instruments.tex	2009-10-05 19:32:07.000000000 +0200
+@@ -17,23 +17,22 @@
  
--
--
--
--
--
--\phantomsection
+ 
+ \phantomsection
 -\addcontentsline{toc}{section}{\ObIName}
 -\includescore{Instrument_ObI}
--
- \phantomsection
+-\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
@@ -42,54 +32,43 @@
 -\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
+@@ -44,24 +43,27 @@
  \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