diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
index ec26f9cc1d8ca5bcaef6d945b413d8bef64dc012..91e1a23a09c159b774feec601414baf824917701 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
@@ -1,4 +1,4 @@
-\include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
+ \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly"
 
 IKyriePieceName = "Kyrie"
 IKyriePieceNameTacet = "Kyrie tacet"
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf
deleted file mode 100644
index 7cd1e0ce6b66fa073e37f6ed58b3c06db4f7c0b5..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf
deleted file mode 100644
index 2d8e3da4de2853b3de5a4e4d79a01db8b6d4beb1..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf
deleted file mode 100644
index b7ff2a5aca72bfac837ed149405e1724ffca687d..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.toc b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.toc
deleted file mode 100644
index 8d237372c67d3674db975a939ea0c4addf73c8b8..0000000000000000000000000000000000000000
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.toc
+++ /dev/null
@@ -1,6 +0,0 @@
-1, section, 1, {Kyrie}, toc53,
-2, section, 1, {Gloria}, toc54,
-5, section, 1, {Credo}, toc55,
-9, section, 1, {Sanctus}, toc56,
-10, section, 1, {Benedictus}, toc57,
-11, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf
deleted file mode 100644
index 341075b317906e872973acf536fc1cc94ecd3146..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf
deleted file mode 100644
index c7ca259b6caf3c620d0979352b32013d62535957..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc
deleted file mode 100644
index 4f9fb4caec16a4f2295d445188fddde3c47f2ad7..0000000000000000000000000000000000000000
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc
+++ /dev/null
@@ -1,6 +0,0 @@
-1, section, 1, {Kyrie}, toc53,
-3, section, 1, {Gloria}, toc54,
-7, section, 1, {Credo}, toc55,
-13, section, 1, {Sanctus}, toc56,
-15, section, 1, {Benedictus}, toc57,
-17, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf
deleted file mode 100644
index 8102e1d57be9a39e235fa1fd7e2a3b10fe533998..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf and /dev/null differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
index ca642366c3d3437e88021e9c1408ea204ac35917..d0f86e389b033a7db3c2cefeccada396add17a27 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
@@ -1,22 +1,2 @@
+\include "orchestrallily/oly_settings_fullscore.ly"
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
-
-#(set-default-paper-size "a4")
-#(set-global-staff-size 15)
-
-\paper {
-  systemSeparatorMarkup = \slashSeparator
-  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
-
-\layout {
-  \context {
-      \Score
-      \override VerticalAlignment #'max-stretch = #10000000
-  }
-}
-
-\header { 
-%   publisher = \markup \center-align \concat { "Edition Kainhofer, 2008, " \scoreNumber\FullScoreNumber}
-  ensemble = \markup { \fill-line { "Coro (SATB) ed Orchestra o Organo" } }
-}
-
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
index 2d5acc731c78494724750f068cee08f3c1d50f3f..6524949c1a8b77311398f7ee52697b60000cab06 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
@@ -9,8 +9,6 @@ EKnumber="EK-021"
   title = "Erste lateinische Messe in Es-Dur"
   composer = "Josef Pembaur (1848-1923)"
   enteredby = "Reinhold Kainhofer"
-  maintainer = "R. Kainhofer"
-  maintainerEmail = "reinhold@kainhofer.com"
   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."}
@@ -49,18 +47,7 @@ EKnumber="EK-021"
 )
 
 \layout {
-  \context { \Staff 
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. . 3)
-  }
   \context { \Lyrics
     \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
   }
-  \context { \Score
-    \override BarNumber #'self-alignment-X = #0
-%     \override BarNumber #'outside-staff-priority = #10
-  }
 }
