diff --git a/Czerny_BeatusVir19_Music_BeatusVir.ily b/Czerny_BeatusVir19_Music_BeatusVir.ily
index eddafff3ab3944f1c41321161ee890691aaa6554..5c98d5395959d65ba8668a79d752fa7973cc4b0e 100644
--- a/Czerny_BeatusVir19_Music_BeatusVir.ily
+++ b/Czerny_BeatusVir19_Music_BeatusVir.ily
@@ -194,12 +194,14 @@ BeatusVirClIIMusic = \relative c'' {
 	g4. g8 | % 43
 	fis4\ff r | % 44
 	fis, r | % 45
-	R2*15 | \barNumberCheck #60
-	r4 r8 es' |
+	R2*8 |
+	\namedCueDuring #"BeatusVirClIMusic" #UP \cueClI "" { R2*7 | \barNumberCheck #60
+		r4 r8 es' } |
 	f[( es d c] |
 	b[ d c a] |
 	b) r r4 | \barNumberCheck #64
-	R2*10 | \barNumberCheck #74
+	R2*6 | \barNumberCheck #70
+	\namedCueDuring #"BeatusVirClIMusic" #UP \cueClI "" { R2*4 } | \barNumberCheck #74
 	d2\cresc( | % 75
 	f4 es)\! | % 76 % TODO: Bogen bis es oder folgendes e4.?
 	e4.\pp b8 | % 77
@@ -467,7 +469,8 @@ BeatusVirFagIIMusic = \relative c {
 	es8[( des c b] | % 62
 	as[ c b g] | % 63
 	as,) r r4 | % 64
-	R2*8 | \barNumberCheck #72
+	R2*6 | \barNumberCheck #70
+	\namedCueDuring #"BeatusVirFagIMusic" #UP \cueFagI "" { R2*2 } | % 72
 	c2\p\cresc | % 73
 	des | % 74
 	es4. ges8 | % 75
@@ -598,8 +601,9 @@ BeatusVirCorIMusic = \relative c'' {
 	g,8 r r4 | % 62
 	c4. c8 | % 63
 	c r r4 | % 64
-	R2*7 | \barNumberCheck #71
-	\partcombineSoloI r8 c4\p c8 | % 72
+	R2*6 | \barNumberCheck #70
+	\namedCueDuring #"BeatusVirFagIMusic" #UP "Clt.1, Fag.1" "" { R2 | % 71
+		\partcombineSoloI r8 }c4\p c8 | % 72
 	\partcombineAutomatic f2~ | % 73
 	f8[ f\cresc g f~] | % 74
 	f\! f4 f8~ | % 75
@@ -680,8 +684,9 @@ BeatusVirCorIIMusic = \relative c' {
 	r8 d[ d d] | % 9
 	d4. d8 | \barNumberCheck #10
 	d8 r r4 | % 11
-	R2*12 | % 23
-	d8[\p d d d] | % 24
+	R2*8 | % 19
+	\namedCueDuring #"BeatusVirFagIMusic" #DOWN "Fag.I, Clt.I" "" { R2*4 | % 23
+		\stemUp d8[\p } \stemUp d d d] \stemNeutral | % 24
 	d2 | % 25
 	R2*6 | \barNumberCheck #31
 	e,8[\f-. e-. e-. e]-. | % 32
@@ -711,7 +716,8 @@ BeatusVirCorIIMusic = \relative c' {
 	R2*7 | \barNumberCheck #62
 	c4. c8 | % 63
 	c8 r r4 | % 64
-	R2*8 | \barNumberCheck #72
+	R2*7 | \barNumberCheck #71
+	\namedCueDuring #"BeatusVirCorIMusic" #UP \cueCorI "" {R2 } | % 72
 	c'2\p\cresc | % 73
 	d2 | % 74
 	c8\! r r4 | % 75
@@ -777,13 +783,14 @@ BeatusVirCorIIMusic = \relative c' {
 \addQuote "BeatusVirCorIIMusic" { \BeatusVirCorIIMusic }
 
 
-BeatusVirTbeIMusic = \relative c'' {
+BeatusVirClnoIMusic = \relative c'' {
 	\transposition b
 	c4~ c8 r | % 2
 	c r c r | % 3
 	c r r4 | % 4
-	R2*26 | \barNumberCheck #30
-	r8 e,[\pp\< e e] | % 31
+	R2*21 | \barNumberCheck #25
+	\cleffedCueDuring #"BeatusVirFagIMusic" #UP \cueFagI \FagIClef "" \ClnoIClef {R2*5 | \barNumberCheck #30
+		r8 } e,[\pp\< e e] | % 31
 	e8\f r r4 | % 32
 	\partcombineSoloI r8 c'[ c c] | % 33
 	c r r4 | % 34
@@ -796,7 +803,8 @@ BeatusVirTbeIMusic = \relative c'' {
 	r8 g,[ g g] | % 43
 	d'4\ff r | % 44
 	d r | % 45
-	R2*38 | % 83
+	R2*33 | % 78
+	\namedCueDuring #"BeatusVirCorIMusic" #DOWN \cueCorI "" { R2*5 } | \barNumberCheck #83
 	g,2~\ff | % 84
 	g8 r r4 | % 85
 	d'2~ | % 86
@@ -832,7 +840,8 @@ BeatusVirTbeIMusic = \relative c'' {
 	c8 r r4 | % 119
 	R2*3 | % 122
 	c8[\ff c16. c32] c8 r | % 123
-	R2*10 | % 133
+	R2*9 | % 132
+	\namedCueDuring #"BeatusVirCorIMusic" #DOWN \cueCorI "" {R2} | % 133
 	g8\pp r g r | % 134
 	g r r4 | % 135
 	R2*2 | % 137
@@ -845,15 +854,17 @@ BeatusVirTbeIMusic = \relative c'' {
 	c8\ff r r4 | % 144
 	c8 r r4 \bar"|."
 }
-\addQuote "BeatusVirTbeIMusic" { \BeatusVirTbeIMusic }
+\addQuote "BeatusVirClnoIMusic" { \BeatusVirClnoIMusic }
 
 
-BeatusVirTbeIIMusic = \relative c' {
+BeatusVirClnoIIMusic = \relative c' {
+	\transposition b
 	c4~\ff c8 r | % 2
 	c r c r | % 3
 	c r r4 | % 4
-	R2*26 | \barNumberCheck #30
-	r8 e[\p\< e e] | % 31
+	R2*21 | \barNumberCheck #25
+	\cleffedCueDuring #"BeatusVirFagIMusic" #UP \cueFagI \FagIClef "" \ClnoIIClef {R2*5 | \barNumberCheck #30
+		r8 } e[\p\< e e] | % 31
 	e\f r r4 | % 32
 	R2*6 | % 38
 	r8 g,\f[ g g'] | % 39
@@ -862,7 +873,8 @@ BeatusVirTbeIIMusic = \relative c' {
 	r8 g,[ g g] | % 43
 	d'4\ff r | % 44
 	d r | % 45
-	R2*38 | % 83
+	R2*33 | % 78
+	\namedCueDuring #"BeatusVirCorIMusic" #DOWN \cueCorI "" { R2*5 } | \barNumberCheck #83
 	g,,2~\ff | % 84
 	g8 r r4 | % 85
 	d''2~ | % 86
@@ -898,7 +910,8 @@ BeatusVirTbeIIMusic = \relative c' {
 	c8 r r4 | % 119
 	R2*3 | \barNumberCheck #122
 	c8[\ff c16. c32] c8 r | % 123
-	R2*10 | % 133
+	R2*9 | % 132
+	\namedCueDuring #"BeatusVirCorIMusic" #DOWN \cueCorI "" {R2} | % 133
 	g8\pp r g r | % 134
 	c8 r r4 | % 135
 	R2*2 | % 137
@@ -911,18 +924,21 @@ BeatusVirTbeIIMusic = \relative c' {
 	c8\ff r r4 | % 144
 	c8 r r4 \bar"|."
 }
-\addQuote "BeatusVirTbeIIMusic" { \BeatusVirTbeIIMusic }
+\addQuote "BeatusVirClnoIIMusic" { \BeatusVirClnoIIMusic }
 
 
 BeatusVirTimMusic = \relative c {
 	b4\trill\ff b8 r | % 2
 	b r b r | % 3
 	b r r4 | % 4
-	R2*34 | % 38
+	R2*26 | \barNumberCheck #30
+	\cleffedCueDuring #"BeatusVirClnoIMusic" #DOWN \cueClnoI \ClnoIClef "" \TimClef { \expandFullBarRests R2*8  \compressFullBarRests } | % 38
 	f8 r r4 | % 39
 	R2*3 | % 42
 	f8\f r r4 | % 43
-	R2*40 | % 83
+	R2*36 | % 79
+	\cleffedCueDuring #"BeatusVirVIMusic" #DOWN \cueVI \VIClef "" {} { R2 } | \barNumberCheck #80
+	\cleffedCueDuring #"BeatusVirVIMusic" #UP \cueVI {} "" \TimClef { R2*3 } | % 83
 	f2\ff\trill | % 84
 	f8 r r4 | % 85
 	R2*2 | % 87
@@ -958,7 +974,8 @@ BeatusVirTimMusic = \relative c {
 	b8 r r4 | % 119
 	R2*3 | \barNumberCheck #122
 	b8[\ff b16. b32] b8 r | \barNumberCheck #123
-	R2*10 | \barNumberCheck #133
+	R2*9 | % 132
+	\cleffedCueDuring #"BeatusVirCorIMusic" #DOWN \cueCorI \CorIClef "" \TimClef {R2} | % 133
 	f8\pp r f r | % 134
 	b r r4 | % 135
 	R2*2 | % 137
@@ -1199,7 +1216,7 @@ BeatusVirVIIMusic = \relative c'' {
 	des8[( f f as] | % 74
 	c[ as ges as] | % 75
 	c[ as des as]) | % 76
-	ces([\pp d,! as' ces] | % 77
+	ces^([\pp d,! as' ces] | % 77
 	c[ as g as] | % 78
 	as[ es g es]) | % 79
 	as16.[\ff-. as,32-. as16.-. as32]-. c16.[-. as32-. es'16.-. as,32]-. | \barNumberCheck #80
diff --git a/Czerny_BeatusVir19_Settings_Global.ily b/Czerny_BeatusVir19_Settings_Global.ily
index 378188aa3c971a9cab0bfd43352ab8b81f58a793..0b6e71a45ad49cce50715ca0cea2764e83b81361 100644
--- a/Czerny_BeatusVir19_Settings_Global.ily
+++ b/Czerny_BeatusVir19_Settings_Global.ily
@@ -6,11 +6,12 @@ scorenumber="EK-0059"
 
 \header {
   title = "Beatus Vir"
+  titlepagetitle = "Beatus Vir"
   subtitle = "Graduale No.19"
+  titlepagesubtitle = "Graduale No.19"
   composer = "Carl Czerny (1791-1857)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { "2010, " \concat{\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. }
   }
 }
 
@@ -21,30 +22,33 @@ scorenumber="EK-0059"
 %% CorIKey = \CorKey
 %% CorIIKey = \CorKey
 
-TbeKey = \key c \major
-TbeIKey = \TbeKey
-TbeIIKey = \TbeKey
-TbeInstrumentName = \markup { \column { \line { Trombe } \line{ in B } } }
-TbeIInstrumentName = \markup { \column { \line { Tromba I } \line{ in B } } }
-TbeIIInstrumentName = \markup { \column { \line { Tromba II } \line{ in B } } }
+ClniKey = \key c \major
+ClnoIKey = \ClniKey
+ClnoIIKey = \ClniKey
+ClniInstrumentName = \markup { \center-column { \line { Clarini } \line{ in B } } }
+ClnoIInstrumentName = \markup { \center-column { \line { Clarino I } \line{ in B } } }
+ClnoIIInstrumentName = \markup { \center-column { \line { Clarino II } \line{ in B } } }
 
 CorKey = \key c \major
 CorIKey = \CorKey
 CorIIKey = \CorKey
-CorInstrumentName = \markup { \column { \line { Corni } \line{ in Es } } }
-CorIInstrumentName = \markup { \column { \line { Corno I } \line{ in Es } } }
-CorIIInstrumentName = \markup { \column { \line { Corno II } \line{ in Es } } }
+CorInstrumentName = \markup { \center-column { \line { Corni } \line{ in Es } } }
+CorIInstrumentName = \markup { \center-column { \line { Corno I } \line{ in Es } } }
+CorIIInstrumentName = \markup { \center-column { \line { Corno II } \line{ in Es } } }
 
 ClKey = \key c \major
 ClIKey = \ClKey
 ClIIKey = \ClKey
-ClInstrumentName = \markup { \column { \line { Clarinetti } \line{ in B } } }
-ClIInstrumentName = \markup { \column { \line { Clarinetto I } \line{ in B } } }
-ClIIInstrumentName = \markup { \column { \line { Clarinetto II } \line{ in B } } }
+ClInstrumentName = \markup { \center-column { \line { Clarinetti } \line{ in B } } }
+ClIInstrumentName = \markup { \center-column { \line { Clarinetto I } \line{ in B } } }
+ClIIInstrumentName = \markup { \center-column { \line { Clarinetto II } \line{ in B } } }
 
-SClef = \clef "soprano"
-AClef = \clef "alto"
-TClef = \clef "tenor"
+% SClef = \clef "soprano"
+% AClef = \clef "alto"
+% TClef = \clef "tenor"
+SClef = \clef "soprano/treble"
+AClef = \clef "alto/treble"
+TClef = \clef "tenor/treble_8"
 
 ContinuoInstrumentName = ##f
 ContinuoShortInstrumentName = ##f
@@ -54,30 +58,3 @@ ContinuoShortInstrumentName = ##f
 
 psv = #(make-dynamic-script (markup #:line(#:dynamic "p" #:with-dimensions '(0 . 0) '(0 . 0) #:normal-text #:italic "sotto voce"  )))
 ppsv = #(make-dynamic-script (markup #:line(#:dynamic "pp" #:with-dimensions '(0 . 0) '(0 . 0) #:normal-text #:italic "sotto voce"  )))
-
-
-\layout {
-	\context {\Staff
-		soloText = #"I"
-		soloIIText = #"II"
-		aDueText = #"a 2"
-	}
-}
-
-\paper {
-        %   after-title-spacing = #'((space . 2) (padding . 2) (stretchability . 5))
-        %   between-system-spacing = #'((space . 0) (padding . 2) (stretchability . 35))
-        %   bottom-system-spacing = #'((space . 10) (padding . 2) (stretchability . 5))
-          after-title-spacing = #'((space . 4) (padding . 2) (stretchability . 20))
-          between-system-spacing = #'((space . 0) (padding . 1) (stretchability . 35))
-          top-system-spacing = #'((space . 5) (padding . 1) (stretchability . 15))
-          bottom-system-spacing = #'((space . 5) (padding . 1) (stretchability . 15))
-}
-\layout {
-	\context { \StaffGroup
-		\override StaffGrouper #'between-staff-spacing #'stretchability = #4
-	}
-	\context { \ChoirStaff
-		\override StaffGrouper #'between-staff-spacing #'stretchability = #3
-	}
-}
diff --git a/Makefile b/Makefile
index 1fac17a32ecdd91184ed04477e6c7f2b2c1b3cbc..14937a0f383e4faa386c93ffd602e47a3c05dac4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,18 @@ OUT=out
 
 base = Czerny_BeatusVir19
 SRCS = $(base)_Music_BeatusVir.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 CorI CorII TbeI TbeII Tim VI VII Va S A T B VcB
-scores = Long Full Vocal Choral Original
+instruments = ClI ClII FagI FagII CorI CorII ClnoI ClnoII Tim VI VII Va VcB
+# S A T B 
+scores = Full Choral
+# Vocal Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
 
 texbase = Czerny_BeatusVir19
-texscores = Long Full Vocal Choral Original
+texscores = Full Choral 
+# Long Vocal Original
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
-instr = $(instruments:%=
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
diff --git a/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex b/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
index 3adc37b6cc27ff054ea587d2f6aa3a79fb895b98..9ed96a8d0eb97557a0ef2b73695b961dc8946b6a 100644
--- a/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
+++ b/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
@@ -1,60 +1,6 @@
-\begin{center}
-
-\begin{minipage}{0.5\textwidth}
-\tableofcontents
-\end{minipage}
+\input{TeX_Czerny_BeatusVir19_Include_TOC.itex}
+\input{TeX_Czerny_BeatusVir19_Include_Material.itex}
 \vfill
+\input{TeX_Czerny_BeatusVir19_Include_Sources.itex}
 \vfill
-
-\end{center}
-
-
-
-\begin{center}
-
-\scorelistbox{
-Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
-
-\FullScoreName{} (-\FullScoreNumber),
-\VocalScoreName{} (-\VocalScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber);
-
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber);
-
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\VaName{} (-\VaNumber),
-\VcBName{} (-\VcBNumber);
-
-\ClIName{} (-\ClINumber),
-\ClIIName{} (-\ClIINumber),
-\FagIName{} (-\FagINumber),
-\FagIIName{} (-\FagIINumber);
-
-\CorIName{} (-\CorINumber),
-\CorIIName{} (-\CorIINumber),
-\TbeIName{} (-\TbeINumber),
-\TbeIIName{} (-\TbeIINumber);
-
-\TimName{} (-\TimNumber).
-}
-\end{center}
-
-\vfill
-\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
-\begin{hauptquellen}
-\item Carl Czerny: Graduale \textnumero 10. Beatus vir. Abschrift (Schreiber: Joseph Doppler) im historischen Notenarchiv der Pfarre St. Augustin, Wien. Signatur A-Wa 231. IRSM ID no. 600053725.
-\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_Czerny_BeatusVir19_Include_Copyrightbox.itex}
diff --git a/TeX_Czerny_BeatusVir19_Include_KritBericht.itex b/TeX_Czerny_BeatusVir19_Include_KritBericht.itex
index e936e15c2d63c20a597d46f545c8425866ae7758..a5c68591c2d339e817d82c44bb1554b0858201f7 100644
--- a/TeX_Czerny_BeatusVir19_Include_KritBericht.itex
+++ b/TeX_Czerny_BeatusVir19_Include_KritBericht.itex
@@ -8,7 +8,7 @@
 \begin{thebibliography}{AA}
 
 \bibitem[A]{StA}
-Partitur- und Stimmenabschrift des historischen Notenarchivs der Pfarre St. Augustin, Wien. Schreiber: Joseph Doppler.
+Partitur- und Stimmenabschrift des historischen Notenarchivs der Pfarre St. Augustin, Wien. Schreiber: Joseph Doppler. Signatur A-Wa 231. IRSM ID no. 600053725.
 
 Titelseite der Partitur: 
 \begin{sourcetitle}
@@ -25,10 +25,6 @@ JD.
 
 \end{thebibliography}
 
-% \subsection*{Quellendiskussion}
-% 
-% TODO
-
 
 
 \subsubsection*{Allgemeine Bemerkungen}
@@ -108,7 +104,7 @@ V1 T11: Decrescendo-Keil in Stimme nicht vorhanden, nur in der Partitur.
 
 Fg2 T11: Sowohl in Partitur als auch Stimme punktierte Viertel mit folgender Achtelnote. In der Partitur zusätzlich eine Achtel Pause. Korrekt wohl nur eine Viertelnote mit folgender Achtelnote und Achtelpause.
 
-Tbe1 T34: Sowohl in Partitur als auch Stimme falsch e notiert (d klingend)
+Clno1 T34: Sowohl in Partitur als auch Stimme falsch e notiert (d klingend)
 statt c notiert (b klingend).
 
 T38: sf in Cl/V1/VcB in der Partitur zwischen erstem und zweitem Schlag, in den
@@ -136,7 +132,7 @@ Fg T94: p ergänzt
 
 V2/Va T105: pp ergänzt nach den Bläsern. In der V2-Einzelstimme \q{dolce} aus V1 fälschlich übernommen.
 
-Tbe T105: In der Partitur sogar ppp notiert, in den Stimmen \q{nur} pp.
+Clni T105: In der Partitur sogar ppp notiert, in den Stimmen \q{nur} pp.
 
 Tim 105: In der Partitur eine Fermate über beider Noten, einezweite Fermate auf den Pausen, in der Stimme kein Triller. Im Vergleich mit den restlichen Instrumenten ist die Sechzehntel wohl als Nachschlag am Ende der Fermate zu verstehen, sodass in dieser Ausgabe die Fermate nur auf die Viertelnote gesetzt wurde. Ebenso wurde die Fermate auf den Pausen unterlassen.
 
@@ -181,6 +177,6 @@ schließlich mit \LaTeX. Die unglaubliche Qualität und Flexibilität dieser
 beiden Programme sowie die tolle LilyPond-Community haben einen enormen Beitrag
 zu dieser Ausgabe geliefert.
 
-Und zu guter Letzt sei noch meiner Freundin Ana Aleksic herzlich gedankt für
+Und zu guter Letzt sei noch meiner Freundin Ana Aleksić herzlich gedankt für
 ihr Verständnis während der Erstellung dieser Ausgabe.
 \end{multicols}
diff --git a/TeX_Czerny_BeatusVir19_Include_Text.itex b/TeX_Czerny_BeatusVir19_Include_Text.itex
index 24b625b9604baff33ddc97c0d673219ff590acd3..d038d959b6f06135396bb3b84413ccb7af0f9d68 100644
--- a/TeX_Czerny_BeatusVir19_Include_Text.itex
+++ b/TeX_Czerny_BeatusVir19_Include_Text.itex
@@ -1,11 +1,12 @@
-\subsection*{Text des \q{Beatus Vir}: TODO}
+\subsection*{Text des \q{Beatus Vir}: Jak 1:12}
 
 \begin{lyricstext}
-
 \begin{lyricstable}
-TODO & TODO & TODO \\\\[0.5em]
- & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)}
+\hspace{-2.5em}\textsuperscript{Jak 1:12}
+Beatus vir,                 & Selig ist der Mann,                     & Blessed is the man \\
+qui suffert tentationem,    & der die Anfechtung erduldet;            & that endureth temptation: \\
+quoniam cum probatus fuerit & denn nachdem er bewähret ist,           & for when he is tried, \\
+accipit coronam vitae.      & wird er die Krone des Lebens empfangen. & he shall receive the crown of life. \\[0.5em]
+\footnotesize\em{(Vulgata)} & \footnotesize\em{(Luthersche Bibelübersetzung 1545)} & \footnotesize\em{(King James Version)}
 \end{lyricstable}
-
 \end{lyricstext}
-
diff --git a/TeX_Czerny_BeatusVir19_Score_Choral.tex b/TeX_Czerny_BeatusVir19_Score_Choral.tex
index 23514f88b8cde4f267320b3dc9fa5c3550c65bf5..7bc6e0a0c2ef7574dd2704c5605a61330b6d0b21 100644
--- a/TeX_Czerny_BeatusVir19_Score_Choral.tex
+++ b/TeX_Czerny_BeatusVir19_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[nocolortitle]{editionkainhofer}
+\usepackage[choralscore,nocolortitle]{editionkainhofer}
 \input{TeX_Czerny_BeatusVir19_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Czerny_BeatusVir19_Score_Full.tex b/TeX_Czerny_BeatusVir19_Score_Full.tex
index 5d9afa651db22f530bf7a73512672ff375de215d..853c3a1b0052e34ed98f45139aa20e3b6d679014 100644
--- a/TeX_Czerny_BeatusVir19_Score_Full.tex
+++ b/TeX_Czerny_BeatusVir19_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[nocolortitle]{editionkainhofer}
+\usepackage[fullscore,nocolortitle]{editionkainhofer}
 \input{TeX_Czerny_BeatusVir19_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Czerny_BeatusVir19_Score_Instruments.tex b/TeX_Czerny_BeatusVir19_Score_Instruments.tex
index c918f16c0e2e9fe87a174fbace3b980fe26a042b..7c4276822e36694235bd21cae955b2b64b4f3447 100644
--- a/TeX_Czerny_BeatusVir19_Score_Instruments.tex
+++ b/TeX_Czerny_BeatusVir19_Score_Instruments.tex
@@ -1,20 +1,65 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[nocolortitle]{editionkainhofer}
+\usepackage[instrumentalparts,nocolortitle]{editionkainhofer}
 \input{TeX_Czerny_BeatusVir19_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
 }
 
+\makeatletter
+\frontpageinstrumentation{\@instrumentation}
+\frontpageeditor{\@editor}
+\makeatother
+
 \scoretype{\InstrumentalPartsType}
 \scorenumber{\scoreNumber\InstrumentalPartsNumber}
+% \ismn{XXXXXXXX}
 
-\begin{document}
-\input{TeX_Czerny_BeatusVir19_Include_Coverpage.itex}
-\input{TeX_Czerny_BeatusVir19_Include_Preface_Long.itex}
+\todos{
+\begin{center}
+\null
+\vfill
+\section*{\Huge Inhalt / Contents}
+\begin{Large}
 
+\ClIName\\
+\ClIIName\\
+\FagIName\\
+\FagIIName\\
+\CorIName\\
+\CorIIName\\
+\TbeIName\\
+\TbeIIName\\
+\TimName\\
+\VIName\\
+\VIIName\\
+\VaName\\
+\SName\\
+\AName\\
+\TName\\
+\BName\\
+\VcName\\
+\CbName\\
+
+\end{Large}
+\end{center}
+\vfill
+\vfill
+\input{TeX_Czerny_BeatusVir19_Include_Material.itex}
+\input{TeX_Czerny_BeatusVir19_Include_Sources.itex}
+\input{TeX_Czerny_BeatusVir19_Include_Copyrightbox.itex}
+}
+
+\pagestyle{empty}
+
+\begin{document}
+\makefrontpage
 
+\pagebreak
+\pagestyle{empty}
+\thispagestyle{empty}
 
+ 
 \phantomsection
 \addcontentsline{toc}{section}{\ClIName}
 \includescore{Instrument_ClI}
@@ -34,11 +79,11 @@
 \addcontentsline{toc}{section}{\CorIIName}
 \includescore{Instrument_CorII}
 \phantomsection
-\addcontentsline{toc}{section}{\TbeIName}
-\includescore{Instrument_TbeI}
+\addcontentsline{toc}{section}{\ClnoIName}
+\includescore{Instrument_ClnoI}
 \phantomsection
-\addcontentsline{toc}{section}{\TbeIIName}
-\includescore{Instrument_TbeII}
+\addcontentsline{toc}{section}{\ClnoIIName}
+\includescore{Instrument_ClnoII}
 \phantomsection
 \addcontentsline{toc}{section}{\TimName}
 \includescore{Instrument_Tim}
@@ -51,28 +96,32 @@
 \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}{\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}{\VcBName}
 \includescore{Instrument_VcB}
 
+\begin{preface}
+\input{TeX_Czerny_BeatusVir19_Include_About.itex}
+\input{TeX_Czerny_BeatusVir19_Include_Bio.itex}
+\input{TeX_Czerny_BeatusVir19_Include_Text.itex}
+\end{preface}
+\thispagestyle{empty}
+\pagebreak
+\thispagestyle{empty}
+\backpage
+\end{document}
 
 
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Czerny_BeatusVir19_Include_KritBericht.itex}
 
-\input{TeX_Czerny_BeatusVir19_Include_Backpage.itex}
-\end{document}
diff --git a/out/Czerny_BeatusVir19_Instrument_ClI.pdf b/out/Czerny_BeatusVir19_Instrument_ClI.pdf
index a3c238bed1250499a1ddd3ea35a5b3bb466d53e0..ccf5e922759f3ef8bb446be78aa49597375b73d3 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_ClI.pdf and b/out/Czerny_BeatusVir19_Instrument_ClI.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_ClII.pdf b/out/Czerny_BeatusVir19_Instrument_ClII.pdf
index 9f9ad3aa75c9f66c60b301ba38fbe6de28a9e0ff..0a7f3f53bb45c45e8cb974bed085733c2cd34fb4 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_ClII.pdf and b/out/Czerny_BeatusVir19_Instrument_ClII.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_CorI.pdf b/out/Czerny_BeatusVir19_Instrument_CorI.pdf
index 679925a423aa9c73ea5180070e93a18f0b7380d4..0876b7a53f38c36b6f5fc8d17dfce24e86b6de52 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_CorI.pdf and b/out/Czerny_BeatusVir19_Instrument_CorI.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_CorII.pdf b/out/Czerny_BeatusVir19_Instrument_CorII.pdf
index 5acd21ec8c6d379e987c8688310e41f46d52a7f0..253159bd0c57b41571cc92914899897ad80f8f57 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_CorII.pdf and b/out/Czerny_BeatusVir19_Instrument_CorII.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_FagI.pdf b/out/Czerny_BeatusVir19_Instrument_FagI.pdf
index caf75ae4fcb25adfbbec4e650de3a9a67cc80a41..182bd9151877dd6c0539b2b3bdaf1404721965cd 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_FagI.pdf and b/out/Czerny_BeatusVir19_Instrument_FagI.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_FagII.pdf b/out/Czerny_BeatusVir19_Instrument_FagII.pdf
index bab1492f15308283aa03a91c83fe36c4d7342764..8ab2e838d37e5a548a2e09a9ba929c4fafc96639 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_FagII.pdf and b/out/Czerny_BeatusVir19_Instrument_FagII.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_Tim.pdf b/out/Czerny_BeatusVir19_Instrument_Tim.pdf
index b206caed19c20b4e34419dfcf70a5155d1544a3f..cdcd21f63ce86cccf828d47eb00ed479d1ad7d10 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_Tim.pdf and b/out/Czerny_BeatusVir19_Instrument_Tim.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_VI.pdf b/out/Czerny_BeatusVir19_Instrument_VI.pdf
index b6c337fea759ebebae842e2182d3f20c20045588..c3e1c51975f02c2db6ee166a229119e5417b6ea3 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_VI.pdf and b/out/Czerny_BeatusVir19_Instrument_VI.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_VII.pdf b/out/Czerny_BeatusVir19_Instrument_VII.pdf
index dad222d365ded86b411a547b5eb4a6ae48031d5d..0a23310f274261556c58227f4f3b01b25ba7b95d 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_VII.pdf and b/out/Czerny_BeatusVir19_Instrument_VII.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_Va.pdf b/out/Czerny_BeatusVir19_Instrument_Va.pdf
index e57a9737a11ec7c780ee133ebcb487bf9ac9250a..31aad9b8e143c26b9bb0b450274d8f01025936b0 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_Va.pdf and b/out/Czerny_BeatusVir19_Instrument_Va.pdf differ
diff --git a/out/Czerny_BeatusVir19_Instrument_VcB.pdf b/out/Czerny_BeatusVir19_Instrument_VcB.pdf
index 87922903e95ca94569d5aa050abd4c93443b5657..7fb30ec321634826ccf53c19559964699710822b 100644
Binary files a/out/Czerny_BeatusVir19_Instrument_VcB.pdf and b/out/Czerny_BeatusVir19_Instrument_VcB.pdf differ
diff --git a/out/Czerny_BeatusVir19_Score_Choral.midi b/out/Czerny_BeatusVir19_Score_Choral.midi
index decb0619a3dc14d18ad4678e3bb73680cb70be4b..281ac4db59ab1a910e138d647dd8bd4f457b60f8 100644
Binary files a/out/Czerny_BeatusVir19_Score_Choral.midi and b/out/Czerny_BeatusVir19_Score_Choral.midi differ
diff --git a/out/Czerny_BeatusVir19_Score_Choral.pdf b/out/Czerny_BeatusVir19_Score_Choral.pdf
index add36c1edf905bfa4e0c302f50ed2f4095d735f0..d1525ac52e0e23cce91a66e43a9f67387e8369ec 100644
Binary files a/out/Czerny_BeatusVir19_Score_Choral.pdf and b/out/Czerny_BeatusVir19_Score_Choral.pdf differ
diff --git a/out/Czerny_BeatusVir19_Score_Full.midi b/out/Czerny_BeatusVir19_Score_Full.midi
index 0a591d691447fb4ba926dfe69cfea590ed50eea5..3108784e09fbc3f0c67dd5dbc99c930d173d099f 100644
Binary files a/out/Czerny_BeatusVir19_Score_Full.midi and b/out/Czerny_BeatusVir19_Score_Full.midi differ
diff --git a/out/Czerny_BeatusVir19_Score_Full.pdf b/out/Czerny_BeatusVir19_Score_Full.pdf
index 62608e88d6928cfb8b2033ba25f947b81ee39807..8ae5e03dc4a204ac77c64a6dfaf1a32879d177c0 100644
Binary files a/out/Czerny_BeatusVir19_Score_Full.pdf and b/out/Czerny_BeatusVir19_Score_Full.pdf differ
diff --git a/out/TeX_Czerny_BeatusVir19_Score_Choral.pdf b/out/TeX_Czerny_BeatusVir19_Score_Choral.pdf
index 8787d1d254837eae0b17ffdcf77c0824a4fee4d5..84065a8f084c0578d3ffd5d90c661d9a2a51910c 100644
Binary files a/out/TeX_Czerny_BeatusVir19_Score_Choral.pdf and b/out/TeX_Czerny_BeatusVir19_Score_Choral.pdf differ
diff --git a/out/TeX_Czerny_BeatusVir19_Score_Full.pdf b/out/TeX_Czerny_BeatusVir19_Score_Full.pdf
index 3755409a06bb022e390567ed3ceaf97f68f6531d..7445fbdafae8e1c2cfb2cdbb640877e4d084e6b0 100644
Binary files a/out/TeX_Czerny_BeatusVir19_Score_Full.pdf and b/out/TeX_Czerny_BeatusVir19_Score_Full.pdf differ
diff --git a/out/TeX_Czerny_BeatusVir19_Score_Instruments.pdf b/out/TeX_Czerny_BeatusVir19_Score_Instruments.pdf
index d68969de62e0053ac65d553c802a80a5b312d6dc..b0c89d4c79a260f9ce4edae792c4a07f73737daf 100644
Binary files a/out/TeX_Czerny_BeatusVir19_Score_Instruments.pdf and b/out/TeX_Czerny_BeatusVir19_Score_Instruments.pdf differ