diff --git a/Makefile b/Makefile
index 290c0b2a3828a37fd467a77fdf7b248f48e38f8c..982559b968200423f458c04eab9c49c853c6ab32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
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
+SRCS = $(base)_Music_OmnesDeSabaVenient.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 CorI CorII TbeI TbeII Tim VI VII Va SSolo S A T B Continuo VcB TrbI TrbIII O
scores = Long Full Vocal Choral Original
pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
- $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+ $(scores:%=$(OUT)/$(base)_Score_%.pdf)
texbase = Eybler_OmnesDeSabaVenient_HV40
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
index ab772125a90da013588c18c52495dc5e6897d009..83bbc21a88e98bbcd66f596c6fa5c6880706fcb3 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex
@@ -14,11 +14,11 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\ChoralScoreType}
\includescore{Score_Choral}
-
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}
\end{document}
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Full.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Full.tex
index eda92ef499b4f18bf36a885750570d77263a869e..19834685ef18a8d3a0d8a07272b2e4d5ae4fe97e 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Full.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Full.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType}
\includescore{Score_Full}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Long.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Long.tex
index cd6d9918d40b3836ad5501d4232b618635196043..1fa6430b7a2c0a1469c9f20071f28b686a416fc1 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Long.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Long.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\LongScoreType}
\includescore{Score_Long}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Original.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Original.tex
index 26a3653e4b1e21d78dd16c6f80e0bbd877b547e4..4097ef590f6fa49f83680f855bd8e383ddea407c 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Original.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Original.tex
@@ -14,10 +14,12 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\OriginalScoreType}
\includescore{Score_Original}
+
\cleardoublepage
\backmatter
\appendix
diff --git a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
index 4f185b591a9245fe8cd5d95076bbdfc2de7645ee..7fe206f961189f3df8ecbd479372ffb8429579ed 100644
--- a/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
+++ b/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex
@@ -14,11 +14,11 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+
\phantomsection
\addcontentsline{toc}{section}{\VocalScoreType}
\includescore{Score_Vocal}
-
\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 53ce2c8aba57e0f9eea3951438015af5ec47fde4..b2f51b9eff4ed0b328d175c972fb9af21fa7de26 100644
--- a/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.patch
@@ -1,13 +1,13 @@
---- 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 @@
+--- TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex.new 2009-10-05 19:13:56.000000000 +0200
++++ TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.tex 2009-10-05 16:10:54.000000000 +0200
+@@ -14,7 +14,38 @@
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
\input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
+\phantomsection
+\addcontentsline{toc}{section}{\ContinuoName}
+\includescore{Instrument_Continuo}
-
++
+\phantomsection
+\addcontentsline{toc}{section}{\SSoloName}
+\includescore{Instrument_SSolo}
@@ -24,8 +24,6 @@
+\addcontentsline{toc}{section}{\BName}
+\includescore{Instrument_B}
--
--
+\phantomsection
+\addcontentsline{toc}{section}{\VIName}
+\includescore{Instrument_VI}
@@ -41,94 +39,51 @@
\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}{\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}
--
+@@ -43,52 +74,13 @@
\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