diff --git a/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily b/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily
index c2f9862bd424ebcb2a9473c2a28a1f3c128f8b14..4d396664ab0a5d483a6876f8276dcb6e4ea62e62 100644
--- a/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily
+++ b/Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily
@@ -1,2 +1,6 @@
 \include "orchestrallily/oly_settings_instrument.ily"
 \include "Eybler_TuaEstPotentia_HV50_Settings.ily"
+
+\paper {
+  #(define page-breaking ly:optimal-breaking)
+}
diff --git a/Makefile b/Makefile
index 602cca918be4c848e514b40b1c6efcbbc718dec6..cc26e9c17f139e69c55d972c79c85422f15637a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 OUT=out
 
 base = Eybler_TuaEstPotentia_HV50
-SRCS = Eybler_TuaEstPotentia_HV50_Settings_Global.ily Eybler_TuaEstPotentia_HV50_Settings.ily Eybler_TuaEstPotentia_HV50_Settings_VocalScore.ily Eybler_TuaEstPotentia_HV50_Settings_ChoralScore.ily Eybler_TuaEstPotentia_HV50_Settings_VocalVoice.ily Eybler_TuaEstPotentia_HV50_Settings_FullScore.ily Eybler_TuaEstPotentia_HV50_Settings_Instrument.ily Eybler_TuaEstPotentia_HV50_Music_TuaEstPotentia.ily $(base)_Settings.ily
+SRCS = $(base)_Music_TuaEstPotentia.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 = ClI ClII FagI FagII TbeI TbeII TrbI TrbII Tim VI VII Va S A T B Continuo VcB
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
-     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+     $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
 
 texbase = Eybler_TuaEstPotentia_HV50
@@ -15,10 +15,10 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
 
-additionalscores = $(OUT)/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf 
+additionalscores = $(OUT)/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf
 
 .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_TuaEstPotentia_HV50_Score_Choral.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
index 1a6d5b9889e8304267208cb8776504ffc56eca6b..fa3bbd606ca29d00aa50b3c993c5001cb1c244b1 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
@@ -14,11 +14,11 @@
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
+
 \phantomsection
 \addcontentsline{toc}{section}{\ChoralScoreType}
 \includescore{Score_Choral}
 
 
-
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
index f8f521c264ccde0625f9f651c91c593bda28f0d7..a7480b4264ef79b21bbd559839f1815156db5819 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
+
 \phantomsection
 \addcontentsline{toc}{section}{\FullScoreType}
 \includescore{Score_Full}
 
+
 \cleardoublepage
 \backmatter
 \appendix
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
index 804109b0497367833ad1170e4139f85c02f89c9e..a29151270a3c6618feaefbd7124a04a5522a1e14 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
index 911b75c579dd752dd98caec69c0aa96b027e2b50..8cfa7a40d86e2bce547be3cb4f6e7620c86accc0 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
+
 \phantomsection
 \addcontentsline{toc}{section}{\LongScoreType}
 \includescore{Score_Long}
 
+
 \cleardoublepage
 \backmatter
 \appendix
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
index cce49d4f5e99f68a486e927474a04bf6f3401458..a0ffab5e388a7f81d8ab95e2ff14b50137f8f5ab 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
@@ -14,10 +14,12 @@
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
+
 \phantomsection
 \addcontentsline{toc}{section}{\OriginalScoreType}
 \includescore{Score_Original}
 
+
 \cleardoublepage
 \backmatter
 \appendix
diff --git a/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex b/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
index d446d3728b4c4319d1329a08da1dcc56008b89c1..79fc12ea06a49fb18a8dfad7c14840a5ebb199cc 100644
--- a/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
+++ b/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{orchestrallily/editionkainhofer}
+\usepackage[vocalscore]{editionkainhofer}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Settings.itex}
 
 \hypersetup{
@@ -14,11 +14,11 @@
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Coverpage.itex}
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Preface_Long.itex}
 