-rit = \markup {\italic "rit."}
-pocorit = \markup {\italic "poco rit."}
-ppmosso = \markup {\italic "poco più mosso"}
-dolce = \markup {\italic "dolce."}
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly
index db682964b8ccd2dffb84586b0cba62e6de413de2..6bd32f199a5b546a9c9d785ba18555c629862d01 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly
@@ -1,47 +1,2 @@
-% lilypond input for Pembaur's Vierte Lateinische Messe
-% changes to the global score settings for single-instrument sheets
+\include "orchestrallily/oly_settings_instrument.ly"
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
-
-#(set-default-paper-size "a4")
-% #(set-global-staff-size 21)
-
-\paper {
-    ragged-bottom = ##f
-    ragged-last-bottom = ##f
-  % Allow line-breaks only at rests!
-  #(define page-breaking ly:page-turn-breaking)
-}
-\paper { 
-  foot-separation = #2
-  between-system-padding = #0.5
-}
-\paper {
-  left-margin = 1.5\cm
-  right-margin = 1.5\cm
-  line-width = 18\cm
-  bottom-margin = 0.5\cm
-  top-margin = 0.5\cm
-%   after-title-space = 0.5\cm
-  ragged-bottom = ##f
-  ragged-last-bottom = ##f
-}
-\layout {
-  \context {  \Staff
-      % No instrument names, they are already in the title/header!
-      \remove "Instrument_name_engraver"
-  }
-  \context {
-      \RemoveEmptyStaffContext 
-      % No instrument names, they are already in the title/header! (Removing 
-      % the engraver only from the \Staff context is not sufficient!)
-      \remove "Instrument_name_engraver"
-  }
-}
-
-\layout {
-  \context { \Staff
-    % line breaks only at rests for page turning
-    \consists "Page_turn_engraver"
-    minimumPageTurnLength = #(ly:make-moment 9 8)
-  } 
-}
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly
index da6e0db2583721d4f760a53ce45e0cef12fb0191..18c96c15e2ff3719a65fb3d8c3d7ace70fff3394 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly
@@ -1,28 +1,2 @@
-%lilypond input for Schubert's Stabat Mater
-% changes to the global score settings for single-instrument sheets
+\include "orchestrallily/oly_settings_vocalvoice.ly"
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
-
-#(set-default-paper-size "a4")
-% #(set-global-staff-size 21)
-#(set-global-staff-size 17)
-
-\paper {
-  ragged-bottom = ##f
-  ragged-last-bottom = ##t
-}
-\layout {
-  \context {  \Staff
-    % No instrument names, they are already in the title/header!
-    \remove "Instrument_name_engraver"
-    % line breaks only at rests for page turning
-%     \consists "Page_turn_engraver"
-    \override VerticalAxisGroup #'remove-empty = ##f
-  }
-%   \context {
-%     \RemoveEmptyStaffContext 
-    % No instrument names, they are already in the title/header! (Removing 
-    % the engraver only from the \Staff context is not sufficient!)
-%     \remove "Instrument_name_engraver"
-%   }
-}
-
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf
deleted file mode 100644
index 0901e9dea97cf6d9cf861badda432069ede1f8c9..0000000000000000000000000000000000000000
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf and /dev/null differ
diff --git a/TexPages_ContentsMaterial.tex b/TexPages_ContentsMaterial.tex
index d6ae4b5a40068d235845846e7db2f39ae34bb48e..56400db467ea0c35f5e082bf296693f38f0421d9 100644
--- a/TexPages_ContentsMaterial.tex
+++ b/TexPages_ContentsMaterial.tex
@@ -14,43 +14,45 @@
 \begin{center}
 
 \scorelistbox{
-Zu diesem Werk liegt folgendes Aufführungsmaterial vor:
-
-Partitur (\scoreNumber\FullScoreNumber),
-Klavier-/Orgelauszug (\scoreNumber\PianoScoreNumber),
-Chorpartitur (\scoreNumber\ChoirScoreNumber),
-Orgelstimme (\scoreNumber\ONumber);
-
-Soprano (\scoreNumber\SNumber),
-Alto (\scoreNumber\ANumber),
-Tenore (\scoreNumber\TNumber),
-Basso (\scoreNumber\BNumber);
-
-% Harmoniestimmen (\scoreNumber\InstrumentsNumber),
-% Violino I (\scoreNumber\VINumber),
-% Violino II (\scoreNumber\VIINumber),
-% Viola (\scoreNumber\VaNumber),
-% Violoncello / Contrabbasso (\scoreNumber\VcBNumber),
-% Flauto (\scoreNumber\FlINumber),
-% Clarinetto I (\scoreNumber\ClINumber),
-% Clarinetto II (\scoreNumber\ClIINumber),
-% Corno I (\scoreNumber\CorINumber),
-% Corno II (\scoreNumber\CorIINumber),
-% Tromba I (\scoreNumber\TrbINumber),
-% Tromba II (\scoreNumber\TrbIINumber),
-% Timpani (\scoreNumber\TimNumber).
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+Partitur (-\FullScoreNumber),
+Klavier-/Orgelauszug (-\PianoScoreNumber),
+Chorpartitur (-\ChoirScoreNumber),
+Orgelstimme (-\ONumber);
+
+Soprano (-\SNumber),
+Alto (-\ANumber),
+Tenore (-\TNumber),
+Basso (-\BNumber);
+
+% Harmoniestimmen (-\InstrumentsNumber),
+% Violino I (-\VINumber),
+% Violino II (-\VIINumber),
+% Viola (-\VaNumber),
+% Violoncello / Contrabbasso (-\VcBNumber),
+% Flauto (-\FlINumber),
+% Clarinetto I (-\ClINumber),
+% Clarinetto II (-\ClIINumber),
+% Corno I (-\CorINumber),
+% Corno II (-\CorIINumber),
+% Tromba I (-\TrbINumber),
+% Tromba II (-\TrbIINumber),
+% Timpani (-\TimNumber).
 }
 \end{center}
 
 \vfill
 \section*{Quellen der Ausgabe / Sources of the Edition}
-Josef Pembaur, Erste lateinische Messe in Es-Dur, Verlagsnummer 45, Johann Gross, Innsbruck, TODO
+\begin{hauptquellen}
+\item Josef Pembaur, Erste lateinische Messe in Es-Dur, Verlagsnummer 45, Johann Gross, Innsbruck, TODO
+\end{hauptquellen}
 
 \vfill
 
 \makeatletter
-\copyrightbox{© \@year, Edition Kainhofer, Wien\newline
+\copyrightbox{© \@year, \@publisher\newline
 1. Auflage / 1st Printing \@year\newline
-Computersatz mit Lilypond 2.11.60, \href{http://www.lilypond.org/}{http://www.lilypond.org/}\newline
+Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
diff --git a/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf
deleted file mode 100644
index 6adebac2b4273e7336765ced3b80b6ce0e1aa7eb..0000000000000000000000000000000000000000
Binary files a/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf and /dev/null differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf b/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf
deleted file mode 100644
index 8e79564df58f51371c735fc35517d4c5a9cd9a05..0000000000000000000000000000000000000000
Binary files a/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf and /dev/null differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf
deleted file mode 100644
index 1afe38680c1b9a03048c59832af9019e9dc3e11a..0000000000000000000000000000000000000000
Binary files a/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf and /dev/null differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf
deleted file mode 100644
index 10ec4b5511159157d6f6fec20380ff1df3743625..0000000000000000000000000000000000000000
Binary files a/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf and /dev/null differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf
deleted file mode 100644
index 37692c496a317d9fe2e220eb2358ddcc9d5883ac..0000000000000000000000000000000000000000
Binary files a/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf and /dev/null differ