diff --git a/Makefile b/Makefile
index 3186cbf245a91ed5e09b5c04214c54cbe4697941..02198501390cf13d9345a0b62d54702288c48ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,37 @@
-SRCS = Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly
+base = Pembaur_ErsteLateinischeMesse
+SRCS = Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily $(base)_Settings.ily
+OUT=out
 
-instruments = O 
-# ClI ClII CorI CorII 
-# TbeI TbeII Tim 
-# VI VII Va VcB 
-vocal = S A T B
-scores = OrganScore ChoralScore 
-# OrchestralScore LongScore
-ext = $(instruments) $(vocal) $(scores)
-#  Cl Wd Cor Tre Br V Str StrQ ChStrQ
+instruments = S A T B O
+scores = Organ Choral
+
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+texs = $(scores:%=TeX_$(base)_Score_%.tex)
+texpdfs = $(scores:%=$(OUT)/TeX_$(base)_Score_%.pdf) $(OUT)/TeX_$(base)_Score_Instruments.pdf
 
-pdfs = $(ext:%=Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf) Pembaur_ErsteLateinischeMesse_Es-Dur.pdf
 
 .PHONY: all clean
-all: $(instruments) $(vocal) $(scores)
-full: $(ext)
+all: $(OUT) $(instruments) $(scores) tex
 instruments: $(instruments)
-vocal: $(vocal)
 scores: $(scores)
 
 clean: 
-	for i in $(ext); do \
-	  rm -f Pembaur_ErsteLateinischeMesse_Es-Dur_$${i}.pdf Pembaur_ErsteLateinischeMesse_Es-Dur_$${i}.ps; \
-	done; \
-	rm -f Pembaur_ErsteLateinischeMesse_Es-Dur.ps Pembaur_ErsteLateinischeMesse_Es-Dur.pdf;
+	rm -rf $(OUT)
+
+$(OUT) : 
+	mkdir -p $(OUT)
+
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
+
+$(OUT)/%.pdf : %.ly $(SRCS)
+	lilypond -o $(basename $@) $<
 
-$(ext): % : Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf $(SRCS)
+$(OUT)/%.mp3 : %.midi
+	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
-%.pdf : %.ly
-	lilypond $< 
+tex: latex
+latex: $(texpdfs)
 
+$(OUT)/TeX_%.pdf : TeX_%.tex
+	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
diff --git a/Pembaur_ErsteLateinischeMesse_Instrument_A.ly b/Pembaur_ErsteLateinischeMesse_Instrument_A.ly
index fb6aca10aa4de5f7517bf2be0ab872c747c7d8cc..ff678645e241f9dea8432a829c5bc720bfe1edaf 100644
--- a/Pembaur_ErsteLateinischeMesse_Instrument_A.ly
+++ b/Pembaur_ErsteLateinischeMesse_Instrument_A.ly
@@ -1,13 +1,15 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily"
 