+
 \phantomsection
 \addcontentsline{toc}{section}{\VocalScoreType}
 \includescore{Score_Vocal}
 
 
-
 \input{TeX_Eybler_TuaEstPotentia_HV50_Include_Backpage.itex}
 \end{document}
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_A.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_A.pdf
index 182580d6c2510237d53320a9818e6a4e19b7d2c8..48846ad9f9b5e04a99b3e611a85e35f3239fa345 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_A.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_A.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_B.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_B.pdf
index 60e1bb6e090fc7d04c1fce2d88ef52e25574f9ca..e0eb98176f37c533eaed214ff73e80c21d03f7f2 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_B.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_B.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_ClI.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_ClI.pdf
index d71b9af89860cdf645447a29f5c52ade84ca3856..67742e91b9fe81cfe5f3cc9d2d80af0e81c43889 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_ClI.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_ClI.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_ClII.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_ClII.pdf
index a6dee482e13e22f40627ba6751fd2fa96bfd05ca..8716599ba146a33cd904474804f7448f76cbfc59 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_ClII.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_ClII.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.pdf
index 65db86f72c3c6360b7d87f79b61378f8a29bb2e2..c00620a978da08510c05ae7230af1284767324e4 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_Continuo.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_FagI.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_FagI.pdf
index 95b39941ec35ba7ee8352479e0a5bd26e053230c..6b53306501a32cae295c6bd4393adca80884f484 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_FagI.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_FagI.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_FagII.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_FagII.pdf
index 76bf462144abc4a4a6c19a86241889077c75ae0f..74b4484ff996de5fd936b63e2425a90332e08f71 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_FagII.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_FagII.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_S.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_S.pdf
index dbeb9ab029cb5a812a745723b6f0f2f7456c085a..ceee238aab7b10c9b80e52e935ca3d19f7e8031f 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_S.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_S.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_T.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_T.pdf
index ae2e2ef59161cbea721150dc0dc048d25af9d79b..8a1024d3204380c2821cdd5966b3e8c5fc22f6c1 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_T.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_T.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.pdf
index 6536fe8e49942e1870b8e920e49566ca91819307..cee6d6d5d6b8adf829b8f6e690756200e832c06b 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeI.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.pdf
index 7409a8fc787cd552ec9a192e649a7f004bb157ca..13a91cd9f53c0637d2a611118e33a0fb9f1b0e65 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_TbeII.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_Tim.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_Tim.pdf
index c8682ca6d3e6f51aa40508037b788adb127f6210..8fa62d58010d78b140e06b2380bcefa8c68021ab 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_Tim.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_Tim.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.pdf
index 7f8d9750b7e9928c207ddbe329a2c15497e524f6..f73ae0233051b0ac377ce3bffc94bfc6b91d0109 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbI.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.pdf
index 35f7f8ff2208e080add3fabf106f9f316e944a62..53eac3057c49c3a17b88eaf998eb9eb17cbce099 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_TrbII.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_VI.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_VI.pdf
index 3450321ea8a0368860c858feea1e82ef22a0eae1..09f7d8cbe14983f8928ca811d722dc04bcdca1e0 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_VI.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_VI.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_VII.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_VII.pdf
index dc8a5a0f8f8f30fac053a975e281296a1ac0aa7b..467aa57c890efefff40be779929721b3690f849c 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_VII.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_VII.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_Va.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_Va.pdf
index cb9f2e2d11c2f6aea7ae5aea842b2cd716ef3d55..c97ae6c19d55d02c6fef87d466a032291d1250b7 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_Va.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_Va.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Instrument_VcB.pdf b/out/Eybler_TuaEstPotentia_HV50_Instrument_VcB.pdf
index 780cbe05a30174b37d45356f9f8ed4416d8db305..600d78dbf2ac8016ebc272bd7011c99ed82c3a2f 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Instrument_VcB.pdf and b/out/Eybler_TuaEstPotentia_HV50_Instrument_VcB.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ.pdf
index 57774813b44ca18d4baef61e7ad5bc516e4da4b2..158001c4d930c4073b757291b19f741353b4985d 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch.pdf
index 1db1d194ad31820e5d3429186ae684a7a4249a67..449315c374a574cb1a52e8786f821b6fa2f15a29 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole.pdf
index 55f72606208ebc59c61f934943cb19c3882ce356..70839477e73b2488d514efd25cd960731df23dc6 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part.pdf
index 25c7652a1637e4e88b84dd3d41efd103cdf36505..128d9018b9de5926321ca571f5ec23b3ee4689eb 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va.pdf
index c107570170f83f1f78b13e9bd37a37c5370d361d..3989b79caabd91980920794e272aeacf1bab0713 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1.pdf
index 52470ac390f252a17f29e87445f169b009e497fb..0229eb7afcb2c1c5e5572ca468a7339433ba5c33 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6.pdf
index 5ea0b1d64ba567be5f75e4b659ed043ae2dc525d..2dcbfc74de7a50f29d8e64038ef06f90317f8cf5 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf
index 66209ec9b36e66c82b2bc7b55c70913b8dc60402..1b9ab48c82e84f859d2c6474316df41a8c8be914 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf and b/out/Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Choral.midi b/out/Eybler_TuaEstPotentia_HV50_Score_Choral.midi
index 8a0f133510c1a2d91a097b4aa6384fcea38af5f7..0b62b4fc4d4970da806f8f8385a3b58f75471b5f 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Choral.midi and b/out/Eybler_TuaEstPotentia_HV50_Score_Choral.midi differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Choral.pdf b/out/Eybler_TuaEstPotentia_HV50_Score_Choral.pdf
index e942bb3c66f8123fa963a7831177e78181c14f97..b3c33b7072347cf1899dd0359ade97b9c79f842d 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Choral.pdf and b/out/Eybler_TuaEstPotentia_HV50_Score_Choral.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Full.midi b/out/Eybler_TuaEstPotentia_HV50_Score_Full.midi
index 6fa4dd3d6522113851d5b6a9335da0128abbd9d6..6cb153a41e90cee571cccbefb2a3b8016fc64894 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Full.midi and b/out/Eybler_TuaEstPotentia_HV50_Score_Full.midi differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Full.pdf b/out/Eybler_TuaEstPotentia_HV50_Score_Full.pdf
index c9bdc5532c7af69e5a1af39f00df024907f2ce78..31e5fc9931822507820f766e13090c1044fd454a 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Full.pdf and b/out/Eybler_TuaEstPotentia_HV50_Score_Full.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Long.midi b/out/Eybler_TuaEstPotentia_HV50_Score_Long.midi
index d9d9d11cfbfbf9ee6bf10e9cefb92cdd4d336567..acc93fe84d50599fd386f7970e7924af2e555290 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Long.midi and b/out/Eybler_TuaEstPotentia_HV50_Score_Long.midi differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Long.pdf b/out/Eybler_TuaEstPotentia_HV50_Score_Long.pdf
index a24e8885bc2356384c041f44d6baec99e2abb8a5..9158690e7092b4614aa966a86e827a82f4dcef16 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Long.pdf and b/out/Eybler_TuaEstPotentia_HV50_Score_Long.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Original.midi b/out/Eybler_TuaEstPotentia_HV50_Score_Original.midi
index cd1f2a9953a7179f5e7422e5524edf53a48b91b6..b6d325ac86dd175e69ebcd37169caf5f10856d33 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Original.midi and b/out/Eybler_TuaEstPotentia_HV50_Score_Original.midi differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Original.pdf b/out/Eybler_TuaEstPotentia_HV50_Score_Original.pdf
index f069e7ac976a334f79c9a84bbfc09b2e06e8330a..2403afe92cbad2a930eb68eccc5189ce5930dd28 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Original.pdf and b/out/Eybler_TuaEstPotentia_HV50_Score_Original.pdf differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.midi b/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.midi
index 8a0f133510c1a2d91a097b4aa6384fcea38af5f7..0b62b4fc4d4970da806f8f8385a3b58f75471b5f 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.midi and b/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.midi differ
diff --git a/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf b/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf
index ec74a6ad59dfd1dfd5c1478091b25bb7bb024f33..cf5cd2125434279668d4ca45f105ef9036acda8c 100644
Binary files a/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf and b/out/Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.pdf
index 1962118e40be9bb575f0c9e1db961fb7d837d425..807a60f0fed17f0f29ac4635c8860568ea3a16f8 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Choral.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.pdf
index c2f6d45add35d453d2058db50f86f79369c9ad78..abe703c8e7b74a5d557c058e9d0f3159ca387d33 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Full.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.pdf
index e90f1b5eeea9ea8bebfc4243bb71244c50e2deca..51f6e2d6cb58df37afa9cf9b75cf2e7f2523f125 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.pdf
index 56b41c4fc5a62cd25a9173f8e43ce6500bf0da58..6f789af2bf2fac092143f0d3970c688846393673 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Long.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.pdf
index 5358a4fbfc4472e2c0b5c0a44e7c317ce4495f8f..223f244b18748d739f5318ead50d85061e12c01b 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Original.pdf differ
diff --git a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf
index 113994737dfdfd4f057d2ffca06f6e92314eacbd..c475e9bc2119b67967ba907eca30c3debe24ed3c 100644
Binary files a/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf and b/out/TeX_Eybler_TuaEstPotentia_HV50_Score_Vocal.pdf differ
diff --git a/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
index a30b7c90495fcbbd1cfd3c848c588eef9c700f13..4c41fe864e88f4e6bca4a93c1e04f3a3e08ac475 100644
--- a/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Include_KritBericht.itex.patch
@@ -296,9 +296,9 @@
 +{
 +
 +\centering
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-FalschTriole}
 + bzw.
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Falsch}
 +
 +}
 +Dieser Schlag ist offensichtlich um 1/32 zu lang, mögliche korrigierte Lesearten
