diff --git a/Mozart_BenedictusSitDeus_Music_01_Allegro.ily b/Mozart_BenedictusSitDeus_Music_01_Allegro.ily
index 83387de75f3c780acdcaf68552ce33717d2211b7..2f7fbb666088fb42364650cd65a4309c8f07206a 100644
--- a/Mozart_BenedictusSitDeus_Music_01_Allegro.ily
+++ b/Mozart_BenedictusSitDeus_Music_01_Allegro.ily
@@ -660,7 +660,7 @@ IAllegroBCMusic = \relative c' {
   g,[ g g g] c4 r \bar"|."
 }
 
-IAllegroBCFbMusic = \figuremode {
+IAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
   s4 < 6 >8 s s s \bassFigureExtendersOn <6> <6> \bassFigureExtendersOff | % 2
   <6> <6 4> <6> <6 5> s4 <6>8 s | % 3
   \bassFigureExtendersOn <7 3> <6 3> <8 3> <8 3> <9 7> <8 6> <8 6> <6\!>16 <5> | % 4
diff --git a/Mozart_BenedictusSitDeus_Music_02_Andante.ily b/Mozart_BenedictusSitDeus_Music_02_Andante.ily
index b6f0c57042d55bf2a5db47e8c3b6f1e3fce517b7..d0c6b1e8d7a1489f352a8ed5aa65cabf4f0ecdd0 100644
--- a/Mozart_BenedictusSitDeus_Music_02_Andante.ily
+++ b/Mozart_BenedictusSitDeus_Music_02_Andante.ily
@@ -972,7 +972,7 @@ IIAndanteBCMusic = \relative c {
   f[ f,] f'4 \bar"|."
 }
 
-IIAndanteFiguredBassMusic = \figuremode {
+IIAndanteFiguredBassMusic = \figuremode { \bassFigureStaffAlignmentDown
   \IIAndanteSettings
   s4 <6>8 s | % 2
   s <2> <6>4 | % 3
diff --git a/Mozart_BenedictusSitDeus_Music_03_Allegro.ily b/Mozart_BenedictusSitDeus_Music_03_Allegro.ily
index 475ffdf03748132daa5dc511d21d6138bab768cb..1f0a1f8b14945c7b26c76f800bfbcf62263c6d33 100644
--- a/Mozart_BenedictusSitDeus_Music_03_Allegro.ily
+++ b/Mozart_BenedictusSitDeus_Music_03_Allegro.ily
@@ -679,7 +679,7 @@ IIIAllegroBCMusic = \relative c {
   c8.[ c'16] g16.[ c32 g16. e32] c2 \bar"|."
 }
 
-IIIAllegroBCFbMusic = \figuremode {
+IIIAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
   \IIIAllegroSettings
   \bassFigureExtendersOn
   <8 3>8 <5 3>8 <5 3\!> <5 3> <6> <6> <6> <6> | % 2
diff --git a/Mozart_BenedictusSitDeus_Score_Full.ly b/Mozart_BenedictusSitDeus_Score_Full.ly
index 85c958598e3b73bd59d529a6730ca3ea79fbee52..81753af7de9f5043ffa5bb4e91a84d849b642aa5 100644
--- a/Mozart_BenedictusSitDeus_Score_Full.ly
+++ b/Mozart_BenedictusSitDeus_Score_Full.ly
@@ -8,8 +8,6 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-#(set-global-staff-size 12.5)
-
 \createNoCuesScore #"IAllegro" #'("FullScore")
 \createNoCuesScore #"IIAndante" #'("FullScore")
 \createNoCuesScore #"IIIAllegro" #'("FullScore")
diff --git a/Mozart_BenedictusSitDeus_Settings_Global.ily b/Mozart_BenedictusSitDeus_Settings_Global.ily
index 3ae3756d0d54be78010188bd9dddd57c19cec127..bc3cf3b8dde998980aad2bfcb5ed22983a520ffd 100644
--- a/Mozart_BenedictusSitDeus_Settings_Global.ily
+++ b/Mozart_BenedictusSitDeus_Settings_Global.ily
@@ -6,12 +6,12 @@ scorenumber="EK-0004"
 
 \header {
   title = "Benedictus sit Deus"
+  titlepagetitle = "Benedictus sit Deus"
   subtitle = "Offertorium, KV 117 (66a = 47b)"
-%   subsubtitle = "KV 117"
+  titlepagesubtitle = "Offertorium, KV 117 (66a = 47b)"
   composer = "Wolfgang Amadeus Mozart (1756-1791)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { 2009, \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."}
+      \line { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
   }
 }
 
diff --git a/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex b/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex
index e525b131842766bb55aea62b32dc0fd3f7595070..88700f3b5aa36997f1163564693c2d83d2eb6a12 100644
--- a/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex
+++ b/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex
@@ -1,61 +1,6 @@
-\begin{center}
-
-\begin{minipage}{0.5\textwidth}
-\tableofcontents
-\end{minipage}
+\input{TeX_Mozart_BenedictusSitDeus_Include_TOC.itex}
+\input{TeX_Mozart_BenedictusSitDeus_Include_Material.itex}
 \vfill
+\input{TeX_Mozart_BenedictusSitDeus_Include_Sources.itex}
 \vfill
-
-\end{center}
-
-
-
-\begin{center}
-
-\scorelistbox{
-Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
-
-\LongScoreName{} (-\LongScoreNumber),
-\FullScoreName{} (-\FullScoreNumber),
-\VocalScoreName{} (-\VocalScoreNumber),
-\ParticellScoreName{} (-\ParticellScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber),
-\OriginalScoreName{} (-\OriginalScoreNumber),
-\InstrumentsName{} (-\InstrumentsNumber),
-\FlIName{} (-\FlINumber),
-\FlIIName{} (-\FlIINumber),
-\CorIName{} (-\CorINumber),
-\CorIIName{} (-\CorIINumber),
-\TbeIName{} (-\TbeINumber),
-\TbeIIName{} (-\TbeIINumber),
-\TimName{} (-\TimNumber),
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\VaName{} (-\VaNumber),
-\SSoloName{} (-\SSoloNumber),
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber),
-\ContinuoName{} (-\ContinuoNumber),
-\VcBName{} (-\VcBNumber),
-
-}
-\end{center}
-
-\vfill
-\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
-\begin{hauptquellen}
-\item [BH1880] Offertorium pro omni tempore: \q{Benedictus sit Deus}. In: Wolfgang Amadeus Mozart's Werke, Kritisch durchgesehene Gesammtausgabe. Serie 3. Kleinere geistliche Gesangwerke. Zweiter Band, Nr. 20. Breitkopf and Härtel, Leipzig, 1880. (Primary)\\[0em]
-\item [Bä1963] Benedictus sit Deus, Offertorium, Bärenreiter, 1963. Internationale Stiftung Mozarteum, Online Publications (2006). (Secondary)
-\end{hauptquellen}
-
-\vfill
-
-\makeatletter
-\copyrightbox{© \@year, \@publisher\newline
-1. Auflage / 1st Printing \@year\newline
-Computersatz mit \@software\newline
-Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
-
-
+\input{TeX_Mozart_BenedictusSitDeus_Include_Copyrightbox.itex}
diff --git a/TeX_Mozart_BenedictusSitDeus_Include_Copyrightbox.itex b/TeX_Mozart_BenedictusSitDeus_Include_Copyrightbox.itex
new file mode 100644
index 0000000000000000000000000000000000000000..5556f22328eb28028f1fdaec56980bae57c88b63
--- /dev/null
+++ b/TeX_Mozart_BenedictusSitDeus_Include_Copyrightbox.itex
@@ -0,0 +1,6 @@
+\makeatletter
+\copyrightbox{© \@year, \@publisher\newline
+1. Auflage / 1st Printing \@year\newline
+Computersatz mit \@software\newline
+Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
+\makeatother
diff --git a/TeX_Mozart_BenedictusSitDeus_Include_Material.itex b/TeX_Mozart_BenedictusSitDeus_Include_Material.itex
new file mode 100644
index 0000000000000000000000000000000000000000..4bf35d2718eddfde38ecde288fbcf25b71cd98bc
--- /dev/null
+++ b/TeX_Mozart_BenedictusSitDeus_Include_Material.itex
@@ -0,0 +1,26 @@
+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\FullScoreNumber),
+% \VocalScoreName{} (-\VocalScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+
+\InstrumentsName{} (-\InstrumentsNumber),
+\ContinuoName{} (-\ContinuoNumber);
+
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VaName{} (-\VaNumber),
+\VcBName{} (-\VcBNumber);
+
+\FlIName{} (-\FlINumber),
+\FlIIName{} (-\FlIINumber),
+\CorIName{} (-\CorINumber),
+\CorIIName{} (-\CorIINumber),
+\TbeIName{} (-\TbeINumber),
+\TbeIIName{} (-\TbeIINumber),
+\TimName{} (-\TimNumber).
+}
+\end{center}
diff --git a/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex b/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex
new file mode 100644
index 0000000000000000000000000000000000000000..c4c41766b898a9915c59dcedc4d72ef1d604cdde
--- /dev/null
+++ b/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex
@@ -0,0 +1,5 @@
+\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+\begin{hauptquellen}
+\item [BH1880] Offertorium pro omni tempore: \q{Benedictus sit Deus}. In: Wolfgang Amadeus Mozart's Werke, Kritisch durchgesehene Gesammtausgabe. Serie 3. Kleinere geistliche Gesangwerke. Zweiter Band, Nr. 20. Breitkopf and Härtel, Leipzig, 1880. (Primary)\\[0em]
+\item [Bä1963] Benedictus sit Deus, Offertorium, Bärenreiter, 1963. Internationale Stiftung Mozarteum, Online Publications (2006). (Secondary)
+\end{hauptquellen}
diff --git a/TeX_Mozart_BenedictusSitDeus_Include_TOC.itex b/TeX_Mozart_BenedictusSitDeus_Include_TOC.itex
new file mode 100644
index 0000000000000000000000000000000000000000..df458609ccc173f6d6e3073fd2d2e5a904f71a4f
--- /dev/null
+++ b/TeX_Mozart_BenedictusSitDeus_Include_TOC.itex
@@ -0,0 +1,7 @@
+\begin{center}
+\begin{minipage}{0.5\textwidth}
+\tableofcontents
+\end{minipage}
+\vfill
+\vfill
+\end{center}
diff --git a/TeX_Mozart_BenedictusSitDeus_Score_Choral.tex b/TeX_Mozart_BenedictusSitDeus_Score_Choral.tex
index 0b4788e36600a5097036d2101afb54e610c3ca45..14a5aa7ca23b181873f07f60d218fa571853450a 100644
--- a/TeX_Mozart_BenedictusSitDeus_Score_Choral.tex
+++ b/TeX_Mozart_BenedictusSitDeus_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[choralscore]{editionkainhofer}
+\usepackage[nocolortitle,choralscore]{editionkainhofer}
 \input{TeX_Mozart_BenedictusSitDeus_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\ChoralScoreType}
 \scorenumber{\scoreNumber\ChoralScoreNumber}
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Mozart_BenedictusSitDeus_Include_Coverpage.itex}
diff --git a/TeX_Mozart_BenedictusSitDeus_Score_Full.tex b/TeX_Mozart_BenedictusSitDeus_Score_Full.tex
index 99372959485056ea761ad948fdfbbbf551222de8..be7a6ebb1d38eab93eec4ec166498b5dadd6be5d 100644
--- a/TeX_Mozart_BenedictusSitDeus_Score_Full.tex
+++ b/TeX_Mozart_BenedictusSitDeus_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[fullscore]{editionkainhofer}
+\usepackage[nocolortitle,fullscore]{editionkainhofer}
 \input{TeX_Mozart_BenedictusSitDeus_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\FullScoreType}
 \scorenumber{\scoreNumber\FullScoreNumber}
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Mozart_BenedictusSitDeus_Include_Coverpage.itex}
diff --git a/TeX_Mozart_BenedictusSitDeus_Score_Instruments.tex b/TeX_Mozart_BenedictusSitDeus_Score_Instruments.tex
index d0c720b9493396002a3dd9dbb0427cfb31a9ec6b..4e0e42e26f8b434baf9d6a1c8526b906de8cfe64 100644
--- a/TeX_Mozart_BenedictusSitDeus_Score_Instruments.tex
+++ b/TeX_Mozart_BenedictusSitDeus_Score_Instruments.tex
@@ -1,18 +1,61 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[instrumentalparts]{editionkainhofer}
+\usepackage[nocolortitle,instrumentalparts]{editionkainhofer}
 \input{TeX_Mozart_BenedictusSitDeus_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
 }
 
+\makeatletter
+\frontpageinstrumentation{\@instrumentation}
+\frontpageeditor{\@editor}
+\makeatother
+
 \scoretype{\InstrumentalPartsType}
 \scorenumber{\scoreNumber\InstrumentalPartsNumber}
+% \ismn{XXXXXXXX}
+
+\todos{
+\begin{center}
+\null
+\vfill
+\section*{\Huge Inhalt / Contents}
+\begin{Large}
+
+\FlIName\\
+\FlIIName\\
+\CorIName\\
+\CorIIName\\
+\TbeIName\\
+\TbeIIName\\
+\TimName\\
+\VIName\\
+\VIIName\\
+\VaName\\
+\SSoloName\\
+\SName\\
+\AName\\
+\TName\\
+\BName\\
+\ContinuoName\\
+\VcBName\\
+
+\end{Large}
+\end{center}
+\vfill
+\vfill
+\input{TeX_Mozart_BenedictusSitDeus_Include_Material.itex}
+\input{TeX_Mozart_BenedictusSitDeus_Include_Sources.itex}
+\input{TeX_Mozart_BenedictusSitDeus_Include_Copyrightbox.itex}
+}
+
+\pagestyle{empty}
 
 \begin{document}
-\input{TeX_Mozart_BenedictusSitDeus_Include_Coverpage.itex}
-\input{TeX_Mozart_BenedictusSitDeus_Include_Preface_Long.itex}
+\makefrontpage
 
+% Remove the \iffalse if you want all instrumental parts to be included here
+\iffalse
 
 
 \phantomsection
@@ -67,7 +110,21 @@
 \addcontentsline{toc}{section}{\VcBName}
 \includescore{Instrument_VcB}
 
+\fi
+
+\pagebreak
+\pagestyle{empty}
+\thispagestyle{empty}
+
 
+\begin{preface}
+\input{TeX_Mozart_BenedictusSitDeus_Include_About.itex}
+\input{TeX_Mozart_BenedictusSitDeus_Include_Bio.itex}
+\input{TeX_Mozart_BenedictusSitDeus_Include_Text.itex}
+\end{preface}
 
-\input{TeX_Mozart_BenedictusSitDeus_Include_Backpage.itex}
+\thispagestyle{empty}
+\pagebreak
+\thispagestyle{empty}
+\backpage
 \end{document}
diff --git a/TeX_Mozart_BenedictusSitDeus_Score_Vocal.tex b/TeX_Mozart_BenedictusSitDeus_Score_Vocal.tex
index 25d60baf47a715928a89f4b20a48957ce1d724ef..cccca0c6ebbc174ae892fc65483e2bddf9bbdcbd 100644
--- a/TeX_Mozart_BenedictusSitDeus_Score_Vocal.tex
+++ b/TeX_Mozart_BenedictusSitDeus_Score_Vocal.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{editionkainhofer}
+\usepackage[nocolortitle,vocalscore]{editionkainhofer}
 \input{TeX_Mozart_BenedictusSitDeus_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\VocalScoreType}
 \scorenumber{\scoreNumber\VocalScoreNumber}
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Mozart_BenedictusSitDeus_Include_Coverpage.itex}
diff --git a/TeX_Mozart_BenedictusSitDeus_Settings.itex b/TeX_Mozart_BenedictusSitDeus_Settings.itex
index b475edaeeea6a518a849200fd1e179d4f1523b4e..3d78659d8cb59f6efcdd5971aa54a2336d763948 100644
--- a/TeX_Mozart_BenedictusSitDeus_Settings.itex
+++ b/TeX_Mozart_BenedictusSitDeus_Settings.itex
@@ -1,18 +1,16 @@
-% Title Page
-\composer{Wolfgang Amadeus Mozart}
-\composerdate{(1756-1791)}
-% \poet{}
-% \poetdate{}
 \title{Benedictus sit Deus}
 \subtitle{Offertorium, KV 117 (66a = 47b)}
+\composer{Wolfgang Amadeus Mozart}
+\composerdate{(1756-1791)}
 \description{Coro (SATB), Solo (S) ed Orchestra o Organo}
 \instrumentation{2 Flauti, 2 Trombe, 2 Corni,\\
 Timpani, 2 Violini, 2 Viole,\\
 Violoncello ed Contrabbasso}
-\editor{Reinhold Kainhofer}
-\publisher{Edition Kainhofer, Vienna}
-\year{2009}
-% \scoreinfo{Urtext \& Erstdruck}
+\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+\shortpublisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+\year{2010}
+
 \basename{Mozart_BenedictusSitDeus}
 
 \newcommand{\scoreNumber}[1]{EK-0004-#1}
diff --git a/out/Mozart_BenedictusSitDeus_Score_Choral.toc b/out/Mozart_BenedictusSitDeus_Score_Choral.toc
index 117a78f83f05eb9b1a5cdc66189030c85c5b16de..fcc8c50d130cfaa86dada165c75d4630dae7c651 100644
--- a/out/Mozart_BenedictusSitDeus_Score_Choral.toc
+++ b/out/Mozart_BenedictusSitDeus_Score_Choral.toc
@@ -1,3 +1,3 @@
-1, section, 1, {1. Coro}, toc63,
-3, section, 1, {2. Aria tacet (Andante, 96 Takte)}, toc64,
-3, section, 1, {3. Coro}, toc65
\ No newline at end of file
+1, section, 1, {Coro}, toc55,
+2, section, 1, {Aria tacet (Andante, 96 Takte)}, toc56,
+3, section, 1, {Coro}, toc57
\ No newline at end of file
diff --git a/out/Mozart_BenedictusSitDeus_Score_Full.toc b/out/Mozart_BenedictusSitDeus_Score_Full.toc
index 8ed019de5d01a11f0f41f7111eec245e820c83af..d4a3c6da87d78c84148964d3bbe930c3466b1e70 100644
--- a/out/Mozart_BenedictusSitDeus_Score_Full.toc
+++ b/out/Mozart_BenedictusSitDeus_Score_Full.toc
@@ -1,3 +1,3 @@
-1, section, 1, {1. Coro}, toc63,
-6, section, 1, {2. Aria}, toc64,
-13, section, 1, {3. Coro}, toc65
\ No newline at end of file
+1, section, 1, {Coro}, toc63,
+6, section, 1, {Aria}, toc64,
+12, section, 1, {Coro}, toc65
\ No newline at end of file
diff --git a/out/Mozart_BenedictusSitDeus_Score_Vocal.toc b/out/Mozart_BenedictusSitDeus_Score_Vocal.toc
index dcb2bcb1cbc6c6bdcb59e42f20239e0af344f509..fcc8c50d130cfaa86dada165c75d4630dae7c651 100644
--- a/out/Mozart_BenedictusSitDeus_Score_Vocal.toc
+++ b/out/Mozart_BenedictusSitDeus_Score_Vocal.toc
@@ -1,3 +1,3 @@
-1, section, 1, {1. Coro}, toc63,
-4, section, 1, {2. Aria tacet (Andante, 96 Takte)}, toc64,
-4, section, 1, {3. Coro}, toc65
\ No newline at end of file
+1, section, 1, {Coro}, toc55,
+2, section, 1, {Aria tacet (Andante, 96 Takte)}, toc56,
+3, section, 1, {Coro}, toc57
\ No newline at end of file
diff --git a/patches/Mozart_BenedictusSitDeus_Instrument_Va.ly.patch b/patches/Mozart_BenedictusSitDeus_Instrument_Va.ly.patch
index 484e98f6a627d7098c97f99529638f3a5035bfe6..bf80e67c8c59185deb7e8e4ef9b351190de53775 100644
--- a/patches/Mozart_BenedictusSitDeus_Instrument_Va.ly.patch
+++ b/patches/Mozart_BenedictusSitDeus_Instrument_Va.ly.patch
@@ -1,5 +1,5 @@
---- Mozart_BenedictusSitDeus_Instrument_Va.ly.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Instrument_Va.ly	2010-09-28 02:14:57.000000000 +0200
+--- Mozart_BenedictusSitDeus_Instrument_Va.ly.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Instrument_Va.ly	2010-09-28 02:19:32.000000000 +0200
 @@ -1,12 +1,13 @@
  \version "2.13.34"
  \include "Mozart_BenedictusSitDeus_Settings_Instrument.ily"
diff --git a/patches/Mozart_BenedictusSitDeus_Instrument_VcB.ly.patch b/patches/Mozart_BenedictusSitDeus_Instrument_VcB.ly.patch
index 7eef935bab4d495d0eaf42e15ea385c976fd753d..f362cae8b697901c68f4d8e94d280858e3f130cb 100644
--- a/patches/Mozart_BenedictusSitDeus_Instrument_VcB.ly.patch
+++ b/patches/Mozart_BenedictusSitDeus_Instrument_VcB.ly.patch
@@ -1,5 +1,5 @@
---- Mozart_BenedictusSitDeus_Instrument_VcB.ly.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Instrument_VcB.ly	2010-09-28 02:15:11.000000000 +0200
+--- Mozart_BenedictusSitDeus_Instrument_VcB.ly.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Instrument_VcB.ly	2010-09-28 02:19:32.000000000 +0200
 @@ -5,6 +5,9 @@
    instrument = \VcBInstrumentName
    scorenumber = \markup{\scoreNumber \VcBNumber}
diff --git a/patches/Mozart_BenedictusSitDeus_Music_01_Allegro.ily.patch b/patches/Mozart_BenedictusSitDeus_Music_01_Allegro.ily.patch
index 3d76aee418eb1ba01adccefb5c1495ac554fcc50..a3578a9100b050d03941a4d38ba5f094b7fa8064 100644
--- a/patches/Mozart_BenedictusSitDeus_Music_01_Allegro.ily.patch
+++ b/patches/Mozart_BenedictusSitDeus_Music_01_Allegro.ily.patch
@@ -1,5 +1,5 @@
---- Mozart_BenedictusSitDeus_Music_01_Allegro.ily.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Music_01_Allegro.ily	2010-09-28 02:15:54.000000000 +0200
+--- Mozart_BenedictusSitDeus_Music_01_Allegro.ily.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Music_01_Allegro.ily	2010-11-15 14:29:12.000000000 +0100
 @@ -2,7 +2,7 @@
  
  IAllegroPieceName = "1. Coro"
@@ -738,7 +738,7 @@
 +  g,[ g g g] c4 r \bar"|."
 +}
 +
-+IAllegroBCFbMusic = \figuremode {
++IAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
 +  s4 < 6 >8 s s s \bassFigureExtendersOn <6> <6> \bassFigureExtendersOff | % 2
 +  <6> <6 4> <6> <6 5> s4 <6>8 s | % 3
 +  \bassFigureExtendersOn <7 3> <6 3> <8 3> <8 3> <9 7> <8 6> <8 6> <6\!>16 <5> | % 4
diff --git a/patches/Mozart_BenedictusSitDeus_Music_02_Andante.ily.patch b/patches/Mozart_BenedictusSitDeus_Music_02_Andante.ily.patch
index 7a191635f6b837c25fa800b4e3ee9745424eceae..c0798501eda5df72d9aae4933cf21a20b8a8a102 100644
--- a/patches/Mozart_BenedictusSitDeus_Music_02_Andante.ily.patch
+++ b/patches/Mozart_BenedictusSitDeus_Music_02_Andante.ily.patch
@@ -1,5 +1,5 @@
---- Mozart_BenedictusSitDeus_Music_02_Andante.ily.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Music_02_Andante.ily	2010-09-28 02:16:03.000000000 +0200
+--- Mozart_BenedictusSitDeus_Music_02_Andante.ily.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Music_02_Andante.ily	2010-11-15 14:29:12.000000000 +0100
 @@ -2,152 +2,1073 @@
  
  IIAndantePieceName = "2. Aria"
@@ -1038,7 +1038,7 @@
 +  f[ f,] f'4 \bar"|."
 +}
 +
-+IIAndanteFiguredBassMusic = \figuremode {
++IIAndanteFiguredBassMusic = \figuremode { \bassFigureStaffAlignmentDown
 +  \IIAndanteSettings
 +  s4 <6>8 s | % 2
 +  s <2> <6>4 | % 3
diff --git a/patches/Mozart_BenedictusSitDeus_Music_03_Allegro.ily.patch b/patches/Mozart_BenedictusSitDeus_Music_03_Allegro.ily.patch
index 75731dde62e5592093d729ac259460fa871d8b96..9f17e83275e9acc82f090719a855b867d18d8903 100644
--- a/patches/Mozart_BenedictusSitDeus_Music_03_Allegro.ily.patch
+++ b/patches/Mozart_BenedictusSitDeus_Music_03_Allegro.ily.patch
@@ -1,5 +1,5 @@
---- Mozart_BenedictusSitDeus_Music_03_Allegro.ily.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Music_03_Allegro.ily	2010-09-28 02:16:09.000000000 +0200
+--- Mozart_BenedictusSitDeus_Music_03_Allegro.ily.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Music_03_Allegro.ily	2010-11-15 14:29:12.000000000 +0100
 @@ -2,7 +2,7 @@
  
  IIIAllegroPieceName = "3. Coro"
@@ -766,7 +766,7 @@
 +  c8.[ c'16] g16.[ c32 g16. e32] c2 \bar"|."
 +}
 +
-+IIIAllegroBCFbMusic = \figuremode {
++IIIAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
 +  \IIIAllegroSettings
 +  \bassFigureExtendersOn
 +  <8 3>8 <5 3>8 <5 3\!> <5 3> <6> <6> <6> <6> | % 2
diff --git a/patches/Mozart_BenedictusSitDeus_Score_Full.ly.patch b/patches/Mozart_BenedictusSitDeus_Score_Full.ly.patch
deleted file mode 100644
index 6580678a0347d4977153f02833215de7a38f736e..0000000000000000000000000000000000000000
--- a/patches/Mozart_BenedictusSitDeus_Score_Full.ly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mozart_BenedictusSitDeus_Score_Full.ly.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Score_Full.ly	2010-09-28 02:16:27.000000000 +0200
-@@ -8,6 +8,8 @@
-   scorenumber = \markup{\scoreNumber \FullScoreNumber}
- }
- 
-+#(set-global-staff-size 12.5)
-+
- \createNoCuesScore #"IAllegro" #'("FullScore")
- \createNoCuesScore #"IIAndante" #'("FullScore")
- \createNoCuesScore #"IIIAllegro" #'("FullScore")
diff --git a/patches/Mozart_BenedictusSitDeus_Settings_Global.ily.patch b/patches/Mozart_BenedictusSitDeus_Settings_Global.ily.patch
index 482fb04911d767794598c927aa76ad2966273b58..5207e65933afe47c62aa492336c40f6e5cb166f7 100644
--- a/patches/Mozart_BenedictusSitDeus_Settings_Global.ily.patch
+++ b/patches/Mozart_BenedictusSitDeus_Settings_Global.ily.patch
@@ -1,19 +1,17 @@
---- Mozart_BenedictusSitDeus_Settings_Global.ily.new	2010-09-28 02:19:20.000000000 +0200
-+++ Mozart_BenedictusSitDeus_Settings_Global.ily	2010-09-28 02:16:40.000000000 +0200
-@@ -6,19 +6,46 @@
- 
+--- Mozart_BenedictusSitDeus_Settings_Global.ily.new	2010-11-15 14:39:55.000000000 +0100
++++ Mozart_BenedictusSitDeus_Settings_Global.ily	2010-11-15 14:31:55.000000000 +0100
+@@ -7,18 +7,45 @@
  \header {
    title = "Benedictus sit Deus"
--  titlepagetitle = "Benedictus sit Deus"
+   titlepagetitle = "Benedictus sit Deus"
 -  subtitle = "Offertorium, KV 117"
 -  titlepagesubtitle = "Offertorium, KV 117"
 +  subtitle = "Offertorium, KV 117 (66a = 47b)"
-+%   subsubtitle = "KV 117"
++  titlepagesubtitle = "Offertorium, KV 117 (66a = 47b)"
    composer = "Wolfgang Amadeus Mozart (1756-1791)"
    copyright = \markup \abs-fontsize #9 \column{
--      \line { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\scorenumber.} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
-+      \line { 2009, \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."}
+       \line { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header: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."}
    }
  }
  
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex.patch
deleted file mode 100644
index 35d4af72eb0d7ac0d82d3d704c49aa9c609ce1f4..0000000000000000000000000000000000000000
--- a/patches/TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex.new	2010-09-28 02:19:20.000000000 +0200
-+++ TeX_Mozart_BenedictusSitDeus_Include_ContentsMaterial.itex	2009-09-21 18:16:54.000000000 +0200
-@@ -15,10 +15,13 @@
- \scorelistbox{
- Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
- 
-+\LongScoreName{} (-\LongScoreNumber),
- \FullScoreName{} (-\FullScoreNumber),
- \VocalScoreName{} (-\VocalScoreNumber),
--\ChoralScoreName{} (-\ChoralScoreNumber);
--
-+\ParticellScoreName{} (-\ParticellScoreNumber),
-+\ChoralScoreName{} (-\ChoralScoreNumber),
-+\OriginalScoreName{} (-\OriginalScoreNumber),
-+\InstrumentsName{} (-\InstrumentsNumber),
- \FlIName{} (-\FlINumber),
- \FlIIName{} (-\FlIINumber),
- \CorIName{} (-\CorINumber),
-@@ -35,7 +38,7 @@
- \TName{} (-\TNumber),
- \BName{} (-\BNumber),
- \ContinuoName{} (-\ContinuoNumber),
--\VcBName{} (-\VcBNumber).
-+\VcBName{} (-\VcBNumber),
- 
- }
- \end{center}
-@@ -43,8 +46,8 @@
- \vfill
- \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
- \begin{hauptquellen}
--\item TODO: Benedictus sit Deus, Autograph. TODO.
--\item TODO: Benedictus sit Deus, Originalausgabe (Partitur), Verlag, Ort, Jahr.
-+\item [BH1880] Offertorium pro omni tempore: \q{Benedictus sit Deus}. In: Wolfgang Amadeus Mozart's Werke, Kritisch durchgesehene Gesammtausgabe. Serie 3. Kleinere geistliche Gesangwerke. Zweiter Band, Nr. 20. Breitkopf and Härtel, Leipzig, 1880. (Primary)\\[0em]
-+\item [Bä1963] Benedictus sit Deus, Offertorium, Bärenreiter, 1963. Internationale Stiftung Mozarteum, Online Publications (2006). (Secondary)
- \end{hauptquellen}
- 
- \vfill
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.patch
index 39423497a66fb6d7a8c9f1b2305c25b1d5b4c0f8..a804e29d26082c6f8ecdfc1df0a274c3fdba1763 100644
--- a/patches/TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.patch
+++ b/patches/TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.new	2010-09-28 02:19:20.000000000 +0200
-+++ TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex	2010-09-28 02:08:57.000000000 +0200
+--- TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex.new	2010-11-15 14:39:55.000000000 +0100
++++ TeX_Mozart_BenedictusSitDeus_Include_KritBericht.itex	2010-09-28 02:19:33.000000000 +0200
 @@ -233,25 +233,19 @@
  
  \subsubsection*{Einzelbemerkungen}
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Include_Material.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Include_Material.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d27ddfe8557757d756e831c2ed8f8447ca960db7
--- /dev/null
+++ b/patches/TeX_Mozart_BenedictusSitDeus_Include_Material.itex.patch
@@ -0,0 +1,39 @@
+--- TeX_Mozart_BenedictusSitDeus_Include_Material.itex.new	2010-11-15 14:39:55.000000000 +0100
++++ TeX_Mozart_BenedictusSitDeus_Include_Material.itex	2010-11-15 14:34:20.000000000 +0100
+@@ -4,26 +4,23 @@
+ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+ 
+ \FullScoreName{} (-\FullScoreNumber),
+-\VocalScoreName{} (-\VocalScoreNumber),
++% \VocalScoreName{} (-\VocalScoreNumber),
+ \ChoralScoreName{} (-\ChoralScoreNumber);
+ 
++\InstrumentsName{} (-\InstrumentsNumber),
++\ContinuoName{} (-\ContinuoNumber);
++
++\VIName{} (-\VINumber),
++\VIIName{} (-\VIINumber),
++\VaName{} (-\VaNumber),
++\VcBName{} (-\VcBNumber);
++
+ \FlIName{} (-\FlINumber),
+ \FlIIName{} (-\FlIINumber),
+ \CorIName{} (-\CorINumber),
+ \CorIIName{} (-\CorIINumber),
+ \TbeIName{} (-\TbeINumber),
+ \TbeIIName{} (-\TbeIINumber),
+-\TimName{} (-\TimNumber),
+-\VIName{} (-\VINumber),
+-\VIIName{} (-\VIINumber),
+-\VaName{} (-\VaNumber),
+-\SSoloName{} (-\SSoloNumber),
+-\SName{} (-\SNumber),
+-\AName{} (-\ANumber),
+-\TName{} (-\TNumber),
+-\BName{} (-\BNumber),
+-\ContinuoName{} (-\ContinuoNumber),
+-\VcBName{} (-\VcBNumber).
+-
++\TimName{} (-\TimNumber).
+ }
+ \end{center}
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c8bd792a1a36414b1285c167e867c9255957b5ed
--- /dev/null
+++ b/patches/TeX_Mozart_BenedictusSitDeus_Include_Sources.itex.patch
@@ -0,0 +1,10 @@
+--- TeX_Mozart_BenedictusSitDeus_Include_Sources.itex.new	2010-11-15 14:39:55.000000000 +0100
++++ TeX_Mozart_BenedictusSitDeus_Include_Sources.itex	2010-11-15 14:34:43.000000000 +0100
+@@ -1,5 +1,5 @@
+ \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+ \begin{hauptquellen}
+-\item TODO: Benedictus sit Deus, Autograph. TODO.
+-\item TODO: Benedictus sit Deus, Originalausgabe (Partitur), Verlag, Ort, Jahr.
++\item [BH1880] Offertorium pro omni tempore: \q{Benedictus sit Deus}. In: Wolfgang Amadeus Mozart's Werke, Kritisch durchgesehene Gesammtausgabe. Serie 3. Kleinere geistliche Gesangwerke. Zweiter Band, Nr. 20. Breitkopf and Härtel, Leipzig, 1880. (Primary)\\[0em]
++\item [Bä1963] Benedictus sit Deus, Offertorium, Bärenreiter, 1963. Internationale Stiftung Mozarteum, Online Publications (2006). (Secondary)
+ \end{hauptquellen}
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Include_Text.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Include_Text.itex.patch
index 9a205041789fd428dcf9ae70810b924c2b710162..5b092311771ed9e19e86564c1e6f1180cc1eafec 100644
--- a/patches/TeX_Mozart_BenedictusSitDeus_Include_Text.itex.patch
+++ b/patches/TeX_Mozart_BenedictusSitDeus_Include_Text.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Mozart_BenedictusSitDeus_Include_Text.itex.new	2010-09-28 02:19:20.000000000 +0200
-+++ TeX_Mozart_BenedictusSitDeus_Include_Text.itex	2009-10-01 12:14:27.000000000 +0200
+--- TeX_Mozart_BenedictusSitDeus_Include_Text.itex.new	2010-11-15 14:39:55.000000000 +0100
++++ TeX_Mozart_BenedictusSitDeus_Include_Text.itex	2009-10-01 14:48:09.000000000 +0200
 @@ -1,23 +1,32 @@
 -\subsection*{Text des \q{Benedictus sit Deus}: TODO}
 +\section*{Text des Offertoriums / Text of the Offertory}
diff --git a/patches/TeX_Mozart_BenedictusSitDeus_Settings.itex.patch b/patches/TeX_Mozart_BenedictusSitDeus_Settings.itex.patch
index c01ea797f97a16509c1ff57d940b3f2fffe2b8b9..f9e7001321d6bb9434f544012088f4a16782e6d5 100644
--- a/patches/TeX_Mozart_BenedictusSitDeus_Settings.itex.patch
+++ b/patches/TeX_Mozart_BenedictusSitDeus_Settings.itex.patch
@@ -1,29 +1,17 @@
---- TeX_Mozart_BenedictusSitDeus_Settings.itex.new	2010-09-28 02:19:20.000000000 +0200
-+++ TeX_Mozart_BenedictusSitDeus_Settings.itex	2009-09-20 21:46:47.000000000 +0200
-@@ -1,13 +1,18 @@
--\title{Benedictus sit Deus}
+--- TeX_Mozart_BenedictusSitDeus_Settings.itex.new	2010-11-15 14:39:55.000000000 +0100
++++ TeX_Mozart_BenedictusSitDeus_Settings.itex	2010-11-15 14:37:15.000000000 +0100
+@@ -1,9 +1,11 @@
+ \title{Benedictus sit Deus}
 -\subtitle{Offertorium, KV 117}
-+% Title Page
++\subtitle{Offertorium, KV 117 (66a = 47b)}
  \composer{Wolfgang Amadeus Mozart}
  \composerdate{(1756-1791)}
 -% \description{Per Coro (SATB) ed Organo o Orchestra}
 -% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)}
--\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
--\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
--\year{2010}
--
-+% \poet{}
-+% \poetdate{}
-+\title{Benedictus sit Deus}
-+\subtitle{Offertorium, KV 117 (66a = 47b)}
 +\description{Coro (SATB), Solo (S) ed Orchestra o Organo}
 +\instrumentation{2 Flauti, 2 Trombe, 2 Corni,\\
 +Timpani, 2 Violini, 2 Viole,\\
 +Violoncello ed Contrabbasso}
-+\editor{Reinhold Kainhofer}
-+\publisher{Edition Kainhofer, Vienna}
-+\year{2009}
-+% \scoreinfo{Urtext \& Erstdruck}
- \basename{Mozart_BenedictusSitDeus}
- 
- \newcommand{\scoreNumber}[1]{EK-0004-#1}
+ \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+ \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+ \shortpublisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}