-\header { 
-  instrument = \AInstrumentName   
+\header {
+  instrument = \AInstrumentName
   scorenumber = \markup{\scoreNumber \ANumber}
 }
 
-\createScore #"IKyrie" #'("A")
-\createScore #"IIGloria" #'("A")
-\createScore #"IIICredo" #'("A")
-\createScore #"IVSanctus" #'("A")
-\createScore #"VBenedictus" #'("A")
-\createScore #"VIAgnus" #'("A")
+\createScore #"Kyrie" #'("A")
+\createScore #"Gloria" #'("A")
+\createScore #"Credo" #'("A")
+\createScore #"Sanctus" #'("A")
+\createScore #"Benedictus" #'("A")
+\createScore #"Agnus" #'("A")
+
diff --git a/Pembaur_ErsteLateinischeMesse_Instrument_B.ly b/Pembaur_ErsteLateinischeMesse_Instrument_B.ly
index 4bd5954d5bca89d8f5c75d147040f8ded3846d46..cba5a2fb8c957970e4845b35930ea509a4ac6d57 100644
--- a/Pembaur_ErsteLateinischeMesse_Instrument_B.ly
+++ b/Pembaur_ErsteLateinischeMesse_Instrument_B.ly
@@ -1,13 +1,15 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily"
 
-\header { 
-  instrument = "Bass" 
+\header {
+  instrument = \BInstrumentName
   scorenumber = \markup{\scoreNumber \BNumber}
 }
 
-\createScore #"IKyrie" #'("B")
-\createScore #"IIGloria" #'("B")
-\createScore #"IIICredo" #'("B")
-\createScore #"IVSanctus" #'("B")
-\createScore #"VBenedictus" #'("B")
-\createScore #"VIAgnus" #'("B")
+\createScore #"Kyrie" #'("B")
+\createScore #"Gloria" #'("B")
+\createScore #"Credo" #'("B")
+\createScore #"Sanctus" #'("B")
+\createScore #"Benedictus" #'("B")
+\createScore #"Agnus" #'("B")
+
diff --git a/Pembaur_ErsteLateinischeMesse_Instrument_O.ly b/Pembaur_ErsteLateinischeMesse_Instrument_O.ly
index e3f1c6f5fe592998b7f2f7187598d751dcf0c3aa..8a1de42ed57948ec4da185f237ef43fdfac582e6 100644
--- a/Pembaur_ErsteLateinischeMesse_Instrument_O.ly
+++ b/Pembaur_ErsteLateinischeMesse_Instrument_O.ly
@@ -1,7 +1,8 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly"
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_Instrument.ily"
 
-\header { 
-  instrument = \OInstrumentName 
+\header {
+  instrument = \OInstrumentName
   scorenumber = \markup{\scoreNumber \ONumber}
 }
 \paper {
@@ -9,9 +10,10 @@
   #(define page-breaking ly:optimal-breaking)
 }
 
-\createScore #"IKyrie" #'("O")
-\createScore #"IIGloria" #'("O")
-\createScore #"IIICredo" #'("O")
-\createScore #"IVSanctus" #'("O")
-\createScore #"VBenedictus" #'("O")
-\createScore #"VIAgnus" #'("O")
+\createScore #"Kyrie" #'("O")
+\createScore #"Gloria" #'("O")
+\createScore #"Credo" #'("O")
+\createScore #"Sanctus" #'("O")
+\createScore #"Benedictus" #'("O")
+\createScore #"Agnus" #'("O")
+
diff --git a/Pembaur_ErsteLateinischeMesse_Instrument_S.ly b/Pembaur_ErsteLateinischeMesse_Instrument_S.ly
index cf8c5ed700a4a7d1f3dece89557f260b9ff25f0c..4943457d0d284bcd2a33d8f915ba6dcde8964eb5 100644
--- a/Pembaur_ErsteLateinischeMesse_Instrument_S.ly
+++ b/Pembaur_ErsteLateinischeMesse_Instrument_S.ly
@@ -1,13 +1,15 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily"
 
-\header { 
-  instrument = \SInstrumentName 
+\header {
+  instrument = \SInstrumentName
   scorenumber = \markup{\scoreNumber \SNumber}
 }
 
-\createScore #"IKyrie" #'("S")
-\createScore #"IIGloria" #'("S")
-\createScore #"IIICredo" #'("S")
-\createScore #"IVSanctus" #'("S")
-\createScore #"VBenedictus" #'("S")
-\createScore #"VIAgnus" #'("S")
+\createScore #"Kyrie" #'("S")
+\createScore #"Gloria" #'("S")
+\createScore #"Credo" #'("S")
+\createScore #"Sanctus" #'("S")
+\createScore #"Benedictus" #'("S")
+\createScore #"Agnus" #'("S")
+
diff --git a/Pembaur_ErsteLateinischeMesse_Instrument_T.ly b/Pembaur_ErsteLateinischeMesse_Instrument_T.ly
index c0de9fd2fdca7c4c0c6b19934a887437592cb480..43856fd9d86a923a4d3e5e6d090c4b162f9aef14 100644
--- a/Pembaur_ErsteLateinischeMesse_Instrument_T.ly
+++ b/Pembaur_ErsteLateinischeMesse_Instrument_T.ly
@@ -1,14 +1,15 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily"
 
-\header { 
-  instrument = \TInstrumentName 
+\header {
+  instrument = \TInstrumentName
   scorenumber = \markup{\scoreNumber \TNumber}
 }
 
-\createScore #"IKyrie" #'("T")
-\createScore #"IIGloria" #'("T")
-\createScore #"IIICredo" #'("T")
-\createScore #"IVSanctus" #'("T")
-\createScore #"VBenedictus" #'("T")
-\createScore #"VIAgnus" #'("T")
+\createScore #"Kyrie" #'("T")
+\createScore #"Gloria" #'("T")
+\createScore #"Credo" #'("T")
+\createScore #"Sanctus" #'("T")
+\createScore #"Benedictus" #'("T")
+\createScore #"Agnus" #'("T")
+
diff --git a/Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily b/Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily
index 91e1a23a09c159b774feec601414baf824917701..603e9e62abac4e9cef5ece60f45571aca10ad84d 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily
@@ -1,19 +1,19 @@
- \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-IKyriePieceName = "Kyrie"
-IKyriePieceNameTacet = "Kyrie tacet"
-IKyrieTempo = "Andante."
+KyriePieceName = "Kyrie"
+KyriePieceNameTacet = "Kyrie tacet"
+KyrieTempo = "Andante."
 
-IKyrieKey = \notemode {
+KyrieKey = \notemode {
 	\key es \major
 }
-IKyrieSettings = \notemode {	
-  \tempo \IKyrieTempo
+KyrieSettings = \notemode {	
+  \tempo \KyrieTempo
   \time 4/4
 }
 
 
-IKyrieSMusic = \relative c'' {
+KyrieSMusic = \relative c'' {
   R1*4 | % 5
   g4.\pdolce es8 es4 \breathe g4 | % 6
   g2 f4 r | % 7
@@ -49,7 +49,7 @@ IKyrieSMusic = \relative c'' {
   g2\pp\fermata r \bar "|."
 }
 
-IKyrieAMusic = \relative c' {
+KyrieAMusic = \relative c' {
   R1*4 | % 5
   es4.\pdolce es8 es4 es | % 6
   es2\> es4\! es~ | % 7
@@ -86,7 +86,7 @@ IKyrieAMusic = \relative c' {
   es2\pp\fermata r \bar "|."
 }
 
-IKyrieTMusic = \relative c' {
+KyrieTMusic = \relative c' {
   R1*4 | % 5
   b4.\pdolce b8 b4 \breathe b8[ h] | % 6
   c2 c4 r | % 7
@@ -123,7 +123,7 @@ IKyrieTMusic = \relative c' {
   b2\fermata r \bar"|."
 }
 
-IKyrieBMusic = \relative c {
+KyrieBMusic = \relative c {
   R1*4 | % 5
   es4.\accent\pdolce g8 g4 \breathe g | % 6
   as2\> as4\! r | % 7
@@ -160,7 +160,7 @@ IKyrieBMusic = \relative c {
   es2\fermata r \bar"|."
 }
 
-IKyrieSLyrics = \lyricmode {
+KyrieSLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son,
   Ky -- ri -- e e -- lei -- son,
@@ -178,7 +178,7 @@ IKyrieSLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son.
 }
 
-IKyrieALyrics = \lyricmode {
+KyrieALyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son,
   Ky -- ri -- e e -- lei -- son,
@@ -196,7 +196,7 @@ IKyrieALyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son.
 }
 
-IKyrieTLyrics = \lyricmode {
+KyrieTLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son,
   Ky -- ri -- e e -- lei -- son,
@@ -214,7 +214,7 @@ IKyrieTLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son. __
 }
 
-IKyrieBLyrics = \lyricmode {
+KyrieBLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son,
   Ky -- ri -- e e -- lei -- son,
@@ -232,31 +232,31 @@ IKyrieBLyrics = \lyricmode {
   e -- lei -- son, e -- lei -- son. __ 
 }
 
-IKyrieVoiceFemale = \relative c'' {
-  \IKyrieKey \IKyrieSettings R1*4 |
+KyrieVoiceFemale = \relative c'' {
+  \KyrieKey \KyrieSettings R1*4 |
    |
 }
-\addQuote "IKyrieVoiceFemale" \IKyrieVoiceFemale
+\addQuote "KyrieVoiceFemale" \KyrieVoiceFemale
 
-IKyrieVoiceMaleI = \relative c {
-  \IKyrieKey \IKyrieSettings s1*4 |
+KyrieVoiceMaleI = \relative c {
+  \KyrieKey \KyrieSettings s1*4 |
   s2. b8[ h] | c2 s2 | 
 }
-\addQuote "IKyrieVoiceMaleI" \IKyrieVoiceMaleI
+\addQuote "KyrieVoiceMaleI" \KyrieVoiceMaleI
 
-IKyrieVoiceMaleII = \relative c {
-  \IKyrieKey \IKyrieSettings s1*4 |
+KyrieVoiceMaleII = \relative c {
+  \KyrieKey \KyrieSettings s1*4 |
   es4. g8 g4 g4 | as2 s2 | 
 }
-\addQuote "IKyrieVoiceMaleII" \IKyrieVoiceMaleII
+\addQuote "KyrieVoiceMaleII" \KyrieVoiceMaleII
 
-IKyrieOIaMusic =  \relative c'' {
+KyrieOIaMusic =  \relative c'' {
   \tempo "Andante religioso" 
   b2. b4 | % 2
   c4. as8 as4 c4 | % 3
   es4.( b8) b4 es, | % 4
   as2 g4 f \bar"||" % 5
-  << {g2 s } \new CueVoice = "IKyrieOIaCues" { \voiceThree \cueText "Singst." g4.( <es b>8 <es b>4 <es g>) | \cueText "Orgel" } >>
+  << {g2 s } \new CueVoice = "KyrieOIaCues" { \voiceThree \cueText "Singst." g4.( <es b>8 <es b>4 <es g>) | \cueText "Orgel" } >>
   g4 g f g | % 7
   as4. b8 g4 b4~ | % 8
   b4.( c8 as4 b | % 9
@@ -291,7 +291,7 @@ IKyrieOIaMusic =  \relative c'' {
   g2\fermata r \bar"|."
 }
 
-IKyrieOIbMusic =  \relative c'' {
+KyrieOIbMusic =  \relative c'' {
   <g b,>4. <es g,>8 <es~ g,>2 | % 2
   es4 es2 as4 | % 3
   es2. es4 | % 4
@@ -331,7 +331,7 @@ IKyrieOIbMusic =  \relative c'' {
   es2 r \bar"|."
 }
 
-IKyrieODynamics = {
+KyrieODynamics = {
   s1\p |
   s1*14 |
   s2. s4\f |
@@ -349,15 +349,15 @@ IKyrieODynamics = {
   s1*4 \bar "|."
 }
 
-IKyrieOIIaMusic =  \relative c' {
+KyrieOIIaMusic =  \relative c' {
   s1 | % 2
   as4.( c8) es4 es | % 3
   b es des << { c~ | % 4
-  c ces} \new CueVoice = "IKyrieOIIaCues" { \voiceThree as4~ | as2 } >> b2 \bar"||" % 5
-  << {b2 s2 | s4 c2 } \new CueVoice = "IKyrieOIIaCues" {\voiceThree s2 s4 b8[ h] | <as c>2 } >> b4 | % 7  % TODO: Really s4?
+  c ces} \new CueVoice = "KyrieOIIaCues" { \voiceThree as4~ | as2 } >> b2 \bar"||" % 5
+  << {b2 s2 | s4 c2 } \new CueVoice = "KyrieOIIaCues" {\voiceThree s2 s4 b8[ h] | <as c>2 } >> b4 | % 7  % TODO: Really s4?
   c4 b2 es4 | % 8
   des4 c2. | % 9
-  \change Staff="IKyrieOISt" \voiceFour c4 d es \change Staff="IKyrieOIISt" \voiceOne b4~ | \barNumberCheck #10
+  \change Staff="KyrieOISt" \voiceFour c4 d es \change Staff="KyrieOIISt" \voiceOne b4~ | \barNumberCheck #10
   b a2 b4 | % 11
   c es d c | % 12
   d2 r | % 13
@@ -387,12 +387,12 @@ IKyrieOIIaMusic =  \relative c' {
   b2\fermata r2 \bar"|."
 }
 
-IKyrieOIIbMusic =  \relative c {
+KyrieOIIbMusic =  \relative c {
   es1~\p | % 2
   es2 c'4 as | % 3
   g2 s4 ges4 | % 4 % TODO: Really s4?
   f2 b, \bar"||" % 5
-  << {es2 s | r4 as2 g4 } \new CueVoice = "IKyrieOIIbCues" {\voiceFour s2 s4 b8[ h] } >>| % 7  % TODO: Really s4?
+  << {es2 s | r4 as2 g4 } \new CueVoice = "KyrieOIIbCues" {\voiceFour s2 s4 b8[ h] } >>| % 7  % TODO: Really s4?
   f4. f8 es4 es | % 8
   e e( f g | % 9
   as2) g4 f | \barNumberCheck #10
@@ -433,21 +433,21 @@ IKyrieOIIbMusic =  \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-IKyrieOStaff = \context PianoStaff = "IKyrieOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "IKyrieOISt" {\IKyrieCueLabels}
-  \context Staff = "IKyrieOISt" {s1*37}
-%   \context Dynamics = "IKyrieODynamics" { s1*37 }
-  \context Staff = "IKyrieOIISt" {s1*37}
-  \context Staff = "IKyrieOISt" << 
+KyrieOStaff = \context PianoStaff = "KyrieOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "KyrieOISt" {\KyrieCueLabels}
+  \context Staff = "KyrieOISt" {s1*37}
+%   \context Dynamics = "KyrieODynamics" { s1*37 }
+  \context Staff = "KyrieOIISt" {s1*37}
+  \context Staff = "KyrieOISt" << 
     \OIClef
-    \context Voice = "IKyrieOIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIaMusic }
-    \context Voice = "IKyrieOIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIbMusic }
-    \context Voice = "IKyrieODynamics" { \IKyrieSettings\dynamicDown\IKyrieODynamics }
+    \context Voice = "KyrieOIa" { \voiceOne \KyrieKey\KyrieSettings\KyrieOIaMusic }
+    \context Voice = "KyrieOIb" { \voiceTwo \KyrieKey\KyrieSettings\KyrieOIbMusic }
+    \context Voice = "KyrieODynamics" { \KyrieSettings\dynamicDown\KyrieODynamics }
   >> 
-%   \context Dynamics = "IKyrieODynamics" { \IKyrieODynamics }
-  \context Staff = "IKyrieOIISt" <<
+%   \context Dynamics = "KyrieODynamics" { \KyrieODynamics }
+  \context Staff = "KyrieOIISt" <<
     \OIIClef
-    \context Voice = "IKyrieOIIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIIaMusic }
-    \context Voice = "IKyrieOIIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIIbMusic }
+    \context Voice = "KyrieOIIa" { \voiceOne \KyrieKey\KyrieSettings\KyrieOIIaMusic }
+    \context Voice = "KyrieOIIb" { \voiceTwo \KyrieKey\KyrieSettings\KyrieOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily b/Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily
index 5a5156bd54f1e0ca4cdc0939e5e431d029548e5e..b24c25e81f89620f5f8d2d90ab9d6360ffe549e6 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily
@@ -1,19 +1,19 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-IIGloriaPieceName = "Gloria"
-IIGloriaPieceNameTacet = "Gloria tacet"
-IIGloriaTempo = "Allegro maestoso."
+GloriaPieceName = "Gloria"
+GloriaPieceNameTacet = "Gloria tacet"
+GloriaTempo = "Allegro maestoso."
 
-IIGloriaKey = \notemode {
+GloriaKey = \notemode {
   \key b\major
 }
-IIGloriaSettings = \notemode {
-  \tempo \IIGloriaTempo
+GloriaSettings = \notemode {
+  \tempo \GloriaTempo
   \time 4/4
 }
 
 
-IIGloriaSMusic = \relative c'' {
+GloriaSMusic = \relative c'' {
   b2.\f b4 | % 2
   b2 a4 b | % 3
   d2 d | % 4
@@ -100,7 +100,7 @@ IIGloriaSMusic = \relative c'' {
   d2\fermata r2 \bar "|."
 }
 
-IIGloriaAMusic = \relative c'' {
+GloriaAMusic = \relative c'' {
   b2.\f b4 | % 2
   b2 \breathe a4 b | % 3
   d2 d | % 4
@@ -187,7 +187,7 @@ IIGloriaAMusic = \relative c'' {
   f2\fermata r \bar"|."
 }
 
-IIGloriaTMusic = \relative c' {
+GloriaTMusic = \relative c' {
   b2.\f b4 | % 2
   b2 a4 b | % 3
   d2 d | % 4
@@ -274,7 +274,7 @@ IIGloriaTMusic = \relative c' {
   d2\fermata r2 \bar"|."
 }
 
-IIGloriaBMusic = \relative c' {
+GloriaBMusic = \relative c' {
   b2. b4 | % 2
   b2 a4 b | % 3
   d2 d | % 4
@@ -361,7 +361,7 @@ IIGloriaBMusic = \relative c' {
   <b b,>2\fermata r \bar"|."
 }
 
-IIGloriaSLyrics = \lyricmode {
+GloriaSLyrics = \lyricmode {
 Glo -- ri -- a in ex -- cel -- sis De -- o, 
 et in ter -- ra pax ho -- mi -- ni bus bo -- nae vo -- lun -- ta -- tis, 
 be -- ne -- di -- ci -- mus te, 
@@ -384,7 +384,7 @@ Cum san -- cto Spi -- ri -- tu cum san -- cto Spi -- ri -- tu in glo -- ri -- a
 a -- men, a -- men, a -- men.
 }
 
-IIGloriaALyrics = \lyricmode {
+GloriaALyrics = \lyricmode {
 Glo -- ri -- a in ex -- cel -- sis De -- o, 
 et in ter -- ra pax ho -- mi -- ni bus bo -- nae vo -- lun -- ta -- tis, 
 be -- ne -- di -- ci -- mus te, 
@@ -407,7 +407,7 @@ Cum san -- cto Spi -- ri -- tu cum san -- cto Spi -- ri -- tu in glo -- ri -- a
 a -- men, a -- men, a -- men.
 }
 
-IIGloriaTLyrics = \lyricmode {
+GloriaTLyrics = \lyricmode {
 Glo -- ri -- a in ex -- cel -- sis De -- o, 
 et in ter -- ra pax ho -- mi -- ni bus 
 bo -- nae vo -- lun -- ta -- tis, 
@@ -432,7 +432,7 @@ cum san -- cto Spi -- ri -- tu
 in glo -- ri -- a De -- i Pa -- tris. A -- men, a -- men, a -- men, a -- men.
 }
 
-IIGloriaBLyrics = \lyricmode {
+GloriaBLyrics = \lyricmode {
 Glo -- ri -- a in ex -- cel -- sis De -- o, 
 et in ter -- ra pax ho -- mi -- ni bus 
 bo -- nae vo -- lun -- ta -- tis, 
@@ -457,13 +457,13 @@ cum san -- cto Spi -- ri -- tu
 in glo -- ri -- a De -- i Pa -- tris. A -- men, a -- men, a -- men.
 }
 
-IIGloriaCueLabels = \notemode {
+GloriaCueLabels = \notemode {
   \cueText "Singst." s1*2 |
   \cueText "Orgel" s1*2 |
   \cueText "Singst." s1*2 |
 }
 
-IIGloriaOIaMusic =  \relative c'' {
+GloriaOIaMusic =  \relative c'' {
   R1 | % 2
   R1 | % 3
   d1 | % 4
@@ -550,7 +550,7 @@ IIGloriaOIaMusic =  \relative c'' {
   <d f,>2\fermata r \bar"|."
 }
 
-IIGloriaOIbMusic =  \relative c'' {
+GloriaOIbMusic =  \relative c'' {
   b2. b4 | % 2
   b2 a4 b | % 3
   r8 f[( d f] b[) f( b d]) | % 4
@@ -634,7 +634,7 @@ IIGloriaOIbMusic =  \relative c'' {
   s2 r \bar"|."
 }
 
-IIGloriaODynamics = {
+GloriaODynamics = {
 s1*4 | % 5
 s2 s2\p | % 6
 s1*4 | \barNumberCheck #10
@@ -656,7 +656,7 @@ s1\ff | % TODO: put \ff at first or third beat?
 s1*16\bar"|."
 }
 
-IIGloriaOIIaMusic =  \relative c' {
+GloriaOIIaMusic =  \relative c' {
   b2. b4 | % 2
   b2 a4 b | % 3
   d1 | % 4
@@ -717,8 +717,8 @@ IIGloriaOIIaMusic =  \relative c' {
   b2 a4 g | % 59
   a2 r4 f | \barNumberCheck #60
   s1*2 | % 62
-  \change Staff=IIGloriaOISt \voiceFour d'2. f4 | % 63
-  \change Staff=IIGloriaOIISt \voiceOne s1 | % 64
+  \change Staff=GloriaOISt \voiceFour d'2. f4 | % 63
+  \change Staff=GloriaOIISt \voiceOne s1 | % 64
   es4 c d b | % 65
   des b c2 | % 66
   s1 | % 67
@@ -740,7 +740,7 @@ IIGloriaOIIaMusic =  \relative c' {
   d2  r2 \bar"|." \barNumberCheck #85
 }
 
-IIGloriaOIIbMusic =  \relative c {
+GloriaOIIbMusic =  \relative c {
   R1 | % 2
   R1 | % 3
   r8 f8[( d f] b)[ f( b d]) | % 4
@@ -833,18 +833,18 @@ IIGloriaOIIbMusic =  \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-IIGloriaOStaff = \context PianoStaff = "IIGloriaOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "IIGloriaOISt" {\IIGloriaCueLabels}
-  \context Staff = "IIGloriaOISt" << 
+GloriaOStaff = \context PianoStaff = "GloriaOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "GloriaOISt" {\GloriaCueLabels}
+  \context Staff = "GloriaOISt" << 
     \OIClef
-    \context Voice = "IIGloriaOIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIaMusic }
-    \context Voice = "IIGloriaOIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIbMusic }
-    \context Voice = "IIGloriaODynamics" { \IIGloriaSettings\dynamicDown\IIGloriaODynamics }
+    \context Voice = "GloriaOIa" { \voiceOne \GloriaKey\GloriaSettings\GloriaOIaMusic }
+    \context Voice = "GloriaOIb" { \voiceTwo \GloriaKey\GloriaSettings\GloriaOIbMusic }
+    \context Voice = "GloriaODynamics" { \GloriaSettings\dynamicDown\GloriaODynamics }
   >> 
-%   \context Dynamics = "IIGloriaODynamics" { \IIGloriaODynamics }
-  \context Staff = "IIGloriaOIISt" <<
+%   \context Dynamics = "GloriaODynamics" { \GloriaODynamics }
+  \context Staff = "GloriaOIISt" <<
     \OIIClef
-    \context Voice = "IIGloriaOIIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIIaMusic }
-    \context Voice = "IIGloriaOIIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIIbMusic }
+    \context Voice = "GloriaOIIa" { \voiceOne \GloriaKey\GloriaSettings\GloriaOIIaMusic }
+    \context Voice = "GloriaOIIb" { \voiceTwo \GloriaKey\GloriaSettings\GloriaOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily b/Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily
index b3b130466b160b7a2eb4d380cfd1520d202c9444..5b4db5b862a3f3621ab78c05fbf28d13e0f6f627 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily
@@ -1,36 +1,36 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-IIICredoPieceName = "Credo"
-IIICredoPieceNameTacet = "Credo tacet"
-IIICredoTempo = "Allegro moderato" 
-IIICredoTempoII = "Più moderato"
-IIICredoTempoIII = "Tempo I"
+CredoPieceName = "Credo"
+CredoPieceNameTacet = "Credo tacet"
+CredoTempo = "Allegro moderato" 
+CredoTempoII = "Più moderato"
+CredoTempoIII = "Tempo I"
 
-IIICredoKey = \notemode {
+CredoKey = \notemode {
  \key f\major
 }
-IIICredoSettings = \notemode {
-  \tempo \IIICredoTempo
+CredoSettings = \notemode {
+  \tempo \CredoTempo
   \time 4/4
 }
-IIICredoSettingsII = \notemode {
-  \tempo \IIICredoTempoII
+CredoSettingsII = \notemode {
+  \tempo \CredoTempoII
   \time 3/4
   \key b \major
 }
 
-IIICredoSettingsIII = \notemode {
-  \tempo \IIICredoTempoIII
+CredoSettingsIII = \notemode {
+  \tempo \CredoTempoIII
   \time 4/4
   \key f \major
 }
 
-% IIICredoCueLabels = \notemode {
-%   \IIICredoSettings
+% CredoCueLabels = \notemode {
+%   \CredoSettings
 % }
 % 
 % 
-IIICredoSMusic = \relative c'' {
+CredoSMusic = \relative c'' {
   d4\mf d8 d d4 c | % 2
   b2 a | % 3
   f4\> f f\! g8 g | % 4
@@ -71,7 +71,7 @@ IIICredoSMusic = \relative c'' {
   d( c) b a | \barNumberCheck #40
   g2(^\rit a) | % 41
   f2\fermata r4 f4\p \bar"||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   f2 b4 | % 43
   b8. g16 es4 \breathe g | % 44
   g2 g8 c | % 45
@@ -94,7 +94,7 @@ IIICredoSMusic = \relative c'' {
   des( c) b | % 63
   as( g) f | % 64
   g2\fermata r4 \bar "||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f4 f8 f f4 f | % 66
   g4 g8 g a4 \breathe a8 a | % 67
   d2 a4 a | % 68
@@ -138,7 +138,7 @@ IIICredoSMusic = \relative c'' {
   c\breve\fermata \bar"|."
 }
 
-IIICredoAMusic = \relative c' {
+CredoAMusic = \relative c' {
   f4\mf f8 f f4 f | % 2
   f( e) f2 | % 3
   d4\> d f\! e8 e | % 4
@@ -179,7 +179,7 @@ IIICredoAMusic = \relative c' {
   d2 e4 f | \barNumberCheck #40
   f2(^\rit e) | % 41
   f2\fermata r4 f\p \bar"||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   d2 d4 | % 43
   es8. es16 es4 \breathe f4 | % 44
   es2 e8 e | % 45
@@ -202,7 +202,7 @@ IIICredoAMusic = \relative c' {
   e2 e4\! | % 63
   f4( e) f | % 64
   e2\p\fermata r4 \bar"||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f4\p f8 f f4 d | % 66
   e e8 e f4 f8 \breathe f | % 67
   f2 a4 a | % 68
@@ -246,7 +246,7 @@ IIICredoAMusic = \relative c' {
   <f a>\breve\fermata \bar"|."
 }
 
-IIICredoTMusic = \relative c' {
+CredoTMusic = \relative c' {
   a4\mf a8 a a4 a | % 2
   b2 c | % 3
   d4 d c c8 c | % 4
@@ -287,7 +287,7 @@ IIICredoTMusic = \relative c' {
   f'2 c4 a | \barNumberCheck #40
   c2^\rit( b) | % 41 % FIXED: Added slur
   a r4\fermata f4\p \bar"||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   f( b) as | % 43
   g8. b16 g4 g | % 44
   g c b | % 45
@@ -310,7 +310,7 @@ IIICredoTMusic = \relative c' {
   as2\! g4\> | % 63
   f4( g)\! as | % 64
   c2\fermata r4 \bar"||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f,4\p f8 f a4 a | % 66
   c4 c8 c c4 c8 c | % 67
   a2 a4 a | % 68
@@ -354,7 +354,7 @@ IIICredoTMusic = \relative c' {
   <a c>\breve\fermata \bar"|."
 }
 
-IIICredoBMusic = \relative c {
+CredoBMusic = \relative c {
   d4\mf d8 d d4 f | % 2
   g( c,) f2 | % 3
   b4\> b\! a g8 g | % 4
@@ -394,7 +394,7 @@ IIICredoBMusic = \relative c {
   b( a) g f | \barNumberCheck #40
   c'2(^\rit c,) | % 41
   f2\fermata r4 f4\p \bar"||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   b,2 b4 | % 43
   es8. es16 es4 \breathe d | % 44
   c c c | % 45
@@ -416,7 +416,7 @@ IIICredoBMusic = \relative c {
   r4 c c | % 63
   des2 des4 | % 64
   c2\fermata r4 \bar "||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f4 f8 f d4 d | % 66
   c4 c8 c f4 f8 \breathe f | % 67
   d2 f4 f | % 68
@@ -460,7 +460,7 @@ IIICredoBMusic = \relative c {
   <f f,>\breve\fermata \bar"|."
 }
 
-IIICredoSLyrics = \lyricmode {
+CredoSLyrics = \lyricmode {
 Cre -- do in u -- num de -- um
 pa -- trem o -- mni -- po -- ten -- tem 
 fa -- cto -- rem coe -- li et ter -- rae
@@ -499,7 +499,7 @@ Et vi -- tam ven -- tu -- ri sae -- cu -- li.
 A -- men, a -- men, a -- men, a -- men, a -- men.
 }
 
-IIICredoALyrics = \lyricmode {
+CredoALyrics = \lyricmode {
 Cre -- do in u -- num de -- um
 pa -- trem o -- mni -- po -- ten -- tem 
 fa -- cto -- rem coe -- li et ter -- rae
@@ -540,7 +540,7 @@ et vi -- tam ven -- tu -- ri sae -- cu -- li.
 A -- men, a -- men, a -- men, a -- men, a -- men.
 }
 
-IIICredoTLyrics = \lyricmode {
+CredoTLyrics = \lyricmode {
 Cre -- do in u -- num de -- um
 pa -- trem o -- mni -- po -- ten -- tem 
 fa -- cto -- rem coe -- li et ter -- rae
@@ -579,7 +579,7 @@ Et vi -- tam ven -- tu -- ri sae -- cu -- li.
 A -- men, a -- men, a -- men, a -- men, a -- men.
 }
 
-IIICredoBLyrics = \lyricmode {
+CredoBLyrics = \lyricmode {
 Cre -- do in u -- num de -- um
 pa -- trem o -- mni -- po -- ten -- tem 
 fa -- cto -- rem coe -- li et ter -- rae
@@ -617,7 +617,7 @@ Et vi -- tam ven -- tu -- ri sae -- cu -- li.
 A -- men, a -- men, a -- men, a -- men, a -- men, a -- men.
 }
 
-IIICredoOIaMusic =  \relative c'' {
+CredoOIaMusic =  \relative c'' {
   d2. c4 | % 2
   b2 a | % 3
   f2. g4 | % 4
@@ -658,7 +658,7 @@ IIICredoOIaMusic =  \relative c'' {
   d' c b a | \barNumberCheck #40
   g2^\rit a | % 41
   f2\fermata r4 f4 \bar "||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   f2 b4 | % 43
   b8.[( g16] e4) g | % 44
   g2 g8[ c] | % 45
@@ -681,7 +681,7 @@ IIICredoOIaMusic =  \relative c'' {
   des4 c b | % 63
   <as f> <g e> f | % 64
   <g e>2\fermata r4 \bar"||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f1 | % 66
   <g e>2 <a f> | % 67
   d a | % 68
@@ -724,7 +724,7 @@ IIICredoOIaMusic =  \relative c'' {
   <c a>\fermata \bar "|."
 }
 
-IIICredoOIbMusic = \relative c' {
+CredoOIbMusic = \relative c' {
   f1~ | % 2
   f4 e f2 | % 3
   f2. e4 | % 4
@@ -765,7 +765,7 @@ IIICredoOIbMusic = \relative c' {
   d2 e4 f~ | \barNumberCheck #40
   f2 e | % 41
   s2 r4 s \bar "||"  % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   d2. | % 43
   es2 f4 | % 44
   es2 e4 | % 45
@@ -831,10 +831,10 @@ IIICredoOIbMusic = \relative c' {
   f \bar "|."
 }
 
-IIICredoODynamics = {
+CredoODynamics = {
 }
 
-IIICredoOIIaMusic = \relative c' {
+CredoOIIaMusic = \relative c' {
   a1 | % 2
   b2 c | % 3
   s c | % 4
@@ -858,8 +858,8 @@ IIICredoOIIaMusic = \relative c' {
   s1 | % 23
   g2 s | % 24
   s1*6 | \barNumberCheck #30
-  \change Staff=IIICredoOISt \voiceFour e'4 d c2 | % 31
-  \change Staff=IIICredoOIISt \voiceOne c4 e f h, | % 32
+  \change Staff=CredoOISt \voiceFour e'4 d c2 | % 31
+  \change Staff=CredoOIISt \voiceOne c4 e f h, | % 32
   c1 | % 33
   c2 r4 a | % 34
   a1 | % 35
@@ -870,29 +870,29 @@ IIICredoOIIaMusic = \relative c' {
   b2 c | \barNumberCheck #40
   c2. b4 | % 41
   s2 r4 s \bar "||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   f4( b as) | % 43
   g8.[ b16] g4 h | % 44
   g c b | % 45
   a8.[ c16] a4 s4 | % 46
-  s4 \change Staff=IIICredoOISt \voiceFour a4 b | % 47
-  \change Staff=IIICredoOIISt \voiceOne g8.[ a16] b4 s | % 48
+  s4 \change Staff=CredoOISt \voiceFour a4 b | % 47
+  \change Staff=CredoOIISt \voiceOne g8.[ a16] b4 s | % 48
   c8[ d] es2 | % 49
   d2. | \barNumberCheck #50
   c2 b4 | % 51
   a2 s4 | % 52 % TODO: Add \oneVoice in the BASS!
   s2. | % 53
-  \change Staff=IIICredoOISt <b des f>2._~ | % 54
+  \change Staff=CredoOISt <b des f>2._~ | % 54
   \voiceFour b4 a2 \voiceOne | % 55
   s2.*3 | % 58
   <c es g>2._~ | % 59
   \voiceFour c4 h2 | \barNumberCheck #60
-  \change Staff=IIICredoOIISt \voiceOne s2. | % 61
+  \change Staff=CredoOIISt \voiceOne s2. | % 61
   s2 as4~ | % 62
   as2 g4 | % 63
   f4 g as | % 64
   c2 r4 \bar "||" % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   a1 | % 66
   c | % 67
   a | % 68
@@ -932,7 +932,7 @@ IIICredoOIIaMusic = \relative c' {
   f\breve\fermata \bar "|."
 }
 
-IIICredoOIIbMusic = \relative c {
+CredoOIIbMusic = \relative c {
   d2. f4 | % 2
   g c, f2 | % 3
   <b d>2 a4 g | % 4
@@ -972,7 +972,7 @@ IIICredoOIIbMusic = \relative c {
   b a g a8[ b] | \barNumberCheck #40
   c2 c, | % 41
   <f a>2\fermata r4 f4 \bar "||" % 42
-  \IIICredoSettingsII
+  \CredoSettingsII
   b,2. | % 43
   e2 d4 | % 44
   c2. | % 45
@@ -994,7 +994,7 @@ IIICredoOIIbMusic = \relative c {
   r c2 | % 63
   des2. | % 64
   c2\fermata r4 \bar "||"  % 65
-  \IIICredoSettingsIII
+  \CredoSettingsIII
   f2 d | % 66
   c f | % 67
   d f | % 68
@@ -1047,18 +1047,18 @@ IIICredoOIIbMusic = \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-IIICredoOStaff = \context PianoStaff = "IIICredoOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "IIICredoOISt" {\IIICredoCueLabels}
-  \context Staff = "IIICredoOISt" << 
+CredoOStaff = \context PianoStaff = "CredoOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "CredoOISt" {\CredoCueLabels}
+  \context Staff = "CredoOISt" << 
     \OIClef
-    \context Voice = "IIICredoOIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIaMusic }
-    \context Voice = "IIICredoOIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIbMusic }
-    \context Voice = "IIICredoODynamics" { \IIICredoSettings\dynamicDown\IIICredoODynamics }
+    \context Voice = "CredoOIa" { \voiceOne \CredoKey\CredoSettings\CredoOIaMusic }
+    \context Voice = "CredoOIb" { \voiceTwo \CredoKey\CredoSettings\CredoOIbMusic }
+    \context Voice = "CredoODynamics" { \CredoSettings\dynamicDown\CredoODynamics }
   >> 
-%   \context Dynamics = "IIICredoODynamics" { \IIICredoODynamics }
-  \context Staff = "IIICredoOIISt" <<
+%   \context Dynamics = "CredoODynamics" { \CredoODynamics }
+  \context Staff = "CredoOIISt" <<
     \OIIClef
-    \context Voice = "IIICredoOIIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIIaMusic }
-    \context Voice = "IIICredoOIIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIIbMusic }
+    \context Voice = "CredoOIIa" { \voiceOne \CredoKey\CredoSettings\CredoOIIaMusic }
+    \context Voice = "CredoOIIb" { \voiceTwo \CredoKey\CredoSettings\CredoOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily b/Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily
index 7f74889465490c73067effaad33bd0d2a294ddcc..866d7dec68a4f1ac9ec8dd622bd4df985cef92ae 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily
@@ -1,22 +1,22 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-IVSanctusPieceName = "Sanctus"
-IVSanctusPieceNameTacet = "Sanctus tacet"
-IVSanctusTempo = "Moderato assai"
+SanctusPieceName = "Sanctus"
+SanctusPieceNameTacet = "Sanctus tacet"
+SanctusTempo = "Moderato assai"
 
-IVSanctusKey = \notemode {
+SanctusKey = \notemode {
   \key des \major
 }
-IVSanctusSettings = \notemode {
-  \tempo \IVSanctusTempo
+SanctusSettings = \notemode {
+  \tempo \SanctusTempo
   \time 3/4
 }
 
-% IVSanctusCueLabels = \notemode {
-%   \IVSanctusSettings
+% SanctusCueLabels = \notemode {
+%   \SanctusSettings
 % }
 
-IVSanctusSMusic = \relative c'' {
+SanctusSMusic = \relative c'' {
   << {\voiceOne as4(\pp\< b4.\!\> as8\!) | % 2
     as2 r4 | % 3
     as4(\p b4. as8) | % 4
@@ -24,7 +24,7 @@ IVSanctusSMusic = \relative c'' {
     as4(\< des\!\> b)\! | % 6
     as2 }
 %     \\
-    \new Voice ="IVSanctusSII" {\voiceTwo f4( ges4. f8) | % 2
+    \new Voice ="SanctusSII" {\voiceTwo f4( ges4. f8) | % 2
     f2 r4 | % 3
     f4 ges2 | % 4
     f2 r4 | % 5
@@ -58,12 +58,12 @@ IVSanctusSMusic = \relative c'' {
   des2\fermata r4 \bar"|."
 }
 
-IVSanctusAMusic = \relative c' {
+SanctusAMusic = \relative c' {
   des2.\pp | % 2
   des2 r4 | % 3
   << {\voiceOne f2( es4) | f2 r4 | f4( des4. es8) | f2 }
      {s4\p\< s \!\> s\! | s2. | s4\mf\< s4.\!\> s8\! }
-     \new Voice = "IVSanctusAVoiceII" {\voiceTwo des2( c4) | des2 r4 | des4( b4. c8) | des2} 
+     \new Voice = "SanctusAVoiceII" {\voiceTwo des2( c4) | des2 r4 | des4( b4. c8) | des2} 
   >> \oneVoice r4 | % 7
   es4(\p ges) f8 es | % 8
   f4( as) as | % 9
@@ -92,7 +92,7 @@ IVSanctusAMusic = \relative c' {
   f2\fermata r4 \bar"|."
 }
 
-IVSanctusTMusic = \relative c' {
+SanctusTMusic = \relative c' {
   R2.*5 | % 6
   r4 r as4(\p | % 7
   as es') des8 as | % 8
@@ -120,7 +120,7 @@ IVSanctusTMusic = \relative c' {
   des2\fermata r4 \bar"||"
 }
 
-IVSanctusBMusic = \relative c {
+SanctusBMusic = \relative c {
   R2.*6 | % 7
   c2\p\< des8 c | % 8
   des2\! des'4 | % 9
@@ -128,7 +128,7 @@ IVSanctusBMusic = \relative c {
   as'2. | % 11
   b4 as es | % 12
   f2 f4 | % 13
-  es2 << {\voiceOne es4 | es2 } \new Voice = " IVSanctusBVoiceII" { \voiceTwo as,4 | as2 } >> \oneVoice r4 | % 15
+  es2 << {\voiceOne es4 | es2 } \new Voice = " SanctusBVoiceII" { \voiceTwo as,4 | as2 } >> \oneVoice r4 | % 15
   R2.*3^\ppmosso | % 18
   as'4\f as ges | % 19
   f f es | \barNumberCheck #20
@@ -146,15 +146,15 @@ IVSanctusBMusic = \relative c {
   des2\fermata r4 \bar"|."
 }
 
-IVSanctusSLyrics = \lyricmode {
+SanctusSLyrics = \lyricmode {
 San -- ctus, san -- ctus, san -- ctus do -- mi -- nus de -- us Sa -- ba -- oth
 do -- mi -- nus de -- us Sa -- ba -- oth.
 Ple -- ni sunt coe -- li et ter -- ra glo -- ri -- a tu -- a,
 glo -- ri -- a tu -- a glo -- ri -- a tu -- a
 o -- san -- na in ex -- cel -- sis in ex -- cel -- sis.
 }
-IVSanctusALyrics = \IVSanctusSLyrics
-IVSanctusTLyrics = \lyricmode {
+SanctusALyrics = \SanctusSLyrics
+SanctusTLyrics = \lyricmode {
 Do -- mi -- nus De -- us Sa  -- ba -- oth, 
 do -- mi -- nus De -- us Sa -- ba -- oth.
 
@@ -163,7 +163,7 @@ glo -- ri -- a tu -- a!
 
 O -- san -- na, o -- san -- na in ex -- cel -- sis.
 }
-IVSanctusBLyrics = \lyricmode {
+SanctusBLyrics = \lyricmode {
 Do -- mi -- nus De -- us Sa  -- ba -- oth, 
 do -- mi -- nus De -- us Sa -- ba -- oth.
 
@@ -173,7 +173,7 @@ glo -- ri -- a tu -- a!
 O -- san -- na in ex -- cel -- sis in ex -- cel -- sis, o -- san -- na in ex -- cel -- sis.
 }
 
-IVSanctusOIaMusic =  \relative c'' {
+SanctusOIaMusic =  \relative c'' {
   \oneVoice <as f>4 <b g>4. <as f>8 | % 2
   <as f>2 r4 | % 3
   <as f>4 \voiceOne b4. as8 | % 4
@@ -207,7 +207,7 @@ IVSanctusOIaMusic =  \relative c'' {
   \oneVoice <d f,>2\fermata r4 \bar"|."
 }
 
-IVSanctusOIbMusic =  \relative c'' {
+SanctusOIbMusic =  \relative c'' {
   s2.*2 | % 3
   s4 g2 | % 4
   f2 r4 | % 5
@@ -232,7 +232,7 @@ IVSanctusOIbMusic =  \relative c'' {
   s2. \bar"|."
 }
   
-IVSanctusODynamics = {
+SanctusODynamics = {
   s2.\pp | % 2
   s2.*4 | % 6
   s2 s4\p | % 7
@@ -241,7 +241,7 @@ IVSanctusODynamics = {
   s2.*16 \bar"|." % 32
 }
 
-IVSanctusOIIaMusic =  \relative c' {
+SanctusOIIaMusic =  \relative c' {
   \oneVoice des2.~ | % 2
   des2 r4 | % 3
   <des f>2 <c es>4 | % 4
@@ -249,8 +249,8 @@ IVSanctusOIIaMusic =  \relative c' {
   <des f>4 <b des>4. <c es>8 | % 6
   \voiceOne des2 as4~ | % 7
   as es' des8[ as] | % 8
-  as4 \change Staff=IVSanctusOISt \voiceTwo ges' f | % 9
-  \change Staff=IVSanctusOIISt b,4 g d | \barNumberCheck #10
+  as4 \change Staff=SanctusOISt \voiceTwo ges' f | % 9
+  \change Staff=SanctusOIISt b,4 g d | \barNumberCheck #10
   \oneVoice <as' c>2. | % 11
   \voiceOne b4 c des | % 12
   c b as | % 13
@@ -273,7 +273,7 @@ IVSanctusOIIaMusic =  \relative c' {
   des2\fermata r4 \bar "|." % 32
 }
 
-IVSanctusOIIbMusic =  \relative c {
+SanctusOIIbMusic =  \relative c {
   s2.*5 | % 6
   R2. | % 7
   c2 des8[ c] | % 8
@@ -310,18 +310,18 @@ IVSanctusOIIbMusic =  \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-IVSanctusOStaff = \context PianoStaff = "IVSanctusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "IVSanctusOISt" {\IVSanctusCueLabels}
-  \context Staff = "IVSanctusOISt" << 
+SanctusOStaff = \context PianoStaff = "SanctusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "SanctusOISt" {\SanctusCueLabels}
+  \context Staff = "SanctusOISt" << 
     \OIClef
-    \context Voice = "IVSanctusOIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIaMusic }
-    \context Voice = "IVSanctusOIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIbMusic }
-    \context Voice = "IVSanctusODynamics" { \IVSanctusSettings\dynamicDown\IVSanctusODynamics }
+    \context Voice = "SanctusOIa" { \voiceOne \SanctusKey\SanctusSettings\SanctusOIaMusic }
+    \context Voice = "SanctusOIb" { \voiceTwo \SanctusKey\SanctusSettings\SanctusOIbMusic }
+    \context Voice = "SanctusODynamics" { \SanctusSettings\dynamicDown\SanctusODynamics }
   >> 
-%   \context Dynamics = "IVSanctusODynamics" { \IVSanctusODynamics }
-  \context Staff = "IVSanctusOIISt" <<
+%   \context Dynamics = "SanctusODynamics" { \SanctusODynamics }
+  \context Staff = "SanctusOIISt" <<
     \OIIClef
-    \context Voice = "IVSanctusOIIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIIaMusic }
-    \context Voice = "IVSanctusOIIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIIbMusic }
+    \context Voice = "SanctusOIIa" { \voiceOne \SanctusKey\SanctusSettings\SanctusOIIaMusic }
+    \context Voice = "SanctusOIIb" { \voiceTwo \SanctusKey\SanctusSettings\SanctusOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily b/Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily
index 2e087acc7677288552fd968c9a67b7d4ad35f586..8fe88ee1a8f093c5477a506c3a767b0a5d9525c3 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily
@@ -1,23 +1,23 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-VBenedictusPieceName = "Benedictus"
-VBenedictusPieceNameTacet = "Benedictus tacet"
-VBenedictusTempo = "Andante molto moderato"
+BenedictusPieceName = "Benedictus"
+BenedictusPieceNameTacet = "Benedictus tacet"
+BenedictusTempo = "Andante molto moderato"
 
-VBenedictusKey = \notemode {
+BenedictusKey = \notemode {
   \key as \major
 }
-VBenedictusSettings = \notemode {
-  \tempo \VBenedictusTempo
+BenedictusSettings = \notemode {
+  \tempo \BenedictusTempo
   \time 3/4
   \partial 4
 }
 
-% VBenedictusCueLabels = \notemode {
-%   \VBenedictusSettings
+% BenedictusCueLabels = \notemode {
+%   \BenedictusSettings
 % }
 
-VBenedictusSMusic = \relative c' {
+BenedictusSMusic = \relative c' {
   \cueText "Solo"
   es8\p g | % 1
   as4 as as | % 2
@@ -56,7 +56,7 @@ VBenedictusSMusic = \relative c' {
   as2\fermata \bar"|."
 }
 
-VBenedictusAMusic = \relative c' {
+BenedictusAMusic = \relative c' {
   r4 | % 1
   R2.*2 | % 3
   r2 \cueText "Solo" c8\p d | % 4
@@ -94,7 +94,7 @@ VBenedictusAMusic = \relative c' {
   as2\fermata \bar"|."
 }
 
-VBenedictusTMusic = \relative c {
+BenedictusTMusic = \relative c {
   r4 | % 1
   R2.*5 | % 6
   r2 \cueText "Solo" f8\p g | % 7
@@ -129,7 +129,7 @@ VBenedictusTMusic = \relative c {
   c2\fermata \bar"|."
 }
 
-VBenedictusBMusic = \relative c {
+BenedictusBMusic = \relative c {
   r4 | % 1
   R2.*8 | % 9
   r2 \cueText "Solo" c8\p d | \barNumberCheck #10
@@ -161,7 +161,7 @@ VBenedictusBMusic = \relative c {
   as,2\fermata \bar"|."
 }
 
-VBenedictusSLyrics = \lyricmode {
+BenedictusSLyrics = \lyricmode {
 Be -- ne -- di -- ctus qui ve -- nit in no -- mi -- ne do -- mi -- ni
 qui ve -- nit in no -- mi -- ne do -- mi -- ni
 in no -- mi -- ne do -- mi -- ni
@@ -173,7 +173,7 @@ qui ve -- nit in no -- mi -- ne Do -- mi -- ni
 o -- san -- na in ex -- cel -- sis in ex -- cel -- sis.
 }
 
-VBenedictusALyrics = \lyricmode {
+BenedictusALyrics = \lyricmode {
 Be -- ne -- di -- ctus, qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 qui ve -- nit in no -- mi -- ne Do -- mi -- ni,
@@ -184,7 +184,7 @@ qui ve -- nit in no -- mi -- ne Do -- mi -- ni.
 O -- san -- na in ex -- cel -- sis, in ex -- cel -- sis.
 }
 
-VBenedictusTLyrics = \lyricmode {
+BenedictusTLyrics = \lyricmode {
 Be -- ne -- di -- ctus qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 be -- ne -- di -- ctus, qui ve -- nit in no -- mi -- ne Do -- mi -- ni,
@@ -195,7 +195,7 @@ qui ve -- nit in no -- mi -- ne Do -- mi -- ni.
 O -- san -- na in ex -- cel -- sis.
 }
 
-VBenedictusBLyrics = \lyricmode {
+BenedictusBLyrics = \lyricmode {
 Be -- ne -- di -- ctus qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 be -- ne -- di -- ctus qui ve -- nit in no -- mi -- ne Do -- mi -- ni, 
 be -- ne -- di -- ctus qui ve -- nit in no -- mi -- ne Do -- mi -- ni,
@@ -204,7 +204,7 @@ qui ve -- nit in no -- mi -- ne Do -- mi -- ni,
 o -- san -- na in ex -- cel -- sis in ex -- cel -- sis.
 }
 
-VBenedictusOIaMusic =  \relative c' {
+BenedictusOIaMusic =  \relative c' {
   \oneVoice es8[ g] | % 1
   as2. | % 2
   b2 b8[ c] | % 3
@@ -243,11 +243,11 @@ VBenedictusOIaMusic =  \relative c' {
   as2\fermata \bar "|."
 }
 
-VBenedictusOIbMusic =  \relative c' {
+BenedictusOIbMusic =  \relative c' {
   s4 | % 1
   s2.*2 | % 3
-  s2 \change Staff=VBenedictusOIISt c8[( d] | % 4
-  \change Staff=VBenedictusOISt es2.) | % 5
+  s2 \change Staff=BenedictusOIISt c8[( d] | % 4
+  \change Staff=BenedictusOISt es2.) | % 5
   f | % 6
   g8[ b as g] f[ es16 des] | % 7
   c4 r c8[( as']) | % 8
@@ -281,7 +281,7 @@ VBenedictusOIbMusic =  \relative c' {
 }
   
 
-VBenedictusODynamics = {
+BenedictusODynamics = {
   s4\p | % 1
   s2.*25 | % 26
   s2.*3 | \barNumberCheck #29
@@ -290,7 +290,7 @@ VBenedictusODynamics = {
   s2 \bar "|."
 }
 
-VBenedictusOIIaMusic =  \relative c {
+BenedictusOIIaMusic =  \relative c {
   \oneVoice r4 | % 1
   R2.*2 | % 3
   r4 r4 s | % 4
@@ -327,7 +327,7 @@ VBenedictusOIIaMusic =  \relative c {
   c2 \bar "|."
 }
 
-VBenedictusOIIbMusic =  \relative c {
+BenedictusOIIbMusic =  \relative c {
   s4 | % 1
   s2.*6 | % 7
   R2.*2 | % 9
@@ -369,18 +369,18 @@ VBenedictusOIIbMusic =  \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-VBenedictusOStaff = \context PianoStaff = "VBenedictusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "VBenedictusOISt" {\VBenedictusCueLabels}
-  \context Staff = "VBenedictusOISt" << 
+BenedictusOStaff = \context PianoStaff = "BenedictusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "BenedictusOISt" {\BenedictusCueLabels}
+  \context Staff = "BenedictusOISt" << 
     \OIClef
-    \context Voice = "VBenedictusOIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIaMusic }
-    \context Voice = "VBenedictusOIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIbMusic }
-    \context Voice = "VBenedictusODynamics" { \VBenedictusSettings\dynamicDown\VBenedictusODynamics }
+    \context Voice = "BenedictusOIa" { \voiceOne \BenedictusKey\BenedictusSettings\BenedictusOIaMusic }
+    \context Voice = "BenedictusOIb" { \voiceTwo \BenedictusKey\BenedictusSettings\BenedictusOIbMusic }
+    \context Voice = "BenedictusODynamics" { \BenedictusSettings\dynamicDown\BenedictusODynamics }
   >> 
-%   \context Dynamics = "VBenedictusODynamics" { \VBenedictusSettings\VBenedictusODynamics }
-  \context Staff = "VBenedictusOIISt" <<
+%   \context Dynamics = "BenedictusODynamics" { \BenedictusSettings\BenedictusODynamics }
+  \context Staff = "BenedictusOIISt" <<
     \OIIClef
-    \context Voice = "VBenedictusOIIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIIaMusic }
-    \context Voice = "VBenedictusOIIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIIbMusic }
+    \context Voice = "BenedictusOIIa" { \voiceOne \BenedictusKey\BenedictusSettings\BenedictusOIIaMusic }
+    \context Voice = "BenedictusOIIb" { \voiceTwo \BenedictusKey\BenedictusSettings\BenedictusOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily b/Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily
index 08f8617b89ce58fa4c42945349ade51959661320..2dabe2b5592e46a3ca42635d2f6054bfaadcd727 100644
--- a/Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily
+++ b/Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily
@@ -1,24 +1,24 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+\version "2.13"
 
-VIAgnusPieceName = "Agnus"
-VIAgnusPieceNameTacet = "Agnus tacet"
-VIAgnusTempo = "Moderato assai"
-VIAgnusTempoII = "Tempo del Kyrie"
+AgnusPieceName = "Agnus"
+AgnusPieceNameTacet = "Agnus tacet"
+AgnusTempo = "Moderato assai"
+AgnusTempoII = "Tempo del Kyrie"
 
-VIAgnusKey = \notemode {
+AgnusKey = \notemode {
   \key es \major
 }
-VIAgnusSettings = \notemode {
-  \tempo \VIAgnusTempo
+AgnusSettings = \notemode {
+  \tempo \AgnusTempo
   \time 4/4
 }
-VIAgnusSettingsII = { \tempo \VIAgnusTempoII }
+AgnusSettingsII = { \tempo \AgnusTempoII }
 
-% VIAgnusCueLabels = \notemode {
-%   \VIAgnusSettings
+% AgnusCueLabels = \notemode {
+%   \AgnusSettings
 % }
 
-VIAgnusSMusic = \relative c'' {
+AgnusSMusic = \relative c'' {
   R1*5 | % 6
   r4 g2\p c4 | % 7
   c2 c4 r | % 8
@@ -44,7 +44,7 @@ VIAgnusSMusic = \relative c'' {
   as\< as as\!\> g\! | % 28
   g2\dim( f)\!\> | % 29
   g2\fermata r2\! \bar "||" \barNumberCheck #30
-  \VIAgnusSettingsII
+  \AgnusSettingsII
   g4. es8 es4 g | % 31
   g2\> f4\! r | % 32
   as4.\> b8 g4\! b | % 33
@@ -63,7 +63,7 @@ VIAgnusSMusic = \relative c'' {
   g2\>\fermata r2\! \bar "|."
 }
 
-VIAgnusAMusic = \relative c' {
+AgnusAMusic = \relative c' {
   R1*5 | % 6
   r4 es2\p es4 | % 7
   es2 es4 r | % 8
@@ -89,7 +89,7 @@ VIAgnusAMusic = \relative c' {
   f)\< f f\!\> es | % 28
   es2.\!(\dim d4)\! | % 29
   d2\>\fermata r2\! \bar"||" \barNumberCheck #30
-  \VIAgnusSettingsII
+  \AgnusSettingsII
   es4.\pp es8 es4 es | % 31
   es2 es4 es4~ | % 32
   es d es g | % 33
@@ -109,7 +109,7 @@ VIAgnusAMusic = \relative c' {
   es2\fermata r \bar"|."
 }
 
-VIAgnusTMusic = \relative c' {
+AgnusTMusic = \relative c' {
   R1*4 | % 5
   es2 c | % 6
   g2 g4 g | % 7
@@ -136,7 +136,7 @@ VIAgnusTMusic = \relative c' {
   b) b b b | % 28
   c1\dim | % 29 %  FIXED: tied 2. + 4 = 1
   h2\fermata\! r \bar"||" \barNumberCheck #30
-  \VIAgnusSettingsII
+  \AgnusSettingsII
   b4.\pp b8 b4 b8[ h] | \barNumberCheck #31
   c2 c4 r | % 32
   c4-> b b es | % 33
@@ -156,7 +156,7 @@ VIAgnusTMusic = \relative c' {
   b2\!\>\fermata r\! \bar"|."
 }
 
-VIAgnusBMusic = \relative c {
+AgnusBMusic = \relative c {
   R1*5 | % 6
   r4 c2\p c4 | % 7
   c2 c4 r | % 8
@@ -182,7 +182,7 @@ VIAgnusBMusic = \relative c {
   d2\!( es | % 28
   as1) | % 29
   g2\fermata r \bar"||" \barNumberCheck #30
-  \VIAgnusSettingsII
+  \AgnusSettingsII
   es4.\pp^\dolce g8 g4 g | \barNumberCheck #31
   as2 as4 r | % 32
   f4. f8 es4 es | % 33
@@ -202,7 +202,7 @@ VIAgnusBMusic = \relative c {
   es2\!\>\fermata r2\! \bar"|."
 }
 
-VIAgnusSLyrics = \lyricmode {
+AgnusSLyrics = \lyricmode {
 A -- gnus de -- i a -- gnus de -- i  mi -- se -- re -- re no -- bis
 a -- gnus de -- i a -- gnus de -- i  mi -- se -- re -- re no -- bis
 A -- gnus de -- i qui tol -- lis pec -- ca -- ta mun -- di
@@ -218,7 +218,7 @@ do -- na no -- bis pa -- cem da pa -- cem
 do -- na no -- bis pa -- cem.
 }
 
-VIAgnusALyrics = \lyricmode {
+AgnusALyrics = \lyricmode {
 A -- gnus De -- i, a -- gnus de -- i, mi -- se -- re -- re no -- bis,
 a -- gnus de -- i, qui tol -- lis pec -- ca -- ta mun -- di, mi -- se -- re -- re no -- bis.
 A -- gnus de -- i, qui tol -- lis pec -- ca -- ta mun -- di, mi -- se -- re -- re no -- bis.
@@ -231,7 +231,7 @@ do -- na no -- bis pa -- cem da pa -- cem,
 do -- na no -- bis pa -- cem.
 }
 
-VIAgnusTLyrics = \lyricmode {
+AgnusTLyrics = \lyricmode {
 A -- gnus De -- i, qui tol -- lis pec -- ca -- ta mun -- di,
 mi -- se -- re -- re no -- bis.
 
@@ -248,7 +248,7 @@ do -- na no -- bis pa -- cem, da pa -- cem, da pa -- cem,
 do -- na no -- bis pa -- cem.
 }
 
-VIAgnusBLyrics = \lyricmode {
+AgnusBLyrics = \lyricmode {
 A -- gnus De -- i, a -- gnus Dei -- i, mi -- se -- re -- re no -- bis.
 A -- gnus De -- i, a -- gnus Dei -- i, mi -- se -- re -- re no -- bis.
 
@@ -262,7 +262,7 @@ do -- na no -- bis pa -- cem, da pa -- cem, da pa -- cem, da pa -- cem,
 do -- na pa -- cem.
 }
 
-VIAgnusOIaMusic =  \relative c'' {
+AgnusOIaMusic =  \relative c'' {
   g1 | % 2
   as4.( f8) f4 as | % 3
   c4.( g8) g4 c,~ | % 4
@@ -292,7 +292,7 @@ VIAgnusOIaMusic =  \relative c'' {
   <as f>2. <g es>4 | % 28
   \voiceOne g2 f | % 29
   g2\fermata << s2 \new CueVoice { \cueText "Corni" <g g,>4 <g g,> } >> | \barNumberCheck #30
-  \VIAgnusSettingsII
+  \AgnusSettingsII
   g4.( es8) es4 g | % 31
   g2 f4 r | % 32
   as4.( b8) g4 b~ | % 33
@@ -312,7 +312,7 @@ VIAgnusOIaMusic =  \relative c'' {
   <g es>2\fermata r \bar"|."
 }
 
-VIAgnusOIbMusic =  \relative c' {
+AgnusOIbMusic =  \relative c' {
   es2 c~ | % 2
   c2. f4 | % 3
   s1 | % 4
@@ -359,7 +359,7 @@ VIAgnusOIbMusic =  \relative c' {
   s1*2 \bar"|."
 }
   
-VIAgnusODynamics = {
+AgnusODynamics = {
   s1*25 | % 26
   s2 s4 s4\p | % 27
   s1*12 | % 39
@@ -367,7 +367,7 @@ VIAgnusODynamics = {
   s1*7 \bar"|."
 }
 
-VIAgnusOIIaMusic =  \relative c' {
+AgnusOIIaMusic =  \relative c' {
   g2 es | % 2
   f4 as c2~ | % 3
   c2. g4 | % 4
@@ -414,7 +414,7 @@ VIAgnusOIIaMusic =  \relative c' {
   s2 r \bar "|."
 }
 
-VIAgnusOIIbMusic =  \relative c {
+AgnusOIIbMusic =  \relative c {
   c1~ | % 2
   c2 as'4 f | % 3
   es1 | % 4
@@ -471,18 +471,18 @@ VIAgnusOIIbMusic =  \relative c {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-VIAgnusOStaff = \context PianoStaff = "VIAgnusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
-%   \context Staff = "VIAgnusOISt" {\VIAgnusCueLabels}
-  \context Staff = "VIAgnusOISt" << 
+AgnusOStaff = \context PianoStaff = "AgnusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+%   \context Staff = "AgnusOISt" {\AgnusCueLabels}
+  \context Staff = "AgnusOISt" << 
     \OIClef
-    \context Voice = "VIAgnusOIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIaMusic }
-    \context Voice = "VIAgnusOIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIbMusic }
-    \context Voice = "VIAgnusODynamics" { \VIAgnusSettings\dynamicDown\VIAgnusODynamics }
+    \context Voice = "AgnusOIa" { \voiceOne \AgnusKey\AgnusSettings\AgnusOIaMusic }
+    \context Voice = "AgnusOIb" { \voiceTwo \AgnusKey\AgnusSettings\AgnusOIbMusic }
+    \context Voice = "AgnusODynamics" { \AgnusSettings\dynamicDown\AgnusODynamics }
   >> 
-%   \context Dynamics = "VIAgnusODynamics" { \VIAgnusODynamics }
-  \context Staff = "VIAgnusOIISt" <<
+%   \context Dynamics = "AgnusODynamics" { \AgnusODynamics }
+  \context Staff = "AgnusOIISt" <<
     \OIIClef
-    \context Voice = "VIAgnusOIIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIIaMusic }
-    \context Voice = "VIAgnusOIIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIIbMusic }
+    \context Voice = "AgnusOIIa" { \voiceOne \AgnusKey\AgnusSettings\AgnusOIIaMusic }
+    \context Voice = "AgnusOIIb" { \voiceTwo \AgnusKey\AgnusSettings\AgnusOIIbMusic }
   >>
 >>
diff --git a/Pembaur_ErsteLateinischeMesse_Score_Choral.ly b/Pembaur_ErsteLateinischeMesse_Score_Choral.ly
index 38fb0ef77af10cf97307cdc84e0a1e55098e7f4e..31770d44e65c53c8459db25a0024ab509bf73e9b 100644
--- a/Pembaur_ErsteLateinischeMesse_Score_Choral.ly
+++ b/Pembaur_ErsteLateinischeMesse_Score_Choral.ly
@@ -1,26 +1,17 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
-% #(set-global-staff-size 18)
-#(set-global-staff-size 15)
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
 
-\header { 
-  instrument = \ChInstrumentTitle
-  scoretype = "Chorpartitur / Vocal Score"
-  scorenumber = \markup{\scoreNumber \ChoirScoreNumber}
+\header {
+  scoretype = \ChoralScoreTitle
+  scorenumber = \markup{\scoreNumber \ChoralScoreNumber}
 }
 
-\paper {
-  ragged-bottom = ##t
-  ragged-last-bottom = ##t
-}
-% SClef = \clef "soprano"
-% AClef = \clef "alto"
-% TClef = \clef "tenor"
-% BClef = \clef "bass"
+\createScore #"Kyrie" #'("ChoralScore")
+\createScore #"Gloria" #'("ChoralScore")
+\createScore #"Credo" #'("ChoralScore")
+\createScore #"Sanctus" #'("ChoralScore")
+\createScore #"Benedictus" #'("ChoralScore")
+\createScore #"Agnus" #'("ChoralScore")
 
-\createScore #"IKyrie" #'("Ch")
-\createScore #"IIGloria" #'("Ch")
-\createScore #"IIICredo" #'("Ch")
-\createScore #"IVSanctus" #'("Ch")
-\createScore #"VBenedictus" #'("Ch")
-\createScore #"VIAgnus" #'("Ch")
diff --git a/Pembaur_ErsteLateinischeMesse_Score_Organ.ly b/Pembaur_ErsteLateinischeMesse_Score_Organ.ly
index 8ce9e742d148c2c4943907b7eb862db2e503c6f4..afa896cec6183b50a0fc4bc358641173c8a75a6f 100644
--- a/Pembaur_ErsteLateinischeMesse_Score_Organ.ly
+++ b/Pembaur_ErsteLateinischeMesse_Score_Organ.ly
@@ -1,16 +1,17 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly"
-% #(set-global-staff-size 17)
+\version "2.13"
+\include "Pembaur_ErsteLateinischeMesse_Settings_VocalScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
 
-\header { 
-%   instrument = "Coro e organo"
-  scoretype = "Orgelpartitur / Organ Score"
-  scorenumber = \markup{\scoreNumber \PianoScoreNumber}
+\header {
+  scoretype = \OrganScoreTitle
+  scorenumber = \markup{\scoreNumber \OrganScoreNumber}
 }
 
+\createScore #"Kyrie" #'("OrganScore")
+\createScore #"Gloria" #'("OrganScore")
+\createScore #"Credo" #'("OrganScore")
+\createScore #"Sanctus" #'("OrganScore")
+\createScore #"Benedictus" #'("OrganScore")
+\createScore #"Agnus" #'("OrganScore")
 
-\createScore #"IKyrie" #'("OrganScore")
-\createScore #"IIGloria" #'("OrganScore")
-\createScore #"IIICredo" #'("OrganScore")
-\createScore #"IVSanctus" #'("OrganScore")
-\createScore #"VBenedictus" #'("OrganScore")
-\createScore #"VIAgnus" #'("OrganScore")
diff --git a/Pembaur_ErsteLateinischeMesse_Settings.ily b/Pembaur_ErsteLateinischeMesse_Settings.ily
index 0319226034ec390444b151c20cbee6b485141656..c0b423a54ebb16a2e94c7379b452304a76e0c4cb 100644
--- a/Pembaur_ErsteLateinischeMesse_Settings.ily
+++ b/Pembaur_ErsteLateinischeMesse_Settings.ily
@@ -3,10 +3,11 @@
 
 \include "deutsch.ly"
 
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly"
+\include "Pembaur_ErsteLateinischeMesse_Settings_Global.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_01_Kyrie.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_02_Gloria.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_03_Credo.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_04_Sanctus.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_05_Benedictus.ily"
+\include "Pembaur_ErsteLateinischeMesse_Music_06_Agnus.ily"
+
diff --git a/Pembaur_ErsteLateinischeMesse_Settings_FullScore.ily b/Pembaur_ErsteLateinischeMesse_Settings_FullScore.ily
index d0f86e389b033a7db3c2cefeccada396add17a27..6e015d95bce69e70826fd80a45051cef3e952ce3 100644
--- a/Pembaur_ErsteLateinischeMesse_Settings_FullScore.ily
+++ b/Pembaur_ErsteLateinischeMesse_Settings_FullScore.ily
@@ -1,2 +1,2 @@
-\include "orchestrallily/oly_settings_fullscore.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
+\include "orchestrallily/oly_settings_fullscore.ily"
+\include "Pembaur_ErsteLateinischeMesse_Settings.ily"
diff --git a/Pembaur_ErsteLateinischeMesse_Settings_Global.ily b/Pembaur_ErsteLateinischeMesse_Settings_Global.ily
index 6524949c1a8b77311398f7ee52697b60000cab06..ce4636325a44acbb621cdc3dcda84d0c00c67cf0 100644
--- a/Pembaur_ErsteLateinischeMesse_Settings_Global.ily
+++ b/Pembaur_ErsteLateinischeMesse_Settings_Global.ily
@@ -1,53 +1,23 @@
-\version "2.11.35"
+\version "2.13"
 
-\include "orchestrallily/orchestrallily.ly"
-\include "orchestrallily/oly_settings_names.ly"
+\include "orchestrallily/orchestrallily.ily"
+\include "orchestrallily/oly_settings_names.ily"
 
-EKnumber="EK-021"
+scorenumber="EK-0007"
 
-\header { 
-  title = "Erste lateinische Messe in Es-Dur"
-  composer = "Josef Pembaur (1848-1923)"
-  enteredby = "Reinhold Kainhofer"
-  copyright = \markup \abs-fontsize #9 \column{ 
+\header {
+  title = "Erste lateinische Messe"
+  subtitle = "in Es-Dur"
+  composer = "Josef Pembaur d.Ä. (1848-1923)"
+  copyright = \markup \abs-fontsize #9 \column{
       \line { "2009, Edition Kainhofer, Vienna. 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."}
   }
 }
 
-\orchestralScoreStructure #'(
-; Part-combined staves for full score
-  ("Cl" "PartCombinedStaff" ("ClI" "ClII"))
-  ("Wd" "StaffGroup" ("Cl"))
-  ("Cor" "PartCombinedStaff" ("CorI" "CorII"))
-  ("Tbe" "PartCombinedStaff" ("TbeI" "TbeII"))
-  ("Br" "StaffGroup" ("Cor" "Tbe"))
-; long score; no part-combined staves, but GrandStaves instead
-  ("ClLong" "GrandStaff" ("ClI" "ClII"))
-  ("WdLong" "StaffGroup" ("Fl" "ClLong"))
-  ("CorLong" "GrandStaff" ("CorI" "CorII"))
-  ("TbeLong" "GrandStaff" ("TbeI" "TbeII"))
-  ("BrLong" "StaffGroup" ("CorLong" "TbeLong"))
-; Strings, they are the same in long and short full score  
-  ("V" "GrandStaff" ("VI" "VII"))
-  ("Str" "StaffGroup" ("V" "Va"))
-  ("VceB" "StaffGroup" ("VcB"))
-  ("FullStr" "StaffGroup" ("V" "Va" "VcB"))
-; Choral score
-  ("Ch" "ChoirStaff" ("S" "A" "T" "B"))
-; Organ score
-  ("O" "PianoStaff" ("OI" "OII"))
-  ("OI" "ParallelVoicesStaff" ("OIa" "OIb"))
-  ("OII" "ParallelVoicesStaff" ("OIIa" "OIIb"))
-  ("OrganScore" "SimultaneousMusic" ("Ch" "O"))
-; Full scores: Orchestral score and long score including organ
-  ("ChStrQ" "SimultaneousMusic" ("Str" "Ch" "VceB"))
-  ("OrchestralScore" "SimultaneousMusic" ("Wd" "Br" "Tim" "Str" "Ch" "VceB"))
-  ("LongScore" "SimultaneousMusic" ("WdLong" "BrLong" "Tim" "Str" "Ch" "O" "VceB"))
-)
+% Possibly adjust the \orchestralScoreStructure here...
 
-\layout {
-  \context { \Lyrics
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-  }
-}
+% Add custom keys here, e.g.
+% CorKey = \key g \major
+% CorIKey = \CorKey
+% CorIIKey = \CorKey
diff --git a/Pembaur_ErsteLateinischeMesse_Settings_Instrument.ily b/Pembaur_ErsteLateinischeMesse_Settings_Instrument.ily
index 6bd32f199a5b546a9c9d785ba18555c629862d01..1c34643b8bfcc9eb4ddc5c20337ec192c20a3215 100644
--- a/Pembaur_ErsteLateinischeMesse_Settings_Instrument.ily
+++ b/Pembaur_ErsteLateinischeMesse_Settings_Instrument.ily
@@ -1,2 +1,2 @@
-\include "orchestrallily/oly_settings_instrument.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "Pembaur_ErsteLateinischeMesse_Settings.ily"
diff --git a/Pembaur_ErsteLateinischeMesse_Settings_VocalScore.ily b/Pembaur_ErsteLateinischeMesse_Settings_VocalScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..973d6af247b62a5ac6fb575a325c72c2fbd57218
--- /dev/null
+++ b/Pembaur_ErsteLateinischeMesse_Settings_VocalScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Pembaur_ErsteLateinischeMesse_Settings.ily"
diff --git a/Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily b/Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily
index 18c96c15e2ff3719a65fb3d8c3d7ace70fff3394..ec0b844966d606936a046b53bdb9f96e2c0ecbf1 100644
--- a/Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily
+++ b/Pembaur_ErsteLateinischeMesse_Settings_VocalVoice.ily
@@ -1,2 +1,2 @@
-\include "orchestrallily/oly_settings_vocalvoice.ly"
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
+\include "orchestrallily/oly_settings_vocalvoice.ily"
+\include "Pembaur_ErsteLateinischeMesse_Settings.ily"
diff --git a/TeX_Pembaur_ErsteLateinischeMesse_Settings.itex b/TeX_Pembaur_ErsteLateinischeMesse_Settings.itex
index 0f59ef764a2f0bde402ae605c9c5a5955447af74..2c2ac7f8d81e34eb1d96865773248c1224f4b7c0 100644
--- a/TeX_Pembaur_ErsteLateinischeMesse_Settings.itex
+++ b/TeX_Pembaur_ErsteLateinischeMesse_Settings.itex
@@ -12,7 +12,7 @@
 % \scoreinfo{Urtext \& Erstdruck}
 \basename{Pembaur_ErsteLateinischeMesse}
 
-\newcommand{\scoreNumber}[1]{EK-0021-#1}
+\newcommand{\scoreNumber}[1]{EK-0007-#1}
 \newcommand{\scoreTitle}{Josef Pembaur d.Ä. (1848-1923): Erste lateinische Messe}
 
 \geometry{left=1.5cm,right=1.5cm,top=1.5cm,bottom=1.5cm}
diff --git a/out/Pembaur_ErsteLateinischeMesse_Instrument_A.pdf b/out/Pembaur_ErsteLateinischeMesse_Instrument_A.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e3d56c634820e7972018de0cb28ef78587c64254
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Instrument_A.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Instrument_B.pdf b/out/Pembaur_ErsteLateinischeMesse_Instrument_B.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d6be128a0c4baaaa047a6d27338246aa225f2225
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Instrument_B.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Instrument_O.pdf b/out/Pembaur_ErsteLateinischeMesse_Instrument_O.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0cc46c8acd670f03e434443ad66a222b19957947
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Instrument_O.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Instrument_S.pdf b/out/Pembaur_ErsteLateinischeMesse_Instrument_S.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f6adeb5c8efa5abb6e72a2a665cd20d6b36fff90
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Instrument_S.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Instrument_T.pdf b/out/Pembaur_ErsteLateinischeMesse_Instrument_T.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b537c84c4e3b7308fcde68a25ead445be3af76f3
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Instrument_T.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral-1.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-1.midi
new file mode 100644
index 0000000000000000000000000000000000000000..2a95f926001ed46e7f14626587b69c724040507c
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-1.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral-2.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-2.midi
new file mode 100644
index 0000000000000000000000000000000000000000..2b0e892d7c6bd15478d7a373e17df0f910289a73
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-2.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral-3.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-3.midi
new file mode 100644
index 0000000000000000000000000000000000000000..44b20af8d40f866c74d6487e24fb4c00a3cab968
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-3.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral-4.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-4.midi
new file mode 100644
index 0000000000000000000000000000000000000000..9e66f5000fc3d114f5a1a4f1539d8bdf1892e869
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-4.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral-5.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-5.midi
new file mode 100644
index 0000000000000000000000000000000000000000..8576f89404aa5125862b70f08783a55803ded879
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral-5.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.midi
new file mode 100644
index 0000000000000000000000000000000000000000..0183c9a7ce8935793bb306569023eb2c76d42b1d
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral.pdf b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7b03d58039554350b47e64fcbfbe71e93c5bb186
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Choral.toc b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.toc
new file mode 100644
index 0000000000000000000000000000000000000000..c35eab4d031841eaab4295e8cd558f50fd88f2b8
--- /dev/null
+++ b/out/Pembaur_ErsteLateinischeMesse_Score_Choral.toc
@@ -0,0 +1,6 @@
+1, section, 1, {Kyrie}, toc55,
+2, section, 1, {Gloria}, toc56,
+4, section, 1, {Credo}, toc57,
+7, section, 1, {Sanctus}, toc58,
+8, section, 1, {Benedictus}, toc59,
+9, section, 1, {Agnus}, toc60
\ No newline at end of file
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ-1.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-1.midi
new file mode 100644
index 0000000000000000000000000000000000000000..2aa3e18721c53e3ad39cdf350271e120595d1871
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-1.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ-2.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-2.midi
new file mode 100644
index 0000000000000000000000000000000000000000..d2178ca10f790ee5d53327147595c98b79a253c1
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-2.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ-3.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-3.midi
new file mode 100644
index 0000000000000000000000000000000000000000..7949c47111664f1010ca9ccd707d4d19b6239613
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-3.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ-4.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-4.midi
new file mode 100644
index 0000000000000000000000000000000000000000..a762992050106f54046978f21d9f10c7df223ff9
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-4.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ-5.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-5.midi
new file mode 100644
index 0000000000000000000000000000000000000000..646802d3437d78b65e5a266c126c940cd383c5f2
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ-5.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ.midi b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.midi
new file mode 100644
index 0000000000000000000000000000000000000000..83b73c9455076c294f1fc7f9cbc28b3fb796ee14
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.midi differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ.pdf b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..205ed58999fbdcb01d936c22e273e861fbb700e0
Binary files /dev/null and b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.pdf differ
diff --git a/out/Pembaur_ErsteLateinischeMesse_Score_Organ.toc b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.toc
new file mode 100644
index 0000000000000000000000000000000000000000..9ed0642355da59933ebab1fd716efac4d132c1bb
--- /dev/null
+++ b/out/Pembaur_ErsteLateinischeMesse_Score_Organ.toc
@@ -0,0 +1,6 @@
+1, section, 1, {Kyrie}, toc55,
+3, section, 1, {Gloria}, toc56,
+6, section, 1, {Credo}, toc57,
+10, section, 1, {Sanctus}, toc58,
+11, section, 1, {Benedictus}, toc59,
+13, section, 1, {Agnus}, toc60
\ No newline at end of file
diff --git a/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Choral.pdf b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Choral.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..87cda3e4358a77c96b0be6f3df447d7465ba61f7
Binary files /dev/null and b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Choral.pdf differ
diff --git a/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Instruments.pdf b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Instruments.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..055bb4f53116db79e6b36574ed6069168f2d2b54
Binary files /dev/null and b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Instruments.pdf differ
diff --git a/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Organ.pdf b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Organ.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..495a7c4fbf6818dfbb1eee8410f3be818d43f361
Binary files /dev/null and b/out/TeX_Pembaur_ErsteLateinischeMesse_Score_Organ.pdf differ
diff --git a/patches/Pembaur_ErsteLateinischeMesse_Instrument_O.ly.patch b/patches/Pembaur_ErsteLateinischeMesse_Instrument_O.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3a581eabfeaea534caa4755984d087749158144d
--- /dev/null
+++ b/patches/Pembaur_ErsteLateinischeMesse_Instrument_O.ly.patch
@@ -0,0 +1,13 @@
+--- Pembaur_ErsteLateinischeMesse_Instrument_O.ly.new	2009-09-19 19:59:41.000000000 +0200
++++ Pembaur_ErsteLateinischeMesse_Instrument_O.ly	2009-09-19 19:58:09.000000000 +0200
+@@ -5,6 +5,10 @@
+   instrument = \OInstrumentName
+   scorenumber = \markup{\scoreNumber \ONumber}
+ }
++\paper {
++  % Don't use turn breaking, but rather optimal!
++  #(define page-breaking ly:optimal-breaking)
++}
+ 
+ \createScore #"Kyrie" #'("O")
+ \createScore #"Gloria" #'("O")