@@ -306,8 +306,8 @@
 +{
 +
 +\centering
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part} oder
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Part} oder
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-Alternativ}
 +
 +}
 +Erstere Variante findet sich an der einzigen korrekten Stelle, dem dritten
@@ -318,7 +318,7 @@
 +{
 +
 +\centering
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Schlag-T6Va}
 +
 +}
 +
@@ -328,14 +328,14 @@
 +{
 +
 +\centering
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6}
 +
 +}
 +Die möglichen korrigierten Lesarten wären
 +{
 +
 +\centering
-+\includegraphics[scale=0.85]{Eybler_Graduale_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1}
++\includegraphics[scale=0.85]{Eybler_TuaEstPotentia_HV50_KritBericht_Rhythm-Takt6-1}
 +
 +}
 +Der zweite und vierte Schlag mit den 64-teln scheinen rhythmisch verkleinerte Varianten
diff --git a/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch b/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
index b325eed31cd5bb79be5767a9019e27ff55da8224..e37c2ab8a22c066e4226a2b71a7add97f7a33c1e 100644
--- a/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.patch
@@ -1,116 +1,92 @@
---- TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.new	2009-10-01 12:56:26.000000000 +0200
-+++ TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex	2009-10-01 12:56:07.000000000 +0200
-@@ -16,82 +16,64 @@
+--- TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex.new	2009-10-05 19:23:01.000000000 +0200
++++ TeX_Eybler_TuaEstPotentia_HV50_Score_Instruments.tex	2009-10-05 19:22:23.000000000 +0200
+@@ -17,17 +17,36 @@
  
  
- 
-+\phantomsection
-+\addcontentsline{toc}{section}{\OrganName}
-+\includescore{Instrument_Organ}
- 
-+\phantomsection
+ \phantomsection
+-\addcontentsline{toc}{section}{\ClIName}
+-\includescore{Instrument_ClI}
++\addcontentsline{toc}{section}{\ContinuoName}
++\includescore{Instrument_Continuo}
++
+ \phantomsection
+-\addcontentsline{toc}{section}{\ClIIName}
+-\includescore{Instrument_ClII}
 +\addcontentsline{toc}{section}{\SName}
 +\includescore{Instrument_S}
