diff --git a/Makefile b/Makefile
index f23381393779b366b6dea7d77decb4218c9652e4..c8f045495ac0fdbfc69e5c7523051be72219812c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
OUT=out
base = Eybler_DomineDeus_HV42
-SRCS = Eybler_DomineDeus_HV42_Settings_Global.ily Eybler_DomineDeus_HV42_Settings.ily Eybler_DomineDeus_HV42_Settings_VocalScore.ily Eybler_DomineDeus_HV42_Settings_ChoralScore.ily Eybler_DomineDeus_HV42_Settings_VocalVoice.ily Eybler_DomineDeus_HV42_Settings_FullScore.ily Eybler_DomineDeus_HV42_Settings_Instrument.ily Eybler_DomineDeus_HV42_Music_DomineDeus.ily $(base)_Settings.ily
+SRCS = $(base)_Music_DomineDeus.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 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_DomineDeus_HV42
diff --git a/TeX_Eybler_DomineDeus_HV42_Score_Choral.tex b/TeX_Eybler_DomineDeus_HV42_Score_Choral.tex
index 7a2a38f5e1a0c71a6d809b06e265a0ae638e000d..92cfe3c432583294870ef4b536a200eb8f21f296 100644
--- a/TeX_Eybler_DomineDeus_HV42_Score_Choral.tex
+++ b/TeX_Eybler_DomineDeus_HV42_Score_Choral.tex
@@ -14,11 +14,11 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\ChoralScoreType{} \q{Domine Deus}, HV 42}
\includescore{Score_Choral}
-
\input{TeX_Eybler_DomineDeus_HV42_Include_Backpage.itex}
\end{document}
diff --git a/TeX_Eybler_DomineDeus_HV42_Score_Full.tex b/TeX_Eybler_DomineDeus_HV42_Score_Full.tex
index 61145d556a321330ddc2f1d81669e5b3f0d13fcf..3b55f8335cea23e1d3d6ae5dda7782a35bd5bdb0 100644
--- a/TeX_Eybler_DomineDeus_HV42_Score_Full.tex
+++ b/TeX_Eybler_DomineDeus_HV42_Score_Full.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType{} \q{Domine Deus}, HV 42}
\includescore{Score_Full}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_DomineDeus_HV42_Score_Long.tex b/TeX_Eybler_DomineDeus_HV42_Score_Long.tex
index 69132b7a83edc7eaac35721f030f77219cd9377a..6767724a63266a5881b25b43148b2f694d763c35 100644
--- a/TeX_Eybler_DomineDeus_HV42_Score_Long.tex
+++ b/TeX_Eybler_DomineDeus_HV42_Score_Long.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType{} \q{Domine Deus}, HV 42}
\includescore{Score_Long}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_DomineDeus_HV42_Score_Original.tex b/TeX_Eybler_DomineDeus_HV42_Score_Original.tex
index 36fe49625f2758549025dcbe0c6677c0172b4808..b1f7bacabe5e0354128bfa90c6db6356c483430c 100644
--- a/TeX_Eybler_DomineDeus_HV42_Score_Original.tex
+++ b/TeX_Eybler_DomineDeus_HV42_Score_Original.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\OriginalScoreType}
\includescore{Score_Original}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_DomineDeus_HV42_Score_Vocal.tex b/TeX_Eybler_DomineDeus_HV42_Score_Vocal.tex
index 1d530b98a00fb03d5a0c593994db8752efd2f81e..080f8599cee82b5a0d97d0ae913739058c9f8d1a 100644
--- a/TeX_Eybler_DomineDeus_HV42_Score_Vocal.tex
+++ b/TeX_Eybler_DomineDeus_HV42_Score_Vocal.tex
@@ -14,11 +14,11 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\VocalScoreType}
\includescore{Score_Vocal}
-
\input{TeX_Eybler_DomineDeus_HV42_Include_Backpage.itex}
\end{document}
diff --git a/patches/TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.patch b/patches/TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.patch
index 377d58472e4cf6263153356a5baf6c45e7f79142..e181fcdc727fef95d0ed0134e2ca70d24fcd2a57 100644
--- a/patches/TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.patch
@@ -1,13 +1,13 @@
---- TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.new 2009-10-01 12:19:06.000000000 +0200
-+++ TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex 2009-07-31 21:35:52.000000000 +0200
-@@ -14,86 +14,58 @@
+--- TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex.new 2009-10-05 19:17:37.000000000 +0200
++++ TeX_Eybler_DomineDeus_HV42_Score_Instruments.tex 2009-10-05 16:29:17.000000000 +0200
+@@ -14,7 +14,35 @@
\input{TeX_Eybler_DomineDeus_HV42_Include_Coverpage.itex}
\input{TeX_Eybler_DomineDeus_HV42_Include_Preface_Long.itex}
+\phantomsection
+\addcontentsline{toc}{section}{\ContinuoName}
+\includescore{Instrument_Continuo}
-
++
+\phantomsection
+\addcontentsline{toc}{section}{\SName}
+\includescore{Instrument_S}
@@ -21,8 +21,6 @@
+\addcontentsline{toc}{section}{\BName}
+\includescore{Instrument_B}
--
--
+\phantomsection
+\addcontentsline{toc}{section}{\VIName}
+\includescore{Instrument_VI}
@@ -38,79 +36,47 @@
\phantomsection
\addcontentsline{toc}{section}{\ObIName}
- \includescore{Instrument_ObI}
--
- \phantomsection
- \addcontentsline{toc}{section}{\ObIIName}
- \includescore{Instrument_ObII}
--
- \phantomsection
- \addcontentsline{toc}{section}{\FagIName}
- \includescore{Instrument_FagI}
--
- \phantomsection
- \addcontentsline{toc}{section}{\FagIIName}
- \includescore{Instrument_FagII}
--
- \phantomsection
- \addcontentsline{toc}{section}{\TbeIName}
- \includescore{Instrument_TbeI}
--
- \phantomsection
+@@ -35,43 +63,8 @@
\addcontentsline{toc}{section}{\TbeIIName}
\includescore{Instrument_TbeII}
--
--\phantomsection
+ \phantomsection
-\addcontentsline{toc}{section}{\TrbIName}
-\includescore{Instrument_TrbI}
--
-\phantomsection
-\addcontentsline{toc}{section}{\TrbIIName}
-\includescore{Instrument_TrbII}
--
- \phantomsection
+-\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}{\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}
-
-
--
--
+
\cleardoublepage
\backmatter
- \appendix