-+\phantomsection
+ \phantomsection
+-\addcontentsline{toc}{section}{\FagIName}
+-\includescore{Instrument_FagI}
 +\addcontentsline{toc}{section}{\AName}
 +\includescore{Instrument_A}
-+\phantomsection
+ \phantomsection
+-\addcontentsline{toc}{section}{\FagIIName}
+-\includescore{Instrument_FagII}
 +\addcontentsline{toc}{section}{\TName}
 +\includescore{Instrument_T}
 +\phantomsection
 +\addcontentsline{toc}{section}{\BName}
 +\includescore{Instrument_B}
- 
- 
- \phantomsection
--\addcontentsline{toc}{section}{\ClIName}
--\includescore{Instrument_ClI}
--
++
++
++\phantomsection
 +\addcontentsline{toc}{section}{\VIName}
 +\includescore{Instrument_VI}
- \phantomsection
--\addcontentsline{toc}{section}{\ClIIName}
--\includescore{Instrument_ClII}
--
++\phantomsection
 +\addcontentsline{toc}{section}{\VIIName}
 +\includescore{Instrument_VII}
- \phantomsection
--\addcontentsline{toc}{section}{\FagIName}
--\includescore{Instrument_FagI}
--
++\phantomsection
 +\addcontentsline{toc}{section}{\VaName}
 +\includescore{Instrument_Va}
- \phantomsection
--\addcontentsline{toc}{section}{\FagIIName}
--\includescore{Instrument_FagII}
++\phantomsection
 +\addcontentsline{toc}{section}{\VcBName}
 +\includescore{Instrument_VcB}
- 
++
  \phantomsection
  \addcontentsline{toc}{section}{\TbeIName}
  \includescore{Instrument_TbeI}
--
- \phantomsection
- \addcontentsline{toc}{section}{\TbeIIName}
- \includescore{Instrument_TbeII}
--
- \phantomsection
- \addcontentsline{toc}{section}{\TrbIName}
- \includescore{Instrument_TrbI}
--
- \phantomsection
+@@ -41,36 +60,20 @@
  \addcontentsline{toc}{section}{\TrbIIName}
  \includescore{Instrument_TrbII}
--
--\phantomsection
+ \phantomsection
 -\addcontentsline{toc}{section}{\TimName}
 -\includescore{Instrument_Tim}
--
- \phantomsection
+-\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}
--
 -\phantomsection
 -\addcontentsline{toc}{section}{\AName}
 -\includescore{Instrument_A}
--
 +\addcontentsline{toc}{section}{\ClIName}
 +\includescore{Instrument_ClI}
  \phantomsection
 -\addcontentsline{toc}{section}{\TName}
 -\includescore{Instrument_T}
--
 +\addcontentsline{toc}{section}{\ClIIName}
 +\includescore{Instrument_ClII}
  \phantomsection
 -\addcontentsline{toc}{section}{\BName}
 -\includescore{Instrument_B}
--
 +\addcontentsline{toc}{section}{\FagIName}
 +\includescore{Instrument_FagI}
  \phantomsection
 -\addcontentsline{toc}{section}{\ContinuoName}
 -\includescore{Instrument_Continuo}
--
 +\addcontentsline{toc}{section}{\FagIIName}
 +\includescore{Instrument_FagII}
  \phantomsection
 -\addcontentsline{toc}{section}{\VcBName}
 -\includescore{Instrument_VcB}
 -
--
 +\addcontentsline{toc}{section}{\TimName}
 +\includescore{Instrument_Tim}