diff --git a/.gitignore b/.gitignore
index 8c3f9400544f9150b9934ff278325713ed96f59e..5317b388db21383a2c0dd2c942ee90797c73bec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.new
 *.aux
 *.blg
 *.log
diff --git a/Makefile b/Makefile
index 24bf9dc2db0360c7fe0637e1191fa41a97529f33..524973f306394cf2d9fd34a8e0912dbf8afa1db6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,37 @@
-SRCS = Vierne_MesseSolennelle_01_Kyrie.ly Vierne_MesseSolennelle_02_Gloria.ly Vierne_MesseSolennelle_03_Sanctus.ly Vierne_MesseSolennelle_04_Benedictus.ly Vierne_MesseSolennelle_05_Agnus.ly Vierne_MesseSolennelle_Settings.ly Vierne_MesseSolennelle_Settings_Global.ly
+base = Vierne_MesseSolennelle
+SRCS = Vierne_MesseSolennelle_Music_01_Kyrie.ily Vierne_MesseSolennelle_Music_02_Gloria.ily Vierne_MesseSolennelle_Music_03_Sanctus.ily Vierne_MesseSolennelle_Music_04_Benedictus.ily Vierne_MesseSolennelle_Music_05_Agnus.ily $(base)_Settings.ily
+OUT=out
 
-instruments = OI OII
-vocal = S A T B Ch 
-extensions = $(instruments) $(vocal)
+instruments = S A T B OI OII
+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 = $(extensions:%=Vierne_MesseSolennelle_%.pdf) Vierne_MesseSolennelle.pdf
 
 .PHONY: all clean
-all: $(pdfs) Partitur
+all: $(OUT) $(instruments) $(scores) tex
 instruments: $(instruments)
-vocal: $(vocal)
-full: $(extensions)
+scores: $(scores)
+
+clean:
+	rm -rf $(OUT)
+
+$(OUT) :
+	mkdir -p $(OUT)
 
-clean: 
-	for i in $(extensions); do \
-	  rm -f Vierne_MesseSolennelle_$${i}.pdf Vierne_MesseSolennelle_$${i}.ps; \
-	done; \
-	rm -f Vierne_MesseSolennelle.ps Vierne_MesseSolennelle.pdf;
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
-$(extensions): % : Vierne_MesseSolennelle_%.pdf $(SRCS)
+$(OUT)/%.pdf : %.ly $(SRCS)
+	lilypond -o $(basename $@) $<
 
-Partitur: Vierne_MesseSolennelle.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/TeX_Vierne_MesseSolennelle_Include_About.itex b/TeX_Vierne_MesseSolennelle_Include_About.itex
new file mode 100644
index 0000000000000000000000000000000000000000..e163082927bfdf9c940b9fc21855a3a49f391234
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_About.itex
@@ -0,0 +1,9 @@
+\addcontentsline{toc}{section}{Vorwort / Preface}
+\chapter*{Vorwort / Preface}
+
+\begin{multicols}{2}
+TODO
+\columnbreak
+TODO
+\end{multicols}
+\vfill
diff --git a/TeX_Vierne_MesseSolennelle_Include_Backpage.itex b/TeX_Vierne_MesseSolennelle_Include_Backpage.itex
new file mode 100644
index 0000000000000000000000000000000000000000..88855cb1384145403e7476713afaf424939a3545
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_Backpage.itex
@@ -0,0 +1,2 @@
+\cleardoublepage
+\makebackpage
diff --git a/TeX_Vierne_MesseSolennelle_Include_ContentsMaterial.itex b/TeX_Vierne_MesseSolennelle_Include_ContentsMaterial.itex
new file mode 100644
index 0000000000000000000000000000000000000000..fb910180a71bd1989f58efc4560c2311e060b56e
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_ContentsMaterial.itex
@@ -0,0 +1,45 @@
+\begin{center}
+
+\begin{minipage}{0.5\textwidth}
+\tableofcontents
+\end{minipage}
+\vfill
+\vfill
+
+\end{center}
+
+
+
+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\OrganScoreNumber),
+% \VocalScoreName{} (-\VocalScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber),
+\OIName{} (-\OINumber),
+\OIIName{} (-\OIINumber);
+
+\SName{} (-\SNumber),
+\AName{} (-\ANumber),
+\TName{} (-\TNumber),
+\BName{} (-\BNumber).
+}
+\end{center}
+
+\vfill
+\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+\begin{hauptquellen}
+\item Louis VIERNE: Messe solennelle en ut$\sharp$ mineur, op. 16. Réf.: BN, J. Hamelle, Paris, 1906.
+\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.}
+
+
diff --git a/TeX_Vierne_MesseSolennelle_Include_Coverpage.itex b/TeX_Vierne_MesseSolennelle_Include_Coverpage.itex
new file mode 100644
index 0000000000000000000000000000000000000000..af96c15963a1392e597cb3525d02e95ef4b4e6b3
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_Coverpage.itex
@@ -0,0 +1 @@
+\makefrontpage
diff --git a/TeX_Vierne_MesseSolennelle_Include_KritBericht.itex b/TeX_Vierne_MesseSolennelle_Include_KritBericht.itex
new file mode 100644
index 0000000000000000000000000000000000000000..390dac982d5ff282ee15cf9b52790cec2ac6aee8
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_KritBericht.itex
@@ -0,0 +1,30 @@
+\section*{Danksagung}
+\begin{multicols}{2}
+An dieser Stelle sei all jenen Personen und Institutionen gedankt, ohne die die
+vorliegende Ausgabe nicht möglich gewesen wäre. Zum einen sei dabei der
+Musiksammlung der \href{http://www.onb.ac.at/}{Österreichischen Nationalbibliothek}
+für die unbürokratische Benutzung des riesigen Fundus und den
+Bediensteten für ihr stetiges Entgegenkommen in allen Belangen herzlich gedankt.
+%
+Zum anderen wäre eine Urtext-Ausgabe nicht möglich ohne Zugang zum Autograph,
+der im Archiv des \href{http://www.schottenstift.at/}{Wiener Schottenstifts}
+verwahrt ist. Dabei sei Herrn Dr. Martin Czernin, Archivar des Schottenstifts,
+herzlich gedankt für die Möglichkeit der Einsichtnahme in und des
+Quellenvergleichs mit dem Originalautograph Eyblers.
+%
+Auch \href{http://www.koscielny.eu/}{Christoph Koscielny}, einem weiteren
+Bewunderer Eyblers, sei für zahlreiche Diskussionen, Hinweise und
+Hilfestellungen sehr gedankt.
+
+Der Noten- und Textsatz dieser Ausgabe wurde vollständig in freier Software
+erstellt, wobei für den Notensatz LilyPond 2.13
+(\url{http://www.lilypond.org/}) zum Einsatz kam in Verbindung mit den
+OrchestralLily Paket (\url{http://reinhold.kainhofer.com/orchestrallily/}) des
+Editors. Der Textsatz und die Erstellung der druckfertigen Dateien erfolgte
+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
+ihr Verständnis während der Erstellung dieser Ausgabe.
+\end{multicols}
diff --git a/TexPages_Leben.tex b/TeX_Vierne_MesseSolennelle_Include_Leben.itex
similarity index 98%
rename from TexPages_Leben.tex
rename to TeX_Vierne_MesseSolennelle_Include_Leben.itex
index 67817fe5885439fbe37c684fd413b9b10670d34f..7759ac52bc314d12ec1ce55289c094f377b82c6c 100644
--- a/TexPages_Leben.tex
+++ b/TeX_Vierne_MesseSolennelle_Include_Leben.itex
@@ -1,13 +1,12 @@
 \section*{Louis Vierne (1870-1937)}
 
-\begin{small}
 \begin{multicols}{2}
 Louis Vierne wurde am 8. Oktober 1870 in Poitiers als Sohn
 des Journalisten Henri Vierne geboren. 1873 übersiedelte die Familie jedoch
 nach Paris. Obwohl bei der Geburt beinahe blind,
 verbesserte sich dieser Zustand im Alter von sieben Jahren insofern, als
 er große Schift lesen konnte und sich im Alltag alleine zurechtfinden konnte.
-    
+
 Nachdem seine musikalische Begabung schon relativ früh entdeckt wurde,
 erhielt er seit 1880 Klavierunterreicht bei Henri Specht. Tief bewegte ihn
 vor allem César Franck an der Orgel, den er im selben Jahr erstmalig hörte.
@@ -28,7 +27,7 @@ Organisten. Nach einem schweren
 Verkehrsunfalls im Jahr 1906, bei dem er sich einen komplizierten Beinbruch
 zuzog, der beinahe eine Amputation zur Folge hatt, musste er seine
 Pedaltechnik völlig neu lernen, was fast ein Jahr dauerte.
-    
+
 Seine 1898 geschlossene Ehe mit der Sängerin Arlette Taskin hielt 10 Jahre,
 die Trennung traf ihn schwer, genauso wie der Verlust seines Sohnes Jacques
 und seines geliebten Bruders René im ersen Weltkrieg.
@@ -46,11 +45,8 @@ Improvisationen zeigen jedoch, dass diese wie fertige Kompositionen wirken.
 
 Während eines Orgelkonzerts am 2. Juni 1937 erlitt Vierne einen Schlaganfall
 und verstab - seinem langen Wunsch entsprechend - an seiner Orgel in Notre-Dame.
-
-\vspace{1em}
+\end{multicols}
 
 Quelle:\\ \textit{Louis Vierne}, deutscher Wikipedia-Artikel, abgerufen am 22. Mai 2008.
 \href{http://de.wikipedia.org/wiki/Vierne}{http://de.wikipedia.org/wiki/Vierne}
 
-\end{multicols}
-\end{small}
diff --git a/TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex b/TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex
new file mode 100644
index 0000000000000000000000000000000000000000..ba21377e4e795a97f00ff2eb0efd29b254a3eb90
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex
@@ -0,0 +1,19 @@
+\frontmatter
+\maketitle
+
+\input{TeX_Vierne_MesseSolennelle_Include_ContentsMaterial.itex}
+\cleardoublepage
+
+\input{TeX_Vierne_MesseSolennelle_Include_Leben.itex}
+\input{TeX_Vierne_MesseSolennelle_Include_Text.itex}
+
+% \input{TeX_Vierne_MesseSolennelle_Include_About.itex}
+% \pagebreak
+
+% \input{TeX_Vierne_MesseSolennelle_Include_About.itex}
+% \input{TeX_Vierne_MesseSolennelle_Include_Text.itex}
+% \pagebreak
+% \input{TeX_Vierne_MesseSolennelle_Include_Leben.itex}
+
+\mainmatter
+\cleardoublepage
diff --git a/TeX_Vierne_MesseSolennelle_Include_Preface_Short.itex b/TeX_Vierne_MesseSolennelle_Include_Preface_Short.itex
new file mode 100644
index 0000000000000000000000000000000000000000..f52651231fdfc931fa8483ed186f436a0fa1579a
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_Preface_Short.itex
@@ -0,0 +1,5 @@
+\frontmatter
+\maketitle
+
+\mainmatter
+\cleardoublepage
diff --git a/TexPages_Text.tex b/TeX_Vierne_MesseSolennelle_Include_Text.itex
similarity index 98%
rename from TexPages_Text.tex
rename to TeX_Vierne_MesseSolennelle_Include_Text.itex
index 0c7ae9156ef1f19dc74b6996435405839bd064a6..6807a094ad578a22050631a079a9186ff2a3b8b7 100644
--- a/TexPages_Text.tex
+++ b/TeX_Vierne_MesseSolennelle_Include_Text.itex
@@ -1,7 +1,7 @@
 \section*{Text der Messe / Text of the Mass}
 
 \begin{small}
-\newenvironment{lyricstable}{\begin{tabular}{p{0.26\textwidth}p{0.33\textwidth}p{0.33\textwidth}}}{\end{tabular}}
+\renewenvironment{lyricstable}{\begin{tabular}{p{0.26\textwidth}p{0.33\textwidth}p{0.33\textwidth}}}{\end{tabular}}
 
 \subsection*{Kyrie eleison}
 \nopagebreak
diff --git a/TeX_Vierne_MesseSolennelle_Include_Todo.itex b/TeX_Vierne_MesseSolennelle_Include_Todo.itex
new file mode 100644
index 0000000000000000000000000000000000000000..92fdae45a54be235d13fef1abcbbcbfc34374dd4
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Include_Todo.itex
@@ -0,0 +1,10 @@
+% \todos{
+% \chapter*{Offene Fragen}
+%
+% \section*{Literaturvergleich mit dem Autograph:}
+% \begin{itemize}
+% \item
+%
+% \end{itemize}
+%
+% }
diff --git a/TeX_Vierne_MesseSolennelle_Score_Choral.tex b/TeX_Vierne_MesseSolennelle_Score_Choral.tex
new file mode 100644
index 0000000000000000000000000000000000000000..d262fe39b807ec26807cc4ad5366765493914e61
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Score_Choral.tex
@@ -0,0 +1,25 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Vierne_MesseSolennelle_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \ChoralScoreType},
+}
+
+\scoretype{\ChoralScoreType}
+\scorenumber{\scoreNumber\ChoralScoreNumber}
+\ChoralScoreSettings
+
+\begin{document}
+\input{TeX_Vierne_MesseSolennelle_Include_Coverpage.itex}
+\input{TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex}
+
+\includescore{Score_Choral}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Vierne_MesseSolennelle_Include_KritBericht.itex}
+
+\input{TeX_Vierne_MesseSolennelle_Include_Backpage.itex}
+\end{document}
diff --git a/TeX_Vierne_MesseSolennelle_Score_Instruments.tex b/TeX_Vierne_MesseSolennelle_Score_Instruments.tex
new file mode 100644
index 0000000000000000000000000000000000000000..0adcf15461644c6cb5f74b0bf05fe2f5467e7a1e
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Score_Instruments.tex
@@ -0,0 +1,43 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Vierne_MesseSolennelle_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \InstrumentalPartsType},
+}
+
+\scoretype{\InstrumentalPartsType}
+\scorenumber{\scoreNumber\InstrumentalPartsNumber}
+\InstrumentalPartsSettings
+
+\begin{document}
+\input{TeX_Vierne_MesseSolennelle_Include_Coverpage.itex}
+\input{TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex}
+
+\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}{\OIName}
+\includescore{Instrument_OI}
+\phantomsection
+\addcontentsline{toc}{section}{\OIIName}
+\includescore{Instrument_OII}
+
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Vierne_MesseSolennelle_Include_KritBericht.itex}
+
+\input{TeX_Vierne_MesseSolennelle_Include_Backpage.itex}
+\end{document}
diff --git a/TeX_Vierne_MesseSolennelle_Score_Organ.tex b/TeX_Vierne_MesseSolennelle_Score_Organ.tex
new file mode 100644
index 0000000000000000000000000000000000000000..9491932c595178f8eba7db4a3d7cc816c9db8547
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Score_Organ.tex
@@ -0,0 +1,25 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Vierne_MesseSolennelle_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \OrganScoreType},
+}
+
+\scoretype{\OrganScoreType}
+\scorenumber{\scoreNumber\OrganScoreNumber}
+\OrganScoreSettings
+
+\begin{document}
+\input{TeX_Vierne_MesseSolennelle_Include_Coverpage.itex}
+\input{TeX_Vierne_MesseSolennelle_Include_Preface_Long.itex}
+
+\includescore{Score_Organ}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Vierne_MesseSolennelle_Include_KritBericht.itex}
+
+\input{TeX_Vierne_MesseSolennelle_Include_Backpage.itex}
+\end{document}
diff --git a/TeX_Vierne_MesseSolennelle_Settings.itex b/TeX_Vierne_MesseSolennelle_Settings.itex
new file mode 100644
index 0000000000000000000000000000000000000000..081f6f599010903d8b8b37bcea3c6c555f1cc845
--- /dev/null
+++ b/TeX_Vierne_MesseSolennelle_Settings.itex
@@ -0,0 +1,23 @@
+\composer{Louis Vierne}
+\composerdate{(1870-1937)}
+\title{Messe Solennelle}
+\subtitle{en ut$\sharp$ mineur}
+\description{Chant et orgue}
+\editor{Reinhold Kainhofer}
+\publisher{Edition Kainhofer, Vienna}
+\year{2009}
+\scoreinfo{Praktische Ausgabe}
+\basename{Vierne_MesseSolennelle}
+
+\newcommand{\scoreNumber}[1]{EK-0005-#1}
+\newcommand{\scoreTitle}{Louis Vierne (1870-1937): Messe solennelle}
+
+\geometry{left=1.5cm,right=1.5cm,top=1.5cm,bottom=1.5cm}
+\hypersetup{
+    pdfauthor={Reinhold Kainhofer <reinhold@kainhofer.com>}
+}
+
+\input{TeX_Vierne_MesseSolennelle_Include_Todo.itex}
+
+\renewcommand{\OIName}{Orgue  de Chœur}
+\renewcommand{\OIIName}{Grand Orgue}
diff --git a/TexPages_About.tex b/TexPages_About.tex
deleted file mode 100644
index a1356564467572485e9d29ba61d0bcaa14746fdd..0000000000000000000000000000000000000000
--- a/TexPages_About.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-% \section*{Bemerkungen zum Werk}
-% 
-% \begin{multicols}{2}
-%     TODO
-% \end{multicols}
-% 
-% 
-% \section*{About the Stabat Mater}
-% 
-% 
-% \begin{multicols}{2}
-%     TODO
-% \end{multicols}
diff --git a/TexPages_ContentsMaterial.tex b/TexPages_ContentsMaterial.tex
deleted file mode 100644
index cfecd355436c06a989feaee721ba1c9a8c9ac541..0000000000000000000000000000000000000000
--- a/TexPages_ContentsMaterial.tex
+++ /dev/null
@@ -1,34 +0,0 @@
-\begin{center}
-
-\null\vfill
-
-\begin{minipage}{0.5\textwidth}
-\tableofcontents
-\end{minipage}
-\vfill
-\vfill
-
-\scorelistbox{
-Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
-
-Partitur (-\FullScoreNumber),
-% Klavier-/Orgelauszug (-\PianoScoreNumber),
-Chorstimmen (-\ChoirScoreNumber),
-Orgue de Choeur (-\ONumber),
-Grande Orgue (-\OIINumber);
-
-Soprano (-\SNumber),
-Alto (-\ANumber),
-Tenore (-\TNumber),
-Basso (-\BNumber).
-}
-
-\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.}
-
-\end{center}
diff --git a/TexPages_Quellen.tex b/TexPages_Quellen.tex
deleted file mode 100644
index 1ee7829e35a37c8e4a35628c4441ad9c126b24f9..0000000000000000000000000000000000000000
--- a/TexPages_Quellen.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\section*{Quellen der Ausgabe / Sources of the Edition}
-Louis VIERNE, Messe solennelle en ut\# mineur, op. 16. Réf.: BN, J. Hamelle, Paris, 1906.
diff --git a/TexPages_Settings.tex b/TexPages_Settings.tex
deleted file mode 100644
index 1273a3f37f0434973eaf78f55ed06e6d415ad279..0000000000000000000000000000000000000000
--- a/TexPages_Settings.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-% Title Page
-\composer{Louis Vierne}
-\composerdate{(1870-1937)}
-\title{Messe Solennelle}
-\subtitle{en ut\# mineur}
-\description{Chant et orgue}
-\editor{Reinhold Kainhofer}
-\publisher{Edition Kainhofer}
-\year{2009}
-
-\basename{Vierne_MesseSolennelle}
-
-
-\newcommand{\scoreNumber}[1]{EK-023-#1}
-% \newcites{bio}{Quellen / Sources:}
-
-
-\geometry{left=1.5cm,right=1.5cm,top=1.5cm,bottom=1.5cm}
-\hypersetup{
-    colorlinks=true,
-    citecolor=black,
-    pdfauthor={Reinhold Kainhofer <reinhold@kainhofer.com>}
-}
diff --git a/Tex_Vierne_MesseSolenelle.pdf b/Tex_Vierne_MesseSolenelle.pdf
deleted file mode 100644
index 50dede70648958256952e57d54afe248de15e489..0000000000000000000000000000000000000000
Binary files a/Tex_Vierne_MesseSolenelle.pdf and /dev/null differ
diff --git a/Tex_Vierne_MesseSolenelle.tex b/Tex_Vierne_MesseSolenelle.tex
deleted file mode 100644
index 87d370c976ed092d5b945379bcbccafd90a0ebf5..0000000000000000000000000000000000000000
--- a/Tex_Vierne_MesseSolenelle.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-
-\hypersetup{
-    pdftitle={Louis Vierne: Messe Solennelle en ut\# mineur},
-}
-
-\include{TexPages_Settings}
-\scoretype{Partitur / Full Score}
-\scorenumber{\scoreNumber\FullScoreNumber}
-\setfullscore
-
-\begin{document}
-\makefrontpage
-\frontmatter
-\maketitle
-
-\input{TexPages_ContentsMaterial.tex}
-
-\pagebreak
-
-% \chapter*{Zum Werk / About}
-\addcontentsline{toc}{section}{Biografie und Text / Biography and Text}
-% \input{TexPages_About}
-% \pagebreak
-\input{TexPages_Leben}
-% \pagebreak
-\input{TexPages_Text}
-\input{TexPages_Quellen}
-\vfill
-
-\mainmatter
-\cleardoublepage
-
-\includescore{}
-\cleardoublepage
-
-% \backmatter
-% \appendix
-% \cleardoublepage
-% \input{TexPages_KritBericht}
-% \cleardoublepage
-
-\makebackpage
-\end{document}
diff --git a/Tex_Vierne_MesseSolenelle_Ch.pdf b/Tex_Vierne_MesseSolenelle_Ch.pdf
deleted file mode 100644
index 9d7532109931a80d99fae0bfff699549580737ba..0000000000000000000000000000000000000000
Binary files a/Tex_Vierne_MesseSolenelle_Ch.pdf and /dev/null differ
diff --git a/Tex_Vierne_MesseSolenelle_Ch.tex b/Tex_Vierne_MesseSolenelle_Ch.tex
deleted file mode 100644
index ca89dc3771434331de9ade7ba5e86f7cd3c30c1b..0000000000000000000000000000000000000000
--- a/Tex_Vierne_MesseSolenelle_Ch.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-
-\hypersetup{
-    pdftitle={Louis Vierne: Messe Solennelle en ut\# mineur, Chorstimmen},
-}
-
-\include{TexPages_Settings}
-\scoretype{Chorstimmen / Choir voices}
-\scorenumber{\scoreNumber\ChoirScoreNumber}
-\setvocalscore
-
-\begin{document}
-\makefrontpage
-\frontmatter
-\maketitle
-
-\input{TexPages_ContentsMaterial.tex}
-
-\pagebreak
-
-% \chapter*{Zum Werk / About}
-\addcontentsline{toc}{section}{Biografie und Text / Biography and Text}
-% \input{TexPages_About}
-% \pagebreak
-\input{TexPages_Leben}
-% \pagebreak
-\input{TexPages_Text}
-\input{TexPages_Quellen}
-\vfill
-
-\mainmatter
-\cleardoublepage
-
-\includescore{Ch}
-
-\cleardoublepage
-\makebackpage
-\end{document}
diff --git a/Vierne_MesseSolennelle.ly b/Vierne_MesseSolennelle.ly
deleted file mode 100644
index 182987254ac3bcb2c68a9c8ec924f7d1c3791707..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle.ly
+++ /dev/null
@@ -1,39 +0,0 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_FullScore.ly"
-% \paper {
-%   #(define page-breaking ly:minimal-breaking)
-% }
-#(set-global-staff-size 14.3)
-\header { 
-  scoretype = "Partitur / Full Score"
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
-}
-\paper {
-  ragged-bottom = ##f
-  ragged-last-bottom = ##t
-}
-% \layout {
-%    \context { \Score
-% %     \override NonMusicalPaperColumn
-% %     #'line-break-system-details = #'((alignment-offsets . (0 10 24 34 44 54 64 74 84)))
-%      \override NonMusicalPaperColumn #'line-break-system-details = #'((alignment-offsets . (
-%               0  -6 ; S
-%             -10 -16 ; A
-% %             -20 -26 ; T
-%             -30 -36 ; B
-%             -42 -50 ; OI
-%             -59 -67 -75 ; OII
-%             )))
-%    }
-%    }
-%    \context { \Score
-%     \override NonMusicalPaperColumn
-%     #'line-break-system-details = #'((alignment-offsets . (0 -8 -16 -24 -34 -44 -54 -64 -74)))
-%    }
-% }
-
-\createScore #"IKyrie" #'("FullScore")
-\createScore #"IIGloria" #'("FullScore")
-\createScore #"IIISanctus" #'("FullScore")
-\createScore #"IVBenedictus" #'("FullScore")
-\createScore #"VAgnus" #'("FullScore")
diff --git a/Vierne_MesseSolennelle.pdf b/Vierne_MesseSolennelle.pdf
deleted file mode 100644
index 09523b0c77353f5f4d3557bdd5ce6610b3ac7bac..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_A.ly b/Vierne_MesseSolennelle_A.ly
deleted file mode 100644
index 445fb37c81135cf7438c51d4be7450851d8f5ca6..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_A.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_VocalVoice.ly"
-
-\header { instrument = "Alto" }
-
-\createScore #"IKyrie" #'("A")
-\createScore #"IIGloria" #'("A")
-\createScore #"IIISanctus" #'("A")
-\createScore #"IVBenedictus" #'("A")
-\createScore #"VAgnus" #'("A")
diff --git a/Vierne_MesseSolennelle_A.pdf b/Vierne_MesseSolennelle_A.pdf
deleted file mode 100644
index f8eace4b955c5a7fb4228d65ae9e37f39b9c55e9..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_A.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_B.ly b/Vierne_MesseSolennelle_B.ly
deleted file mode 100644
index 37a4fa2f3f840bbd600b6709ea8c80f89e2fbfd6..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_B.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_VocalVoice.ly"
-
-\header { instrument = "Basso" }
-
-\createScore #"IKyrie" #'("B")
-\createScore #"IIGloria" #'("B")
-\createScore #"IIISanctus" #'("B")
-\createScore #"IVBenedictus" #'("B")
-\createScore #"VAgnus" #'("B")
diff --git a/Vierne_MesseSolennelle_B.pdf b/Vierne_MesseSolennelle_B.pdf
deleted file mode 100644
index ce74de8d18e2ba41bd617023fa377f295fdb9a48..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_B.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_Ch.ly b/Vierne_MesseSolennelle_Ch.ly
deleted file mode 100644
index 44c3bc9b86f8a962e52cde8212775cfdd09b9e01..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_Ch.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_FullScore.ly"
-#(set-global-staff-size 15)
-
-\header { instrument = "Chorstimmen" }
-
-\paper {
-    bottom-margin = 1.1\cm
-}
-\layout {
-  \context { \Staff
-    \override VerticalAxisGroup #'remove-empty = ##f
-  }
-}
-% This breaks with "Nr.5", where we define the staff manually!
-% SShortInstrumentName = ""
-% AShortInstrumentName = ""
-
-\createScore #"IKyrie" #'("Ch")
-\createScore #"IIGloria" #'("Ch")
-\createScore #"IIISanctus" #'("Ch")
-\createScore #"IVBenedictus" #'("Ch")
-\createScore #"VAgnus" #'("Ch")
diff --git a/Vierne_MesseSolennelle_Ch.pdf b/Vierne_MesseSolennelle_Ch.pdf
deleted file mode 100644
index 48d06612371259ac57384d77236697a6c3d4f1f4..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_Ch.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_Instrument_A.ly b/Vierne_MesseSolennelle_Instrument_A.ly
new file mode 100644
index 0000000000000000000000000000000000000000..55b7fae892784065d14d7c401333d2a7564d16af
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_A.ly
@@ -0,0 +1,14 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalVoice.ily"
+
+\header {
+  instrument = \AInstrumentName
+  scorenumber = \markup{\scoreNumber \ANumber}
+}
+
+\createScore #"Kyrie" #'("A")
+\createScore #"Gloria" #'("A")
+\createScore #"Sanctus" #'("A")
+\createScore #"Benedictus" #'("A")
+\createScore #"Agnus" #'("A")
+
diff --git a/Vierne_MesseSolennelle_Instrument_B.ly b/Vierne_MesseSolennelle_Instrument_B.ly
new file mode 100644
index 0000000000000000000000000000000000000000..5f3721d47a3c2ad99dc947cf8a6f583fdb4bcca6
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_B.ly
@@ -0,0 +1,14 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalVoice.ily"
+
+\header {
+  instrument = \BInstrumentName
+  scorenumber = \markup{\scoreNumber \BNumber}
+}
+
+\createScore #"Kyrie" #'("B")
+\createScore #"Gloria" #'("B")
+\createScore #"Sanctus" #'("B")
+\createScore #"Benedictus" #'("B")
+\createScore #"Agnus" #'("B")
+
diff --git a/Vierne_MesseSolennelle_Instrument_OI.ly b/Vierne_MesseSolennelle_Instrument_OI.ly
new file mode 100644
index 0000000000000000000000000000000000000000..bddb7e3451fd69e6dd416ff4e22e4070486cf0de
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_OI.ly
@@ -0,0 +1,16 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_Instrument.ily"
+
+\header {
+  instrument = \OIInstrumentTitle
+  scorenumber = \markup{\scoreNumber \OINumber}
+}
+
+#(set-default-paper-size "a4" 'landscape)
+
+\createScore #"Kyrie" #'("OI")
+\createScore #"Gloria" #'("OI")
+\createScore #"Sanctus" #'("OI")
+\createScore #"Benedictus" #'("OI")
+\createScore #"Agnus" #'("OI")
+
diff --git a/Vierne_MesseSolennelle_Instrument_OII.ly b/Vierne_MesseSolennelle_Instrument_OII.ly
new file mode 100644
index 0000000000000000000000000000000000000000..c48cc20c23f16514959d6577fefe35cf8b2b6ecb
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_OII.ly
@@ -0,0 +1,16 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_Instrument.ily"
+
+\header {
+  instrument = \OIIInstrumentTitle
+  scorenumber = \markup{\scoreNumber \OIINumber}
+}
+
+#(set-default-paper-size "a4" 'landscape)
+
+\createScore #"Kyrie" #'("OII")
+\createScore #"Gloria" #'("OII")
+\createScore #"Sanctus" #'("OII")
+\createScore #"Benedictus" #'("OII")
+\createScore #"Agnus" #'("OII")
+
diff --git a/Vierne_MesseSolennelle_Instrument_S.ly b/Vierne_MesseSolennelle_Instrument_S.ly
new file mode 100644
index 0000000000000000000000000000000000000000..d69f45e766909e552c188a14f91f63a4fc4919ac
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_S.ly
@@ -0,0 +1,14 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalVoice.ily"
+
+\header {
+  instrument = \SInstrumentName
+  scorenumber = \markup{\scoreNumber \SNumber}
+}
+
+\createScore #"Kyrie" #'("S")
+\createScore #"Gloria" #'("S")
+\createScore #"Sanctus" #'("S")
+\createScore #"Benedictus" #'("S")
+\createScore #"Agnus" #'("S")
+
diff --git a/Vierne_MesseSolennelle_Instrument_T.ly b/Vierne_MesseSolennelle_Instrument_T.ly
new file mode 100644
index 0000000000000000000000000000000000000000..9864017f883d4d5ba2efd58781b685e93d783a47
--- /dev/null
+++ b/Vierne_MesseSolennelle_Instrument_T.ly
@@ -0,0 +1,14 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalVoice.ily"
+
+\header {
+  instrument = \TInstrumentName
+  scorenumber = \markup{\scoreNumber \TNumber}
+}
+
+\createScore #"Kyrie" #'("T")
+\createScore #"Gloria" #'("T")
+\createScore #"Sanctus" #'("T")
+\createScore #"Benedictus" #'("T")
+\createScore #"Agnus" #'("T")
+
diff --git a/Vierne_MesseSolennelle_01_Kyrie.ly b/Vierne_MesseSolennelle_Music_01_Kyrie.ily
similarity index 77%
rename from Vierne_MesseSolennelle_01_Kyrie.ly
rename to Vierne_MesseSolennelle_Music_01_Kyrie.ily
index e617fdd447284e34e5eb9c61f658426c44d52c8d..56fbf5a48e38cc073b3d4509a4a2e2a7b88e13b9 100644
--- a/Vierne_MesseSolennelle_01_Kyrie.ly
+++ b/Vierne_MesseSolennelle_Music_01_Kyrie.ily
@@ -1,18 +1,16 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
+\version "2.13.1"
 
-IKyriePieceName = "Kyrie Eleison"
-IKyrieTempo = "Maestoso ma no troppo lento."
+KyriePieceName = "Kyrie Eleison"
+KyrieTempo = "Maestoso ma no troppo lento."
 
-IKyrieKey = \notemode {
-  \key cis \minor
-}
-IKyrieSettings = \notemode {	
-  \tempo \IKyrieTempo 
-  \time 4/4
+KyrieKey = \key cis \minor
+KyrieTimeSignature = \time 4/4
+
+KyrieSettings = \notemode {
+  \tempo \KyrieTempo
 }
 
-IKyrieSMusic = \relative c'' {
+KyrieSMusic = \relative c'' {
   R1*8 | %9
   R1^\fermataMarkup | \barNumberCheck #10
   R1*12 | % 22
@@ -30,35 +28,35 @@ IKyrieSMusic = \relative c'' {
   R1 | % 35
   cis4.\p h8 h4 h | % 36
   e4. h8 h4( his) | % 37
-  \setCrescMolto cis4. \crescMolto cis8 cis4 dis | % 38
+  cis4. \crescMolto cis8 cis4 dis | % 38
   fis4. e8 dis4( cis) | % 39
-  cis4.\endCrescMolto\ff cis8 cis2~ | \barNumberCheck #40
+  cis4.\!\ff cis8 cis2~ | \barNumberCheck #40
   cis4 ais4 his4. his8 | % 41
   cis4 r r2 | % 42
   R1*11 | % 53
-  \setCrescPoco h2\p\crescPoco h4 h | % 54
+  h2\p\crescPoco h4 h | % 54
   cis4. h8 h2 | % 55
   h2 h4 his | % 56
   cis4. a8 fis4. r8 | % 57
-  h4(\endCrescPoco\f e) dis cis | % 58
+  h4(\!\f e) dis cis | % 58
   h( e dis8) dis cis4 | % 59
   h4( his) cis e | \barNumberCheck #60
-  \setDim e4.\dim dis8 dis4 r | % 61
+  e4.\dim dis8 dis4 r | % 61
   R1*2 | % 63
-  h2\enddim\p c4 e | % 64
+  h2\!\p c4 e | % 64
   e4. dis8 dis2 | % 65
   R1*2 | % 67
   a2\pp h4 d | % 68
   dis4. cis8 cis2 | % 69
-  \setCrescPoco gis4.\crescPoco gis8 a!4 a | \barNumberCheck #70
+  gis4.\crescPoco gis8 a!4 a | \barNumberCheck #70
   ais4. ais8 h2 | % 71
   his4. his8 cis4 cis | % 72
-  cisis4. cisis8 dis2\endCrescPoco | % 73
-  \setCrescMolto fis4.\crescMolto fis8 fis4 eis4 | % 74
+  cisis4. cisis8 dis2\! | % 73
+  fis4.\crescMolto fis8 fis4 eis4 | % 74
   e4. e8 dis2 | % 75
   d4. d8 d4 cis | % 76
   cis4. cis8 his2 | % 77
-  cis4.\endCrescMolto\ff cis8 e4 e | % 78
+  cis4.\!\ff cis8 e4 e | % 78
   a4. a8 gis2 | % 79
   e4. e8 cis4 cis | \barNumberCheck #80
   e4. e8 dis2 | % 81
@@ -77,14 +75,46 @@ IKyrieSMusic = \relative c'' {
   eis1~ | % 94
   eis4 r r2 \bar"|."
 }
+\addQuote "KyrieSMusic" { \KyrieSMusic }
 
-IKyrieAMusic = \relative c' {
+KyrieSLyrics = \lyricmode {
+  % 20
+  Ky -- ri -- e e -- le -- i -- son __ Ky -- ri -- e e --
+  % 25
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 30
+  Ky -- ri -- e e -- le -- i -- son
+  % 35
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
+  % 40
+  e -- le -- i -- son
+  % 50
+  Chris -- te e -- le -- i -- son
+  % 55
+  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
+  % 60
+  le -- i -- son Chris -- te e -- le -- i -- son
+  % 65
+  Chris -- te  e -- le -- i -- son Ky -- ri -- e e --
+  % 70
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 75
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
+  % 80
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
+  % 85
+  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
+  % 90
+  e e -- le -- i -- son.
+}
+
+KyrieAMusic = \relative c' {
   R1*8 | % 9
   R1-\fermataMarkup | \barNumberCheck #10
-  R1*10 | \barNumberCheck #20 
-  \setCresc cis4.\p\cresc cis8 e4 e | % 21
+  R1*10 | \barNumberCheck #20
+  cis4.\p\cresc cis8 e4 e | % 21
   a4. a8 gis4( fis) | % 22
-  fis4(\endcresc\f e8) e dis4 gis8[( fis]) | % 23
+  fis4(\!\f e8) e dis4 gis8[( fis]) | % 23
   gis8[( h ais gis] fisis) gis ais4 | % 24
   ais4( gis8) fis e4 e8[( dis]) | % 25
   cis4( dis8[ e] dis4) cis4 | % 26
@@ -98,35 +128,35 @@ IKyrieAMusic = \relative c' {
   R1 | % 35
   e4.\p d8 d4 d | % 36
   a'4. a8 a2 | % 37
-  \setCrescMolto ais4.\crescMolto ais8 ais4 ais | % 38
+  ais4.\crescMolto ais8 ais4 ais | % 38
   ais4. ais8 ais2 | % 39
-  gis4.\endCrescMolto\ff gis8 gis2~ | \barNumberCheck #40
+  gis4.\!\ff gis8 gis2~ | \barNumberCheck #40
   gis4 gis4 gis4. fis8 |  % 41
   e4 r4 r2 | % 42
   R1*11 | % 53
-  \setCrescPoco dis4(\p\crescPoco e) eis fis | % 54
+  dis4(\p\crescPoco e) eis fis | % 54
   gis( e dis8) dis cis4 | % 55
   h4( cis8[ dis]) e4 e | % 56
   e4. dis8 cis4( h8) r | % 57
-  fis'4(\endCrescPoco\f e) a gis | % 58
+  fis'4(\!\f e) a gis | % 58
   fis4( e a8) a gis4 | % 59
   fis2 fis4 fis | \barNumberCheck #60
-  \setDim fis4.\dim fis8 fis4 r\enddim | % 61
+  fis4.\dim fis8 fis4 r\! | % 61
   R1*2 | % 63
-  a2\p a4 a | % 64 
+  a2\p a4 a | % 64
   a4. a8 a2 | % 65
   R1*2 | % 67
   g2\pp g4 g | % 68
   g4. g8 g2 | % 69
-  \setCrescPoco  gis4.\crescPoco gis8 gis4 gis | \barNumberCheck #70
+   gis4.\crescPoco gis8 gis4 gis | \barNumberCheck #70
   gis4. gis8 gis2 | % 71
   gis4. gis8 a!4 a | % 72
   ais4. ais8 h2 | % 73
-  \setCrescMolto d4.\endCrescPoco\crescMolto d8 d4 cis!4 | % 74
+  d4.\!\crescMolto d8 d4 cis!4 | % 74
   c4. c8 h2 | % 75
   b4. b8 b4 a | % 76
   a4. a8 gis2 | % 77
-  cis,4.\endCrescMolto\ff cis8 e4 e |  % 78
+  cis,4.\!\ff cis8 e4 e |  % 78
   a4. a8 gis2 | % 79
   e4. e8 cis4 cis | \barNumberCheck #80
   e4. e8 dis2 | % 81
@@ -145,8 +175,40 @@ IKyrieAMusic = \relative c' {
   gis1~ | % 94
   gis4 r r2 \bar"|."
 }
+\addQuote "KyrieAMusic" { \KyrieAMusic }
+
+KyrieALyrics = \lyricmode {
+  % 20
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
+  % 25
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 30
+  Ky -- ri -- e e -- le -- i -- son
+  % 35
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
+  % 40
+  e -- le -- i -- son
+  % 50
+  Chris -- te e -- le -- i -- son
+  % 55
+  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
+  % 60
+  le -- i -- son Chris -- te e -- le -- i -- son
+  % 65
+  Chris -- te  e -- le -- i -- son Ky -- ri -- e e --
+  % 70
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 75
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
+  % 80
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
+  % 85
+  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
+  % 90
+  e e -- le -- i -- son.
+}
 
-IKyrieTMusic = \relative c' {
+KyrieTMusic = \relative c' {
   R1*8 | %9
   R1^\fermataMarkup | \barNumberCheck #10
   R1*6 | % 16
@@ -154,7 +216,7 @@ IKyrieTMusic = \relative c' {
   e4. e8 dis2 | % 18
   e4. dis8 cis4 dis8[( e]) | % 19
   a,4( cis4.) cis8 his4 | \barNumberCheck #20
-  \setCresc h4(\cresc a8) a gis4 cis | % 21
+  h4(\cresc a8) a gis4 cis | % 21
   cis8[( e dis cis~]) cis his cis8[( dis]) | % 22
   gis,4(\f cis8) cis h4 gis | % 23
   h8[( dis] cis) h ais4( dis) | % 24
@@ -170,9 +232,9 @@ IKyrieTMusic = \relative c' {
   R1 | % 35
   a4.\p a8 a4 a | % 36
   cis4. d8 d4( dis) | % 37
-  \setCrescMolto e4.\crescMolto e8 e4 dis | % 38
+  e4.\crescMolto e8 e4 dis | % 38
   his4. cis8 dis4( e) | % 39
-  dis4.\endCrescMolto\ff dis8 dis2~ | \barNumberCheck #40
+  dis4.\!\ff dis8 dis2~ | \barNumberCheck #40
   dis4 dis dis4. dis8 | % 41
   cis4 r r2 | % 42
   R1*3 | % 45
@@ -180,33 +242,33 @@ IKyrieTMusic = \relative c' {
   cis4. h8 h2 | % 47
   h2 h4 his | % 48
   cis4. a8 fis4. r8 | % 49
-  \setCresc h4(\cresc e dis) cis | \barNumberCheck #50
+  h4(\cresc e dis) cis | \barNumberCheck #50
   h4 e\accent( dis8) dis cis4 | % 51
   ais2( dis4) gis, | % 52
-  \setDim e'8([\endcresc\dim dis]) cis2~ cis8. h16 | % 53
-  h4\enddim\breathe \setCrescPoco a2\p\crescPoco a8 a8 | % 54
+  e'8([\!\dim dis]) cis2~ cis8. h16 | % 53
+  h4\!\breathe a2\p\crescPoco a8 a8 | % 54
   a4. a8 a2 | % 55
   a2 gis4 g | % 56
   fis8[( gis] a4.) a8 a r | % 57
-  h2\endCrescPoco\f h4 cis8[( e]) | % 58
+  h2\!\f h4 cis8[( e]) | % 58
   dis8[( cis] h4.) h8 cis[( e]) | % 59
   dis4( d) cis  c | \barNumberCheck #60
-  \setDim h4.\dim h8 h4 r\enddim | % 61
+  h4.\dim h8 h4 r\! | % 61
   R1*2 | % 63
   dis2\p e4 g | % 64
   g4. fis8 fis2 | % 65
   R1*2 | % 67
   cis2\pp d4 fis | % 68
   fis4. e8 e2 | % 69
-  \setCrescPoco gis,4.\crescPoco  gis8 a!4 a | \barNumberCheck #70
+  gis,4.\crescPoco  gis8 a!4 a | \barNumberCheck #70
   ais4. ais8 h2 | % 71
   his4. his8 cis4 cis |  % 72
-  cisis4. cisis8 dis2\endCrescPoco | % 73
-  \setCrescMolto fis4.\crescMolto fis8 fis4 eis | % 74
+  cisis4. cisis8 dis2\! | % 73
+  fis4.\crescMolto fis8 fis4 eis | % 74
   e4. e8 dis2 | % 75
   d4. d8 d4 cis | % 76
   cis4. cis8 his2 | % 77
-  cis4.\endCrescMolto\ff cis8 e4 e | % 78
+  cis4.\!\ff cis8 e4 e | % 78
   a4. a8 gis2 | % 79
   e4. e8 cis4 cis | \barNumberCheck #80
   e4. e8 dis2 | % 81
@@ -225,8 +287,44 @@ IKyrieTMusic = \relative c' {
   eis1~ | % 94
   eis4 r4 r2 \bar"|."
 }
+\addQuote "KyrieTMusic" { \KyrieTMusic }
 
-IKyrieBMusic = \relative c {
+KyrieTLyrics = \lyricmode {
+  % 15
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 20
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son __ Ky -- ri -- e e --
+  % 25
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 30
+  Ky -- ri -- e e -- le -- i -- son
+  % 35
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
+  % 40
+  e -- le -- i -- son
+  % 45
+  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te
+  % 50
+  e -- le -- i -- son Chris -- te e -- le -- i -- son, Chris -- te e -- le -- i -- son
+  % 55
+  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
+  % 60
+  le -- i -- son Chris -- te e -- le -- i -- son
+  % 65
+  Chris -- te  e -- le -- i -- son Ky -- ri -- e e --
+  % 70
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
+  % 75
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
+  % 80
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
+  % 85
+  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
+  % 90
+  e e -- le -- i -- son.
+}
+
+KyrieBMusic = \relative c {
   R1*8 | %9
   R1^\fermataMarkup | \barNumberCheck #10
   R1*4 | % 14
@@ -236,7 +334,7 @@ IKyrieBMusic = \relative c {
   cis, cis' cis( h8[ ais]) | % 18
   gis8[(fis gis]) h a4 gis | % 19
   gis4( fis8[ e] dis) dis gis[( fis]) | \barNumberCheck #20
-  \setCresc eis4(\cresc fis8) fis cis4 a'8[( gis]) | % 21
+  eis4(\cresc fis8) fis cis4 a'8[( gis]) | % 21
   fis2~ fis8 fis e[( dis]) | % 22
   cis8[(\f dis] e) fis gis[( fis]) e[( dis]) | % 23
   cis2( dis8) eis fisis[( dis]) | % 24
@@ -252,35 +350,35 @@ IKyrieBMusic = \relative c {
   R1 | % 35
   e4.\p fis8 fis4 fis | % 36
   e4. f8 f4( fis) | % 37
-  \setCrescMolto fisis4.\crescMolto fisis8 fisis4 fisis | % 38
+  fisis4.\crescMolto fisis8 fisis4 fisis | % 38
   fisis4. fisis8 fisis2 | % 39
-  gis4.\endCrescMolto\ff gis8 gis2~ | \barNumberCheck #40
+  gis4.\!\ff gis8 gis2~ | \barNumberCheck #40
   gis4 gis4 gis4. gis8 | % 41
   cis,4 r4 r2 | % 42
   R1*11 | % 53
-  \setCrescPoco h4(\p\crescPoco cis) cisis dis | % 54
+  h4(\p\crescPoco cis) cisis dis | % 54
   e( gis fis8) fis e4 | % 55
   dis4( cis) h ais | % 56
   a( cis e8) e dis r | % 57
-  a'4(\endCrescPoco\f gis) fis e | % 58
+  a'4(\!\f gis) fis e | % 58
   a4( gis fis8) fis e4 | % 59
   a2 a4 a | \barNumberCheck #60
-  \setDim a4.\dim a8 a4 r\enddim | % 61
+  a4.\dim a8 a4 r\! | % 61
   R1*2 | % 63
   h2\p h4 h | % 64
   h4. h8 h2 | % 65
   R1*2 | % 67
   a2\pp a4 a4 | % 68
   a4. a8 a2 | % 69
-  \setCrescPoco gis4.\crescPoco gis8 gis4 gis | \barNumberCheck #70
+  gis4.\crescPoco gis8 gis4 gis | \barNumberCheck #70
   gis4. gis8 gis2 | % 71
   gis4. gis8 a!4 a | % 72
   ais4. ais8 h2 | % 73
-  \setCrescMolto d4.\endCrescPoco\crescMolto d8 d4 cis4 | % 74
+  d4.\!\crescMolto d8 d4 cis4 | % 74
   c4. c8 h2 | % 75
   b4. b8 b4 a4 | % 76
   a4. a8 gis2 | % 77
-  cis,4.\endCrescMolto\ff cis8 e4 e | % 78
+  cis,4.\!\ff cis8 e4 e | % 78
   a4. a8 gis2 | % 79
   e4. e8 cis4 cis | \barNumberCheck #80
   e4. e8 dis2 | % 81
@@ -299,112 +397,16 @@ IKyrieBMusic = \relative c {
   <cis cis,>1~ |
   <cis cis,>4 r r2 \bar"|."
 }
+\addQuote "KyrieBMusic" { \KyrieBMusic }
 
-IKyrieSLyrics = \lyricmode {
-  % 20
-  Ky -- ri -- e e -- le -- i -- son __ Ky -- ri -- e e -- 
-  % 25
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son 
-  % 30
-  Ky -- ri -- e e -- le -- i -- son
-  % 35
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
-  % 40
-  e -- le -- i -- son
-  % 50
-  Chris -- te e -- le -- i -- son
-  % 55
-  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
-  % 60
-  le -- i -- son Chris -- te e -- le -- i -- son
-  % 65
-  Chris -- te  e -- le -- i -- son Ky -- ri -- e e -- 
-  % 70
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
-  % 75
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
-  % 80
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
-  % 85
-  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
-  % 90
-  e e -- le -- i -- son.
-}
-
-IKyrieALyrics = \lyricmode {
-  % 20
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- 
-  % 25
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son 
-  % 30
-  Ky -- ri -- e e -- le -- i -- son
-  % 35
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
-  % 40
-  e -- le -- i -- son
-  % 50
-  Chris -- te e -- le -- i -- son
-  % 55
-  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
-  % 60
-  le -- i -- son Chris -- te e -- le -- i -- son
-  % 65
-  Chris -- te  e -- le -- i -- son Ky -- ri -- e e -- 
-  % 70
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
-  % 75
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
-  % 80
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
-  % 85
-  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
-  % 90
-  e e -- le -- i -- son.
-}
-
-IKyrieTLyrics = \lyricmode {
-  % 15
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
-  % 20
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son __ Ky -- ri -- e e -- 
-  % 25
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son 
-  % 30
-  Ky -- ri -- e e -- le -- i -- son
-  % 35
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e __
-  % 40
-  e -- le -- i -- son
-  % 45
-  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te
-  % 50
-  e -- le -- i -- son Chris -- te e -- le -- i -- son, Chris -- te e -- le -- i -- son
-  % 55
-  Chris -- te e -- le -- i -- son Chris -- te e -- le -- i -- son Chris -- te e --
-  % 60
-  le -- i -- son Chris -- te e -- le -- i -- son
-  % 65
-  Chris -- te  e -- le -- i -- son Ky -- ri -- e e -- 
-  % 70
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
-  % 75
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
-  % 80
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i --
-  % 85
-  son Ky -- ri -- e e -- le -- i -- son Ky -- ri --
-  % 90
-  e e -- le -- i -- son.
-}
-
-IKyrieBLyrics = \lyricmode {
-  Ky -- ri -- e e -- 
+KyrieBLyrics = \lyricmode {
+  Ky -- ri -- e e --
   % 15
   le -- i -- son Ky -- ri -- e e -- le -- i -- son __ Ky -- ri -- e e -- le -- i -- son
   % 20
-  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- 
+  Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e --
   % 25
-  le -- i -- son Ky -- ri -- e e -- le -- i -- son 
+  le -- i -- son Ky -- ri -- e e -- le -- i -- son
   % 30
   Ky -- ri -- e e -- le -- i -- son
   % 35
@@ -418,7 +420,7 @@ IKyrieBLyrics = \lyricmode {
   % 60
   le -- i -- son Chris -- te e -- le -- i -- son
   % 65
-  Chris -- te  e -- le -- i -- son Ky -- ri -- e e -- 
+  Chris -- te  e -- le -- i -- son Ky -- ri -- e e --
   % 70
   le -- i -- son Ky -- ri -- e e -- le -- i -- son Ky -- ri -- e e -- le -- i -- son
   % 75
@@ -431,51 +433,51 @@ IKyrieBLyrics = \lyricmode {
   e e -- le -- i -- son.
 }
 
-IKyrieOIdynamicsMusic = { 
+KyrieOIdynamicsMusic = {
   s1*9 | \barNumberCheck #10
   s4\f s4 s2 | % 11
   s1 | % 12
-  s4 \setDim s4\dim s2 | % 13
+  s4 s4\dim s2 | % 13
   s1 | % 14
-  s4\enddim\p s4 s2 | % 15
+  s4\!\p s4 s2 | % 15
   s1*5 | \barNumberCheck #20
-  \setCresc s4\cresc s4 s2 | % 21
+  s4\cresc s4 s2 | % 21
   s1 | % 22
-  s4\endcresc\f s4 s2 | % 23
+  s4\!\f s4 s2 | % 23
   s1*5 | % 28
   s4\ff s4 s2 | % 29
   s1*6 | % 35
   s4\p s s2 | % 36
   s1 | % 37
-  \setCrescMolto s4\crescMolto s4 s2 | % 38
+  s4\crescMolto s4 s2 | % 38
   s1 | % 39
-  s1\endCrescMolto\ff | \barNumberCheck #40
+  s1\!\ff | \barNumberCheck #40
   s1*3 | % 43
-  s2 \setDimMolto s4\dimMolto s | % 44
+  s2 s4\dimMolto s | % 44
   s1 | % 45
-  s4\endDimMolto\p s4 s2 | % 46
+  s4\!\p s4 s2 | % 46
   s1*3 | % 49
-  \setCresc s4\cresc s s2 | \barNumberCheck #50
+  s4\cresc s s2 | \barNumberCheck #50
   s1*2 | % 52
-  \setDim s4\endcresc\dim s s2 | % 53
-  \setCrescPoco s4\enddim\p\crescPoco s s2 | % 54
+  s4\!\dim s s2 | % 53
+  s4\!\p\crescPoco s s2 | % 54
   s1*3 | % 57
-  s4\endCrescPoco\f s s2 | % 58
+  s4\!\f s s2 | % 58
   s1*2 | \barNumberCheck #60
-  \setDim s4\dim s s s\enddim | % 61
+  s4\dim s s s\! | % 61
   s1*8 | % 69
-  \setCrescPoco s1\p\crescPoco | \barNumberCheck #70
+  s1\p\crescPoco | \barNumberCheck #70
   s1*3 | % 73
-  \setCrescMolto s1\endCrescPoco\crescMolto | % 74
+  s1\!\crescMolto | % 74
   s1*3 | % 77
-  s1\endCrescMolto\ff | % 78
+  s1\!\ff | % 78
   s1*11 | % 89
   s2 s2\ff | \barNumberCheck #90
   s1*2 | % 92
   s1-\pocoAllarg | % 93
   s1*2
 }
-IKyrieOIpedalMusic = { 
+KyrieOIpedalMusic = {
   s1*27 | % 28
   s1_\OrganPed | % 29
   s1*6 | % 35
@@ -489,14 +491,14 @@ IKyrieOIpedalMusic = {
   s2 s2_\OrganPed | \barNumberCheck #90
   s1*5 |
 }
-IKyrieOIrIMusic = \relative c' {
+KyrieOIrIMusic = \relative c' {
   \oneV
   R1*8 | % 9
-  R1-\fermataMarkup | \barNumberCheck #10 
+  R1-\fermataMarkup | \barNumberCheck #10
   <his dis gis>2 <cis fis a> | % 11
   <e gis h> <cis fis a> | % 12
   <his dis gis> <cis fis ais> | % 13
-  \vOne << \context Voice ="IKyrieOIrIIIVoice" { \vThree h'2 his } {gis1~} >> | % 14
+  \vOne << \context Voice ="KyrieOIrIIIVoice" { \vThree h'2 his } {gis1~} >> | % 14
   \oneV
   <e gis cis>4 r r2 | % 15
   R1*5 | \barNumberCheck #20
@@ -570,8 +572,8 @@ IKyrieOIrIMusic = \relative c' {
   <eis gis eis'>1~ |
   <eis gis eis'>4 r4 r2 \bar"|."
 }
-IKyrieOIrIIMusic = \relative c' {
-  s1*9 | \barNumberCheck #10 
+KyrieOIrIIMusic = \relative c' {
+  s1*9 | \barNumberCheck #10
   s1*3 | % 13
   \vTwo
   e2 dis8[ e] fis4 | % 14
@@ -631,9 +633,9 @@ IKyrieOIrIIMusic = \relative c' {
   e4 r4 r2 |
   s1*9
 }
-IKyrieOIlIMusic = \relative c' {
+KyrieOIlIMusic = \relative c' {
   R1*8 | % 9
-  R1-\fermataMarkup | \barNumberCheck #10 
+  R1-\fermataMarkup | \barNumberCheck #10
   s1*6 | % 16
   gis4. gis8 h4 h | % 17
   e4. e8 dis2 | % 18
@@ -703,14 +705,14 @@ IKyrieOIlIMusic = \relative c' {
   r2 <cis~ e~> | \barNumberCheck #90
   <cis e>1 | % 91
   \tieDown
-  <cis~ e>1 | %92 
-  cis2 \tieUp his | %93 
+  <cis~ e>1 | %92
+  cis2 \tieUp his | %93
   <cis cis,>1~ | %94
   <cis cis,>4 r r2 \bar"|."
 }
-IKyrieOIlIIMusic = \relative c {
+KyrieOIlIIMusic = \relative c {
   s1*8 | % 9
-  s1 | \barNumberCheck #10 
+  s1 | \barNumberCheck #10
   gis4 gis' fis8[ e] dis4 | % 11
   gis, gis' fis8[ e] dis4 | % 12
   gis, gis' fis8[ e] dis4 | % 13
@@ -789,7 +791,7 @@ IKyrieOIlIIMusic = \relative c {
   cis4 r r2 \bar"|."
 }
 
-IKyrieOIImanuals = {
+KyrieOIImanuals = {
   s1_\markup{G.P.R. Fonds et Anches \concat{\number 16-\number 8-\number 4 } PED. Fonds et Anches \concat{\number 32 -\number 16 -\number 8 -\number 4 . } } | % 2
   s1*31 | % 33
   s2 s4 s8 s8_\OrganR | % 34
@@ -801,20 +803,20 @@ IKyrieOIImanuals = {
   s8_\OrganGPR s8 s4 s2 | % 72
   s1*23 |
 }
-IKyrieOIIdynamicsMusic = { s1\ff | % 2
+KyrieOIIdynamicsMusic = { s1\ff | % 2
   s1*24 | % 26
   s1\ff | % 27
   s1*7 | % 34
   s2\mf s2 | % "R. mf" % 35
   s1*4 | % 39
-  s2 s4\ff s4 | \barNumberCheck #40 % "G.P.R. ff" 
+  s2 s4\ff s4 | \barNumberCheck #40 % "G.P.R. ff"
   s1*21 |
   s2\p s2 | % "R.(on top) p"
   s1*7 |
   % TODO
-  
+
 }
-IKyrieOIIrIMusic = \relative c'' {
+KyrieOIIrIMusic = \relative c'' {
   cis2  dis | % 2
   e <dis fis> | % 3
   <e gis> dis | % 4
@@ -845,10 +847,10 @@ IKyrieOIIrIMusic = \relative c'' {
   e <dis fis> | % 43
   <e gis>4 r r2 | % 44
   R1*17 | % 61
-  << \context Voice = "IKyrieOIIrIIIVoice" { \vThree \tieDown h2 cis | dis cis } { a1~ | a1~ } >> | % 63
+  << \context Voice = "KyrieOIIrIIIVoice" { \vThree \tieDown h2 cis | dis cis } { a1~ | a1~ } >> | % 63
   <a h>4 r r2 | % 64
   R1 | % 65
-  << \context Voice = "IKyrieOIIrIIIVoice" {\vThree \tieDown a2 h | cis h} {g1~ | g1~ }>> | % 67
+  << \context Voice = "KyrieOIIrIIIVoice" {\vThree \tieDown a2 h | cis h} {g1~ | g1~ }>> | % 67
   <g a>4 r r2 | % 68
   \oneV
   R1*3 | % 71
@@ -878,7 +880,7 @@ IKyrieOIIrIMusic = \relative c'' {
   <cis eis gis cis>1~ | % 94
   <cis eis gis cis>4 r4 r2 \bar"|."
 }
-IKyrieOIIrIIMusic = \relative c'' {
+KyrieOIIrIIMusic = \relative c'' {
   cis1~ | cis~ | cis~ | cis~ | cis~ | cis | % 7
   <a d> | % 8
   <fis a> | % 9
@@ -911,7 +913,7 @@ IKyrieOIIrIIMusic = \relative c'' {
   cis2 r2 | \barNumberCheck #90
   s1*5
 }
-IKyrieOIIlIMusic = \relative c' {
+KyrieOIIlIMusic = \relative c' {
   \vOne
   cis2 dis | % 2
   e <dis fis> | % 3
@@ -935,7 +937,7 @@ IKyrieOIIlIMusic = \relative c' {
   \clef "treble"
   <e' a~>2 <fis a> | % 35
   R1*4 | % 39
-  \clef "bass" 
+  \clef "bass"
   r2 <gis, cis dis>4 r | \barNumberCheck #40
   <gis cis dis>4 r <fis gis his dis> r | % 41
   <cis~ cis'~>1 | % 42
@@ -966,7 +968,7 @@ IKyrieOIIlIMusic = \relative c' {
   r <h e g> r <h d fis> | % 82
   r <a d fis>\staccato <a d fis>\staccato <a d fis>\staccato | % 82
   r <gis cis dis>\staccato r <fis his dis>\staccato | % 85
-  \clef "treble" 
+  \clef "treble"
   \vOne
   cis'2 dis | % 86
   e <dis fis> | % 87
@@ -979,11 +981,11 @@ IKyrieOIIlIMusic = \relative c' {
   <gis cis eis gis>1~ | % 94
   <gis cis eis gis>4 r4 r2 \bar "|."
 }
-IKyrieOIIlIIMusic = \relative c' {
+KyrieOIIlIIMusic = \relative c' {
   \vTwo
   cis1~ | cis~ | cis~ | cis~ | cis~ | cis | % 7
   <a d> | % 8
-  \clef "bass" 
+  \clef "bass"
   <fis a> | % 9
   <dis gis> | \barNumberCheck #10
   R1*16 | % 26
@@ -1003,13 +1005,13 @@ IKyrieOIIlIIMusic = \relative c' {
   s1*5
 }
 
-IKyrieOIIbassManuals = {
+KyrieOIIbassManuals = {
   s1_\OrganPedGPR | % 2
   s1*67 | % 69
   s1^\OrganPR | \barNumberCheck #70
   s1*25 |
 }
-IKyrieOIIbassMusic = \relative c, { 
+KyrieOIIbassMusic = \relative c, {
   cis4 cis'4 a8[ gis] fis4 | % 2
   gis4 e dis8[ e] fis4 | % 3
   cis4 cis'4 a8[ gis] fis4 | % 4
@@ -1062,35 +1064,35 @@ IKyrieOIIbassMusic = \relative c, {
   <cis cis'>4 r r2 \bar"|."
 }
 
-IKyrieOIIlClef = \clef "treble"
+KyrieOIIlClef = \clef "treble"
 
-IKyrieOIrStaff = \context Staff = "IKyrieOIrSt" <<
-  \context Voice= "IKyrieOIrIVoice" << \vOne\IKyrieSettings \IKyrieKey \OIrClef \IKyrieOIrIMusic >>
-  \context Voice= "IKyrieOIrIIVoice" << \vTwo\IKyrieSettings \IKyrieKey \OIrClef \IKyrieOIrIIMusic >>
+KyrieOIrStaff = \context Staff = "KyrieOIrSt" <<
+  \context Voice= "KyrieOIrIVoice" << \vOne\KyrieSettings \KyrieKey \OIrClef \KyrieOIrIMusic >>
+  \context Voice= "KyrieOIrIIVoice" << \vTwo\KyrieSettings \KyrieKey \OIrClef \KyrieOIrIIMusic >>
 >>
-IKyrieOIlStaff = \context Staff = "IKyrieOIlSt" <<
-  \context Voice= "IKyrieOIlIVoice" { \vOne\IKyrieSettings \IKyrieKey \OIlClef \IKyrieOIlIMusic }
-%   \context Dynamics 
-  \context Voice= "IKyrieOIlIIVoice" { \vTwo\IKyrieSettings \IKyrieKey \OIlClef \IKyrieOIlIIMusic }
+KyrieOIlStaff = \context Staff = "KyrieOIlSt" <<
+  \context Voice= "KyrieOIlIVoice" { \vOne\KyrieSettings \KyrieKey \OIlClef \KyrieOIlIMusic }
+%   \context Dynamics
+  \context Voice= "KyrieOIlIIVoice" { \vTwo\KyrieSettings \KyrieKey \OIlClef \KyrieOIlIIMusic }
 >>
-IKyrieOIStaff = \context PianoStaff = "IKyrieOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
-  \IKyrieOIrStaff
-%   \new Dynamics = "IKyrieOIdynamicsSt" \IKyrieOIdynamicsMusic
-  \IKyrieOIlStaff
-%   \new Dynamics = "IKyrieOIpedalSt" \IKyrieOIpedalMusic
+KyrieOIStaff = \context PianoStaff = "KyrieOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
+  \KyrieOIrStaff
+%   \new Dynamics = "KyrieOIdynamicsSt" \KyrieOIdynamicsMusic
+  \KyrieOIlStaff
+%   \new Dynamics = "KyrieOIpedalSt" \KyrieOIpedalMusic
 >>
 
-IKyrieOIIrStaff = \context Staff = "IKyrieOIIrSt" <<
-  \context Voice= "IKyrieOIIrIVoice" << \vOne\IKyrieSettings \IKyrieKey \OIIrClef \IKyrieOIIrIMusic >>
-  \context Voice= "IKyrieOIIrIIVoice" << \vTwo\IKyrieSettings \IKyrieKey \OIIrClef \IKyrieOIIrIIMusic >>
+KyrieOIIrStaff = \context Staff = "KyrieOIIrSt" <<
+  \context Voice= "KyrieOIIrIVoice" << \vOne\KyrieSettings \KyrieKey \OIIrClef \KyrieOIIrIMusic >>
+  \context Voice= "KyrieOIIrIIVoice" << \vTwo\KyrieSettings \KyrieKey \OIIrClef \KyrieOIIrIIMusic >>
 >>
-IKyrieOIIlStaff = \context Staff = "IKyrieOIIlSt" <<
-  \context Voice= "IKyrieOIIlIVoice" { \vOne\IKyrieSettings \IKyrieKey \IKyrieOIIlClef \IKyrieOIIlIMusic }
-  \context Voice= "IKyrieOIIlIIVoice" { \vTwo\IKyrieSettings \IKyrieKey \IKyrieOIIlClef \IKyrieOIIlIIMusic }
+KyrieOIIlStaff = \context Staff = "KyrieOIIlSt" <<
+  \context Voice= "KyrieOIIlIVoice" { \vOne\KyrieSettings \KyrieKey \KyrieOIIlClef \KyrieOIIlIMusic }
+  \context Voice= "KyrieOIIlIIVoice" { \vTwo\KyrieSettings \KyrieKey \KyrieOIIlClef \KyrieOIIlIIMusic }
 >>
-IKyrieOIIhandsStaff = \context PianoStaff = "IKyrieOIIhandsSt" <<
-  \IKyrieOIIrStaff
-%   \new Dynamics = "IKyrieOIIdynamicsSt" \IKyrieOIIdynamicsMusic
-  \IKyrieOIIlStaff
-%   \new Dynamics = "IKyrieOIpedalSt" \IKyrieOIpedalMusic
+KyrieOIIhandsStaff = \context PianoStaff = "KyrieOIIhandsSt" <<
+  \KyrieOIIrStaff
+%   \new Dynamics = "KyrieOIIdynamicsSt" \KyrieOIIdynamicsMusic
+  \KyrieOIIlStaff
+%   \new Dynamics = "KyrieOIpedalSt" \KyrieOIpedalMusic
 >>
diff --git a/Vierne_MesseSolennelle_02_Gloria.ly b/Vierne_MesseSolennelle_Music_02_Gloria.ily
similarity index 78%
rename from Vierne_MesseSolennelle_02_Gloria.ly
rename to Vierne_MesseSolennelle_Music_02_Gloria.ily
index 2c7a6d90eab89a4a0d91f9accd0f5f08b431d4da..81ac7e9eed9972bcff7e4b50a1e81885134feb33 100644
--- a/Vierne_MesseSolennelle_02_Gloria.ly
+++ b/Vierne_MesseSolennelle_Music_02_Gloria.ily
@@ -1,30 +1,28 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
+\version "2.13.1"
 
-IIGloriaPieceName = "Gloria"
-IIGloriaTempo = "Allegro risoluto."
-IIGloriaTempoNr = #'72
-IIGloriaTempoII = "Molto quasi doppio piu lent."
-IIGloriaTempoIINr = #'88
-IIGloriaTempoIII = "Tempo."
-IIGloriaTempoIIINr = #'72
-% IIGloriaTempoIV = { "Tempo 1."\hspace #-1.5 \raise #1.0 \teeny "o"}
-IIGloriaTempoIV = "Tempo 1.o"
-IIGloriaTempoIVNr = #'72
+GloriaPieceName = "Gloria"
+GloriaTempo = "Allegro risoluto."
+GloriaTempoNr = #'72
+GloriaTempoII = "Molto quasi doppio piu lent."
+GloriaTempoIINr = #'88
+GloriaTempoIII = "Tempo."
+GloriaTempoIIINr = #'72
+% GloriaTempoIV = { "Tempo 1."\hspace #-1.5 \raise #1.0 \teeny "o"}
+GloriaTempoIV = "Tempo 1.o"
+GloriaTempoIVNr = #'72
 
-IIGloriaKey = \notemode {
-  \key fis \minor
-}
-IIGloriaTimeII = \time 4/4
-IIGloriaTimeIII = \time 2/4
-IIGloriaTimeIV = \time 2/2
-IIGloriaSettings = \notemode {  
-  \tempo \IIGloriaTempo 
-  \time 2/2
+GloriaKey = \key fis \minor
+GloriaTimeSignature = \time 2/2
+
+GloriaTimeII = \time 4/4
+GloriaTimeIII = \time 2/4
+GloriaTimeIV = \time 2/2
+GloriaSettings = \notemode {
+  \tempo \GloriaTempo
   \partial 4
 }
 
-IIGloriaSMusic = \relative c'' {
+GloriaSMusic = \relative c'' {
   r4 | % 1
   R1*4 | % 5
   e2\fff e | % 6
@@ -61,52 +59,52 @@ IIGloriaSMusic = \relative c'' {
   h1 | % 54
   cis2 r | % 55
   R1*4 \bar "||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   R1*13 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*9 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   h4.\mf\sostenuto h8 h4( cis) | % 82
   d4.( h8) a4( g) | % 83
   fis4( h2) g4 | % 84
   fis2 e4 r | % 85
   e'2. e4 | % 86
   e( d cis) d | % 87
-  \setDim h4.\dim h8 a4( g) | % 88
-  g4\enddim\p fis r2 | % 89
+  h4.\dim h8 a4( g) | % 88
+  g4\!\p fis r2 | % 89
   R1*7 |  % 96
-  r2 r4 r8 \setCresc <ais cis>8\p\cresc | % 97
+  r2 r4 r8 <ais cis>8\p\cresc | % 97
   <ais cis>4 <ais cis> \breathe <ais cis>8 <ais cis>4 <ais d>8 | % 98
-  <h e>2\endcresc\sf <h e>4 r | % 99
-  <ais cis>4. <ais cis>8 <d fis>4\sf( \setDim <cis e>8)\dim <h d>8 | \barNumberCheck #100
-  <h d>4 <ais cis>4\enddim  r2 | % 101
+  <h e>2\!\sf <h e>4 r | % 99
+  <ais cis>4. <ais cis>8 <d fis>4\sf( <cis e>8)\dim <h d>8 | \barNumberCheck #100
+  <h d>4 <ais cis>4\!  r2 | % 101
   R1 | % 102
   r2 r4 r8 h8\mf | % 103
   h4 h \breathe h8\< h4 c8\! | % 104
   d2\sf d4 r | % 105
   es2(\f d4.) c8 | % 106
   c2 r4 c8 c | % 107
-  \setDimMolto c4.\dimMolto c8 c4 c | % 108
-  h2\endDimMolto\p h4 r | % 109
+  c4.\dimMolto c8 c4 c | % 108
+  h2\!\p h4 r | % 109
   R1*3 | % 112
   r2 r4 b4\p | % 113
   b2 b4 r | % 114
   r b b b8 b | % 115
-  \setCresc c2\cresc c4 r | % 116
+  c2\cresc c4 r | % 116
   r2 r4 c | % 117
   c2 c4 r | % 118
   r c c c8 c | % 119
-  \setCrescMolto cis2\endcresc\crescMolto cis4 r | \barNumberCheck #120
+  cis2\!\crescMolto cis4 r | \barNumberCheck #120
   R1 | % 121
-  dis2.\endCrescMolto\f dis4 | % 122
+  dis2.\!\f dis4 | % 122
   dis2. dis4 | % 123
   e1 | % 124
   e2 r \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" % 126
-  \IIGloriaTimeIV 
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   r2 r4 gis,8.\fff gis16 | % 127
   a4 h cis d | % 128
   cis( h8[ a]) h4 gis | % 129
@@ -164,8 +162,66 @@ IIGloriaSMusic = \relative c'' {
   e | % 181
   e1\fermata \bar"|."
 }
+\addQuote "GloriaSMusic" { \GloriaSMusic }
+
+GloriaSLyrics = \lyricmode {
+  % 5
+  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae
+  % 10
+  vo -- lun -- ta -- tis
+  % 25
+  Lau -- da -- mus te
+  % 30
+  Be -- ne -- di -- ci -- mus te A -- do -- ra --
+  % 35
+  mus te Glo -- ri -- fi --
+  % 40
+  ca -- mus te
+  % 45
+  Gra -- ti -- as a -- gi -- mus ti -- bi
+  % 50
+  prop -- ter ma -- gnam glo -- ri -- am tu -- am
+  % 80
+  Do -- mi -- ne De -- us A -- gnus De -- i
+  % 85
+  A -- gnus De -- i Fi -- li -- us Pa -- tris
+  % 95
+  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
+  % 100
+  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
+  % 105
+  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
+  % 110
+  Qui se -- des ad dex -- te -- ram
+  % 115
+  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
+  % 120
+  mi -- se -- re -- re no -- bis
+  % 125
+  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
+  % 130
+  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
+  % 135
+  Je -- su Chris -- te Quo -- ni -- am tu so -- lus
+  % 140
+  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
+  % 145
+  so -- lus Al -- tis -- si -- mus Je -- su Chris --
+  % 150
+  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 155
+  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
+  % 160
+  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 165
+  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa --
+  % 170
+  tris A -- men a -- men
+  % 175
+  a -- men a -- men a -- men!
+}
 
-IIGloriaAMusic = \relative c'' {
+GloriaAMusic = \relative c'' {
   r4 | % 1
   R1*4 | % 5
   a2\fff fis | % 6
@@ -202,44 +258,44 @@ IIGloriaAMusic = \relative c'' {
   fis2( e) | % 54
   e2 r | % 55
   R1*4 \bar "||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   R1*13 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*9 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*15 | % 96
-  r2 r4 r8 \setCresc fis\p\cresc | % 97
+  r2 r4 r8 fis\p\cresc | % 97
   fis4 fis \breathe fis8 fis4 fis8 | % 98
-  g2\endcresc\sf g4 r | % 99
-  g4. g8 \setDim gis4.\sf\dim gis8 | \barNumberCheck #100
-  fis4 fis\enddim r2 | % 101
+  g2\!\sf g4 r | % 99
+  g4. g8 gis4.\sf\dim gis8 | \barNumberCheck #100
+  fis4 fis\! r2 | % 101
   R1 | % 102
   r2 r4 r8 g8\mf | % 103
   g4 g \breathe g8\< g4 g8\! | % 104
   as2\sf as4 r | % 105
   a2.\f( a8) a | % 106
   a2 r4 as8 as | % 107
-  \setDimMolto g4.\dimMolto g8 fis4 fis | % 108
+  g4.\dimMolto g8 fis4 fis | % 108
   fis2\p fis4 r4 | % 109
   R1*3 | % 112
   r2 r4 b4\p | % 113
   b2 b4 r | % 114
   r4 b b b8 b8 | % 115
-  \setCresc b2\cresc b4 r\endcresc | % 116
+  b2\cresc b4 r\! | % 116
   r2 r4 b | % 117
   b2 b4 r | % 118
   r b b b8 b | % 119
-  \setCrescMolto ais2\crescMolto ais4 r | \barNumberCheck #120
+  ais2\crescMolto ais4 r | \barNumberCheck #120
   R1 | % 121
-  a?2.\endCrescMolto\f a4 | % 122
+  a?2.\!\f a4 | % 122
   a2. a4 | % 123
   gis1 | % 124
   gis2 r \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   r2 r4 e8.\fff e16 | % 127
   e4 e e e | % 128
   e2 e4 e | % 129
@@ -295,10 +351,64 @@ IIGloriaAMusic = \relative c'' {
   a2 r | % 179
   a1~ | \barNumberCheck #180
   a | % 181
-  a\fermata \bar"|."  
+  a\fermata \bar"|."
 }
-% 
-IIGloriaTMusic = \relative c' {
+\addQuote "GloriaAMusic" { \GloriaAMusic }
+
+GloriaALyrics = \lyricmode {
+  % 5
+  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae
+  % 10
+  vo -- lun -- ta -- tis
+  % 25
+  Lau -- da -- mus te
+  % 30
+  Be -- ne -- di -- ci -- mus te A -- do -- ra --
+  % 35
+  mus te Glo -- ri -- fi --
+  % 40
+  ca -- mus te
+  % 45
+  Gra -- ti -- as a -- gi -- mus ti -- bi
+  % 50
+  prop -- ter ma -- gnam glo -- ri -- am tu -- am
+  % 95
+  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
+  % 100
+  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
+  % 105
+  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
+  % 110
+  Qui se -- des ad dex -- te -- ram
+  % 115
+  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
+  % 120
+  mi -- se -- re -- re no -- bis
+  % 125
+  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
+  % 130
+  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
+  % 135
+  Je -- su Chris -- te Quo -- ni -- am tu so -- lus
+  % 140
+  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
+  % 145
+  so -- lus Al -- tis -- si -- mus Je -- su Chris --
+  % 150
+  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 155
+  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
+  % 160
+  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 165
+  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa --
+  % 170
+  tris A -- men a -- men
+  % 175
+  a -- men a -- men a -- men!
+}
+
+GloriaTMusic = \relative c' {
   r4 | % 1
   R1*4 | % 5
   e2\fff cis | % 6
@@ -315,7 +425,7 @@ IIGloriaTMusic = \relative c' {
   <e a,>2 <e cis> | \barNumberCheck #20
   <e h>4. h8 h2 | % 21
   <fis' fis,>2 <gis gis,> | % 22
-  <a a,>2 << { \voiceOne cis,4( d)\oneVoice } \context Voice = "IIGloriaTIIVoice" { \voiceTwo a2 \oneVoice } >>  | % 23
+  <a a,>2 << { \voiceOne cis,4( d)\oneVoice } \context Voice = "GloriaTIIVoice" { \voiceTwo a2 \oneVoice } >>  | % 23
   <e' h>1 | % 24
   <e cis>2. r4 | % 25
   R1*2 | % 27
@@ -344,58 +454,58 @@ IIGloriaTMusic = \relative c' {
   gis1 | % 54
   a2 r | % 55
   R1*4 \bar "||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   R1*13 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   d4.\p\sostenuto d8 d4( e) | % 73
   f4.( d8 c4) b4 | % 74
   a4( d2) b4 | % 75
   a4. a8 g2 | % 76
-  r2 \setCresc g'2(~\cresc | % 77
+  r2 g'2(~\cresc | % 77
   g4 f e) f | % 78
-  \setDim d4(\dim b2 c4) | % 79
-  a2\enddim r | \barNumberCheck #80
+  d4(\dim b2 c4) | % 79
+  a2\! r | \barNumberCheck #80
   R1 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*9 | \barNumberCheck #90
-  r2 r4 r8 \setCresc <ais cis>8\p\cresc | % 91
+  r2 r4 r8 <ais cis>8\p\cresc | % 91
   <ais cis>4 <ais cis> \breathe <ais cis>8 <ais cis>4 <ais d>8 | % 92
   <h e>2\sf <h e>4 r | % 93
-  <ais cis>4. <ais cis>8 \setDim <d fis>4(\sf\dim <cis e>8) <h d>8 | % 94
-  <h d >4 <ais cis>4\enddim r2 | % 95
+  <ais cis>4. <ais cis>8 <d fis>4(\sf\dim <cis e>8) <h d>8 | % 94
+  <h d >4 <ais cis>4\! r2 | % 95
   R1 | % 96
-  \set Voice.instrumentCueName = "4 Tenors" r2 r4 r8 \setCresc e'8\p\cresc | % 97
+  \set Voice.instrumentCueName = "4 Tenors" r2 r4 r8 e'8\p\cresc | % 97
   e4 e \breathe e8 e4 e8 | % 98
-  e2\endcresc\sf e4 r | % 99
-  e,4. e8 \setDim e4.\sf\dim e8 | \barNumberCheck #100
-  e4 e\enddim r2 | % 101
+  e2\!\sf e4 r | % 99
+  e,4. e8 e4.\sf\dim e8 | \barNumberCheck #100
+  e4 e\! r2 | % 101
   R1 | % 102
   r2 r4 r8 \set Voice.instrumentCueName = "Tenors" d'8\mf | % 103
   d4 d \breathe f8\< es4 d8\! | % 104
   c2\sf c4 r | % 105
   c2(\f d4.) es8 | % 106
   es2 r4 es8 es | % 107
-  \setDimMolto es4.\dimMolto es8 es4 es | % 108
-  dis2\endDimMolto\p dis4 r | % 109
+  es4.\dimMolto es8 es4 es | % 108
+  dis2\!\p dis4 r | % 109
   R1*3 | % 112
   r2 r4 b4\p | % 113
   b2 b4 r | % 114
   r b b b8 b | % 115
-  \setCresc c2\cresc c4 r\endcresc | % 116
+  c2\cresc c4 r\! | % 116
   r2 r4 c4 | % 117
   c2 c4 r | % 118
   r c c c8 c | % 119
-  \setCrescMolto cis2\crescMolto cis4 r\endCrescMolto | \barNumberCheck #120
+  cis2\crescMolto cis4 r\! | \barNumberCheck #120
   R1 | % 121
   dis2.\f dis4 | % 122
   dis2. dis4 | % 123
   e1 | % 124
   e2 r \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   r2 r4 d8.\fff d16 | % 127
   d4 d d d | % 128
   d2 d4 d | % 129
@@ -453,7 +563,72 @@ IIGloriaTMusic = \relative c' {
   cis2 h) | % 181
   cis1\fermata \bar"|."
 }
-IIGloriaBMusic = \relative c' {
+\addQuote "GloriaTMusic" { \GloriaTMusic }
+
+GloriaTLyrics = \lyricmode {
+  % 5
+  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae
+  % 10
+  vo -- lun -- ta -- tis
+  % 15
+  Et in ter -- ra pax ho --
+  % 20
+  mi -- ni -- bus bo -- nae vo -- lun -- ta -- tis
+  % 25
+  Lau -- da -- mus te
+  % 30
+  Be -- ne -- di -- ci -- mus te A -- do -- ra --
+  % 35
+  mus te Glo -- ri -- fi --
+  % 40
+  ca -- mus te
+  % 45
+  Gra -- ti -- as a -- gi -- mus ti -- bi
+  % 50
+  prop -- ter ma -- gnam glo -- ri -- am tu -- am
+  % 70
+  Do -- mi -- ne __ Fi -- li u -- ni
+  % 75
+  ge -- ni -- te Je -- su Chris -- te
+  % 85
+  Qui tol -- lis pec -- ca -- ta mun -- di mi -- se -- re -- re no -- bis
+  % 95
+  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
+  % 100
+  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
+  % 105
+  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
+  % 110
+  Qui se -- des ad dex -- te -- ram
+  % 115
+  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
+  % 120
+  mi -- se -- re -- re no -- bis
+  % 125
+  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
+  % 130
+  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
+  % 135
+  Je -- su Chris -- te Quo -- ni -- am tu so -- lus
+  % 140
+  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
+  % 145
+  so -- lus Al -- tis -- si -- mus Je -- su Chris --
+  % 150
+  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 155
+  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
+  % 160
+  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
+  % 165
+  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa --
+  % 170
+  tris A -- men a -- men
+  % 175
+  a -- men a -- men a -- men!
+}
+
+GloriaBMusic = \relative c' {
   r4 | % 1
   R1*4 | % 5
   cis2\fff a | % 6
@@ -466,12 +641,12 @@ IIGloriaBMusic = \relative c' {
   e2. r4 | % 13
   R1*4 | % 17
   <g e>2\ff <e c> | % 18
-  << {\voiceOne d2. e4 \oneVoice} \context Voice ="IIGloriaBIIVoice" { \voiceTwo g,2( h4) dis } >> | % 19
+  << {\voiceOne d2. e4 \oneVoice} \context Voice ="GloriaBIIVoice" { \voiceTwo g,2( h4) dis } >> | % 19
   <e cis>2 <fis a,> | \barNumberCheck #20
   <gis e>4. <gis e>8 <gis e>2 | % 21
   fis2 gis | % 22
-  a << { \voiceOne a2\oneVoice } \context Voice = "IIGloriaBIIVoice" { \voiceTwo gis4( fis) \oneVoice } >>  | % 23
-  << { \voiceOne a4( fis gis2) \oneVoice } \context Voice = "IIGloriaBIIVoice" { \voiceTwo e1 \oneVoice } >>  | % 24
+  a << { \voiceOne a2\oneVoice } \context Voice = "GloriaBIIVoice" { \voiceTwo gis4( fis) \oneVoice } >>  | % 23
+  << { \voiceOne a4( fis gis2) \oneVoice } \context Voice = "GloriaBIIVoice" { \voiceTwo e1 \oneVoice } >>  | % 24
   <a a,>2. r4 | % 25
   R1*2 | % 27
   a4\fff a2 a4 | % 28
@@ -499,53 +674,53 @@ IIGloriaBMusic = \relative c' {
   e1 | % 54
   a,2 r | % 55
   R1*4 \bar "||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   R1*4 | % 63
   fis'4.\p\sostenuto fis8 fis4( gis) | % 64
   a4.( fis8) e4( d) | % 65
   cis( fis2) d4 | % 66
   cis2 h4 r | % 67
-  \setCresc h'2.\cresc h4 | % 68
+  h'2.\cresc h4 | % 68
   h( a gis) a | % 69
-  \setDim fis2\endcresc\dim d4. e8 | \barNumberCheck #70
-  cis2\enddim r2 | % 71
+  fis2\!\dim d4. e8 | \barNumberCheck #70
+  cis2\! r2 | % 71
   R1 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*9 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   R1*9 | \barNumberCheck #90
-  r2 r4 r8 \setCresc <e fis>8\p\cresc | % 91
+  r2 r4 r8 <e fis>8\p\cresc | % 91
   <e fis>4 <e fis> \breathe <e fis>8 <e fis>4 <e fis>8 | % 92
-  <e g>2\endcresc\sf <e g>4 r | % 93
-  <e fis>4. <e fis>8 \setDim <e g>4.\sf\dim <e g>8 | % 94
-  <e fis>4 <e fis>4\enddim r2 | % 95
+  <e g>2\!\sf <e g>4 r | % 93
+  <e fis>4. <e fis>8 <e g>4.\sf\dim <e g>8 | % 94
+  <e fis>4 <e fis>4\! r2 | % 95
   R1*7 | % 102
   r2 r4 r8 f8\mf | % 103
   f4 f \breathe f8\< f4 f8\! | % 104
   f2\sf f4 r | % 105
   fis2.~\f fis8 fis | % 106
   fis2 r4 fis8 fis | % 107
-  \setDimMolto g4.\dimMolto g8 as4 as | % 108
-  a2\endDimMolto\p a4 r | % 109
+  g4.\dimMolto g8 as4 as | % 108
+  a2\!\p a4 r | % 109
   R1*3 | % 112
   r2 r4 b4\p | % 113
   b2 b4 r | % 114
   r b b b8 b | % 115
-  \setCresc b2\cresc b4 r\endcresc | % 116
+  b2\cresc b4 r\! | % 116
   r2 r4 b | % 117
   b2 b4 r | % 118
   r b b b8 b | % 119
-  \setCrescMolto ais2\crescMolto ais4 r\endCrescMolto | \barNumberCheck #120
+  ais2\crescMolto ais4 r\! | \barNumberCheck #120
   R1 | % 121
   a?2.\f a4 | % 122
   a2. a4 | % 123
   gis1 | % 124
   gis2 r \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   r2 r4 e8.\fff e16 | % 127
   fis4 gis a h | % 128
   a( gis8[ fis]) gis4 e | % 129
@@ -603,193 +778,21 @@ IIGloriaBMusic = \relative c' {
   <e a,>1 | % 181
   <e a,>1\fermata \bar"|."
 }
+\addQuote "GloriaBMusic" { \GloriaBMusic }
 
-IIGloriaSLyrics = \lyricmode {
-  % 5
-  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae 
-  % 10 
-  vo -- lun -- ta -- tis
-  % 25
-  Lau -- da -- mus te
-  % 30
-  Be -- ne -- di -- ci -- mus te A -- do -- ra -- 
-  % 35
-  mus te Glo -- ri -- fi --
-  % 40
-  ca -- mus te
-  % 45
-  Gra -- ti -- as a -- gi -- mus ti -- bi
-  % 50
-  prop -- ter ma -- gnam glo -- ri -- am tu -- am
-  % 80
-  Do -- mi -- ne De -- us A -- gnus De -- i
-  % 85
-  A -- gnus De -- i Fi -- li -- us Pa -- tris
-  % 95
-  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
-  % 100
-  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
-  % 105
-  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
-  % 110
-  Qui se -- des ad dex -- te -- ram
-  % 115
-  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
-  % 120
-  mi -- se -- re -- re no -- bis
-  % 125
-  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
-  % 130
-  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
-  % 135
-  Je -- su Chris -- te Quo -- ni -- am tu so -- lus 
-  % 140
-  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
-  % 145
-  so -- lus Al -- tis -- si -- mus Je -- su Chris -- 
-  % 150
-  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 155
-  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
-  % 160
-  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 165
-  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa -- 
-  % 170
-  tris A -- men a -- men
-  % 175 
-  a -- men a -- men a -- men!
-}
-
-IIGloriaALyrics = \lyricmode {
+GloriaBLyrics = \lyricmode {
   % 5
-  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae 
-  % 10 
-  vo -- lun -- ta -- tis
-  % 25
-  Lau -- da -- mus te
-  % 30
-  Be -- ne -- di -- ci -- mus te A -- do -- ra -- 
-  % 35
-  mus te Glo -- ri -- fi --
-  % 40
-  ca -- mus te
-  % 45
-  Gra -- ti -- as a -- gi -- mus ti -- bi
-  % 50
-  prop -- ter ma -- gnam glo -- ri -- am tu -- am
-  % 95
-  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
-  % 100
-  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
-  % 105
-  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
-  % 110
-  Qui se -- des ad dex -- te -- ram
-  % 115
-  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
-  % 120
-  mi -- se -- re -- re no -- bis
-  % 125
-  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
-  % 130
-  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
-  % 135
-  Je -- su Chris -- te Quo -- ni -- am tu so -- lus 
-  % 140
-  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
-  % 145
-  so -- lus Al -- tis -- si -- mus Je -- su Chris -- 
-  % 150
-  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 155
-  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
-  % 160
-  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 165
-  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa -- 
-  % 170
-  tris A -- men a -- men
-  % 175 
-  a -- men a -- men a -- men!
-}
-
-IIGloriaTLyrics = \lyricmode {
-  % 5
-  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae 
-  % 10 
+  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae
+  % 10
   vo -- lun -- ta -- tis
   % 15
-  Et in ter -- ra pax ho -- 
-  % 20 
+  Et in ter -- ra pax ho --
+  % 20
   mi -- ni -- bus bo -- nae vo -- lun -- ta -- tis
   % 25
   Lau -- da -- mus te
   % 30
-  Be -- ne -- di -- ci -- mus te A -- do -- ra -- 
-  % 35
-  mus te Glo -- ri -- fi --
-  % 40
-  ca -- mus te
-  % 45
-  Gra -- ti -- as a -- gi -- mus ti -- bi
-  % 50
-  prop -- ter ma -- gnam glo -- ri -- am tu -- am
-  % 70
-  Do -- mi -- ne __ Fi -- li u -- ni
-  % 75 
-  ge -- ni -- te Je -- su Chris -- te
-  % 85 
-  Qui tol -- lis pec -- ca -- ta mun -- di mi -- se -- re -- re no -- bis
-  % 95
-  Qui tol -- lis pe -- ca -- ta mun -- di mi -- se -- re -- re
-  % 100
-  no -- bis Qui tol -- lis pe -- ca -- ta mun -- di
-  % 105
-  sus -- ci -- pe de -- pre -- ca -- ti -- o -- nem nos -- tram
-  % 110
-  Qui se -- des ad dex -- te -- ram
-  % 115
-  Pa -- tris qui se -- des ad dex -- te -- ram Pa -- tris
-  % 120
-  mi -- se -- re -- re no -- bis
-  % 125
-  Quo -- ni -- am tu so -- lus sanc -- tus Tu so -- lus
-  % 130
-  Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
-  % 135
-  Je -- su Chris -- te Quo -- ni -- am tu so -- lus 
-  % 140
-  Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
-  % 145
-  so -- lus Al -- tis -- si -- mus Je -- su Chris -- 
-  % 150
-  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 155
-  Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
-  % 160
-  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
-  % 165
-  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa -- 
-  % 170
-  tris A -- men a -- men
-  % 175 
-  a -- men a -- men a -- men!
-}
-
-IIGloriaBLyrics = \lyricmode {
-  % 5
-  Et in ter -- ra pax ho -- mi -- ni -- bus bo -- nae 
-  % 10 
-  vo -- lun -- ta -- tis
-  % 15
-  Et in ter -- ra pax ho -- 
-  % 20 
-  mi -- ni -- bus bo -- nae vo -- lun -- ta -- tis
-  % 25
-  Lau -- da -- mus te
-  % 30
-  Be -- ne -- di -- ci -- mus te A -- do -- ra -- 
+  Be -- ne -- di -- ci -- mus te A -- do -- ra --
   % 35
   mus te Glo -- ri -- fi --
   % 40
@@ -801,7 +804,7 @@ IIGloriaBLyrics = \lyricmode {
   % 60
   Do -- mi -- ne __ De -- us __
   % 65
-  Rex __ coe -- les -- tis De -- us Pa -- ter om -- ni -- po -- 
+  Rex __ coe -- les -- tis De -- us Pa -- ter om -- ni -- po --
   % 70
   tens
   % 90
@@ -821,30 +824,30 @@ IIGloriaBLyrics = \lyricmode {
   % 130
   Do -- mi -- nus Tu so -- lus Al -- tis -- si -- mus tu so -- lus Al -- tis -- si -- mus
   % 135
-  Je -- su Chris -- te Quo -- ni -- am tu so -- lus 
+  Je -- su Chris -- te Quo -- ni -- am tu so -- lus
   % 140
   Sanc -- tus tu so -- lus Do -- mi -- nus tu so -- lus al -- tis -- si -- mus tu
   % 145
-  so -- lus Al -- tis -- si -- mus Je -- su Chris -- 
+  so -- lus Al -- tis -- si -- mus Je -- su Chris --
   % 150
-  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
+  te Cum sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
   % 155
   Cum Sanc -- to Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris Cum Sanc -- to
   % 160
-  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris 
+  Spi -- ri -- tu in glo -- ri -- a De -- i Pa -- tris
   % 165
-  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa -- 
+  Cum Sanc -- to spi -- ri -- tu in glo -- ri -- a De -- i Pa --
   % 170
   tris A -- men a -- men
-  % 175 
+  % 175
   a -- men a -- men a -- men!
 }
 
-IIGloriaOIdynamicsMusic = { 
+GloriaOIdynamicsMusic = {
 }
-IIGloriaOIpedalMusic = { 
+GloriaOIpedalMusic = {
 }
-IIGloriaOIrIMusic = \relative c'' {
+GloriaOIrIMusic = \relative c'' {
   \oneV r4 | % 1
   R1*3 | % 4
   r2 r4 <gis h>4\staccato | % 5 % TODO: Cross-staff chord!!!!
@@ -895,8 +898,8 @@ IIGloriaOIrIMusic = \relative c'' {
   h1 | % 54
   \oneV <e, cis'>2 r2 | % 55
   R1*4 \bar"||" % 59
-  \IIGloriaTimeII
-  \tempo \IIGloriaTempoII
+  \GloriaTimeII
+  \tempo \GloriaTempoII
   r8 e8[( h' a] d[ cis a e]) | \barNumberCheck #60
   eis[( cis gis' fis] h[ a fis cis]) | % 61
   \vOne fis1 | % 62
@@ -907,10 +910,10 @@ IIGloriaOIrIMusic = \relative c'' {
   cis'2 h | % 67
   g4. fis8 eis2 | % 68
   g4. fis8 eis2 | % 69
-  << {fis2~ fis4. gis8} \context Voice = "IIGloriaOIrIIIVoice" { \voiceThree d1} >> | \barNumberCheck #70
+  << {fis2~ fis4. gis8} \context Voice = "GloriaOIrIIIVoice" { \voiceThree d1} >> | \barNumberCheck #70
   a'4 r r2 | % 71
   R1 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   \oneV d16[( e f e] d8)[\staccato d,]\staccato d'16[( cis d cis] d8[)\staccato d,\staccato] | % 73
   d'16[( e f e] d8)[\staccato d,]\staccato d'16[( cis d cis] d8[)\staccato d,\staccato] | % 74
   d'16[( e f e] d8)[\staccato d,]\staccato d'16[( cis d cis] d8[)\staccato d,\staccato] | % 75
@@ -920,7 +923,7 @@ IIGloriaOIrIMusic = \relative c'' {
   b'16[( c d c] b8)[\staccato b,]\staccato c'16[( h c h] c8[)\staccato c,\staccato] | % 79 % TODO: CHECK: Really a c, at the end or a cis?
   d4 r r2 | \barNumberCheck #80
   R1 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   \vOne fis2 eis | % 82
   <h' d>1~ | % 83
   <h d>~ | % 84 TODO: cross-staff tie!!!
@@ -946,24 +949,24 @@ IIGloriaOIrIMusic = \relative c'' {
   g fis~ | % 108
   fis2~ fis4 r | % 109
   R1*2 | % 111
-  \change Staff = IIGloriaOIlSt r8 g,[( c b] \change Staff = IIGloriaOIrSt f'[ es as g]) | % 112
+  \change Staff = GloriaOIlSt r8 g,[( c b] \change Staff = GloriaOIrSt f'[ es as g]) | % 112
   c[( b f' es] as[ g c b]) | % 113
-  \change Staff = IIGloriaOIlSt r8 g,,[( c b] \change Staff = IIGloriaOIrSt f'[ es as g]) | % 114
+  \change Staff = GloriaOIlSt r8 g,,[( c b] \change Staff = GloriaOIrSt f'[ es as g]) | % 114
   c[( b f' es] as[ g c b]) | % 115
-  \change Staff = IIGloriaOIlSt r8 g,,[( d' c] \change Staff = IIGloriaOIrSt f[ e a g]) | % 116
+  \change Staff = GloriaOIlSt r8 g,,[( d' c] \change Staff = GloriaOIrSt f[ e a g]) | % 116
   d'[( c f e] a[ g d' c]) | % 117
-  \change Staff = IIGloriaOIlSt r8 g,,[( d' c] \change Staff = IIGloriaOIrSt f[ e a g]) | % 118
+  \change Staff = GloriaOIlSt r8 g,,[( d' c] \change Staff = GloriaOIrSt f[ e a g]) | % 118
   d'[( c f e] a[ g d' c]) | % 119
-  \change Staff = IIGloriaOIlSt r8 ais,,[( dis cis] \change Staff = IIGloriaOIrSt gis'[ fis h ais]) | \barNumberCheck #120
+  \change Staff = GloriaOIlSt r8 ais,,[( dis cis] \change Staff = GloriaOIrSt gis'[ fis h ais]) | \barNumberCheck #120
   dis[( cis gis' fis] h[ ais dis cis]) | % 121
-  \change Staff = IIGloriaOIlSt r8 a,,[( dis h] \change Staff = IIGloriaOIrSt f'[ dis h' a]) | % 122
+  \change Staff = GloriaOIlSt r8 a,,[( dis h] \change Staff = GloriaOIrSt f'[ dis h' a]) | % 122
   dis[( h f' dis] h'[ a dis h]) | % 123
-  \change Staff = IIGloriaOIlSt r8 h,,[( \change Staff = IIGloriaOIrSt fis' e] a[ gis cis h]) | % 124
+  \change Staff = GloriaOIlSt r8 h,,[( \change Staff = GloriaOIrSt fis' e] a[ gis cis h]) | % 124
   fis'[( e a gis] cis[ h gis e~] \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   \stemDown <e gis h e>2)\fermata \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   \oneV r2 r4 gis, | % 127
   \vOne a h cis d | % 128
   cis h8[ a] h4 gis | % 129
@@ -1021,7 +1024,7 @@ IIGloriaOIrIMusic = \relative c'' {
   <e a e'>~ | % 181
   <e a e'>\fermata \bar"|."
 }
-IIGloriaOIrIIMusic = \relative c'' {
+GloriaOIrIIMusic = \relative c'' {
   \vTwo
   s4 | % 1
   s1*4 | % 5
@@ -1050,8 +1053,8 @@ IIGloriaOIrIIMusic = \relative c'' {
   d fis2.~ | % 53
   fis2 e | % 54
   s1*5 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   s1*2 | % 61
   <a, c>1 | % 62
   <gis h> | % 63
@@ -1069,7 +1072,7 @@ IIGloriaOIrIIMusic = \relative c'' {
   fis g~ | % 84
   <g h>4. <a cis>8 <h d>2 | % 85
   g2 e | % 86
-  << {g2. fis4} \context Voice = "IIGloriaOIrIIIVoice" { \voiceThree e1} >> | % 87
+  << {g2. fis4} \context Voice = "GloriaOIrIIIVoice" { \voiceThree e1} >> | % 87
   d2 cis | % 88
   <cis e> r2 | % 89
   s1*7 | % 96
@@ -1080,10 +1083,10 @@ IIGloriaOIrIIMusic = \relative c'' {
   <c es> | % 108
   <h dis>2~ <h dis>4 r | % 109
   s1*16 \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   s2 \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   s1 | % 127
   e1~ | % 128
   e2. r4 | % 129
@@ -1116,9 +1119,9 @@ IIGloriaOIrIIMusic = \relative c'' {
   a2. e4 |  % 175
   s1 | % 176
   a2. g4 | % 177
-  s1*5 
+  s1*5
 }
-IIGloriaOIlIMusic = \relative c' {
+GloriaOIlIMusic = \relative c' {
   \oneV
   r4 | % 1
   R1*3 | % 4
@@ -1171,8 +1174,8 @@ IIGloriaOIlIMusic = \relative c' {
   gis1 | % 54
   a2 \oneV r | % 55
   R1*4 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   r8 e8[( h' a] d[ cis a e]) | \barNumberCheck #60
   eis[( cis gis' fis] h[ a fis cis]) | % 61
   d16[( e fis e] d8[)\staccato d,]\staccato d'16[( cis d cis] d8)[\staccato d,8]\staccato | % 62
@@ -1222,23 +1225,23 @@ IIGloriaOIlIMusic = \relative c' {
   <a a'>2~ <a a'>4 r | % 109
   R1*2 | % 111
   \vTwo s8 g8[( c b] f'[ es as g]) | % 112
-  \vOne c[( b \change Staff = IIGloriaOIrSt \vTwo f' es] as[ g c? b?]) | % 113
-  \change Staff = IIGloriaOIlSt s g,,[( c b] f'[ es as g]) | % 114
-  c[( b \change Staff = IIGloriaOIrSt f' es] as[ g c? b?]) | % 115
-  \change Staff = IIGloriaOIlSt s g,,[( d' c] f[ e a g?]) | % 116
-  \change Staff = IIGloriaOIrSt d'[( c f e] a[ g d' c?]) | % 117
-  \change Staff = IIGloriaOIlSt s g,,[( d' c] f[ e a g?]) | % 118
-  \change Staff = IIGloriaOIrSt d'[( c f e] a[ g d' c?]) | % 119
-  \change Staff = IIGloriaOIlSt s ais,,[( dis cis] gis'[ fis h ais]) | \barNumberCheck #120
-  \change Staff = IIGloriaOIrSt dis[( cis gis' fis] h[ ais dis? cis]) | % 121
-  \change Staff = IIGloriaOIlSt s a,,?[( dis h] f'[ dis h' a]) | % 122
-  \change Staff = IIGloriaOIrSt dis[( h f' dis] h'[ a dis? h]) | % 123
-  \change Staff = IIGloriaOIlSt s h,,[( fis' e] a[ gis cis h]) | % 124
-  \change Staff = IIGloriaOIrSt fis'[( e a gis] cis[ h gis e]~) \bar"||" % 125
-  \IIGloriaTimeIII
-  \change Staff = IIGloriaOIlSt \vOne \stemDown <e h gis>2\fermata \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \vOne c[( b \change Staff = GloriaOIrSt \vTwo f' es] as[ g c? b?]) | % 113
+  \change Staff = GloriaOIlSt s g,,[( c b] f'[ es as g]) | % 114
+  c[( b \change Staff = GloriaOIrSt f' es] as[ g c? b?]) | % 115
+  \change Staff = GloriaOIlSt s g,,[( d' c] f[ e a g?]) | % 116
+  \change Staff = GloriaOIrSt d'[( c f e] a[ g d' c?]) | % 117
+  \change Staff = GloriaOIlSt s g,,[( d' c] f[ e a g?]) | % 118
+  \change Staff = GloriaOIrSt d'[( c f e] a[ g d' c?]) | % 119
+  \change Staff = GloriaOIlSt s ais,,[( dis cis] gis'[ fis h ais]) | \barNumberCheck #120
+  \change Staff = GloriaOIrSt dis[( cis gis' fis] h[ ais dis? cis]) | % 121
+  \change Staff = GloriaOIlSt s a,,?[( dis h] f'[ dis h' a]) | % 122
+  \change Staff = GloriaOIrSt dis[( h f' dis] h'[ a dis? h]) | % 123
+  \change Staff = GloriaOIlSt s h,,[( fis' e] a[ gis cis h]) | % 124
+  \change Staff = GloriaOIrSt fis'[( e a gis] cis[ h gis e]~) \bar"||" % 125
+  \GloriaTimeIII
+  \change Staff = GloriaOIlSt \vOne \stemDown <e h gis>2\fermata \bar"||" % 126
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   \vOne r2 r4 s | % 127
   d1~ | % 128
   d2. r4 | % 129
@@ -1294,9 +1297,9 @@ IIGloriaOIlIMusic = \relative c' {
   <h d,>) | % 179
   d1 | \barNumberCheck #180
   cis2 h | % 181
-  cis1\fermata \bar"|."  
+  cis1\fermata \bar"|."
 }
-IIGloriaOIlIIMusic = \relative c {
+GloriaOIlIIMusic = \relative c {
   \vTwo
   s4 | % 1
   s1*7 | % 8
@@ -1320,8 +1323,8 @@ IIGloriaOIlIIMusic = \relative c {
   e1 | % 54
   a,2 r2 | % 55
   s1*4 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   s1*13 | % 72
   <d, f'>1~ | % 73
   <d f'>1~ | % 74
@@ -1329,8 +1332,8 @@ IIGloriaOIlIIMusic = \relative c {
   << {
     a'2 g | % 76
     <g h>2~ <g a> | % 77
-    <g b>2.~ <g a>4 
-  } \context Voice = IIGloriaOIlIIIVoice { \voiceFour
+    <g b>2.~ <g a>4
+  } \context Voice = GloriaOIlIIIVoice { \voiceFour
     b,1 | % 76
     b2 a | % 77
     b a
@@ -1362,10 +1365,10 @@ IIGloriaOIlIIMusic = \relative c {
   f1 | % 123
   e1~ | % 124
   e1~ \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   e2\fermata \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   \vTwo r2 r4 e'4 | % 127
   fis gis a h | % 128
   a gis8[ fis] gis4 e | % 129
@@ -1402,9 +1405,9 @@ IIGloriaOIlIIMusic = \relative c {
   <a e'>1 \bar"|."
 }
 
-IIGloriaOIIdynamicsMusic = { 
+GloriaOIIdynamicsMusic = {
 }
-IIGloriaOIIrIMusic = \relative c''' {
+GloriaOIIrIMusic = \relative c''' {
   \vOne
   gis4 | % 1
   a h cis d | % 2
@@ -1445,17 +1448,17 @@ IIGloriaOIIrIMusic = \relative c''' {
   a d2 cis4 | % 57
   h1 | % 58
   a1 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   \oneV R1*11| \barNumberCheck #70
   r8 <fis, cis'>8[( <h gis'> <a fis'>] <d h'>[ <cis a'> <a fis'> <gis e'>] | % 71
   \vOne cis1 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   d4) r4 r2 | % 73
   \oneV R1*6 | % 79
   r8 <d, a'>[( <g e'> <fis d'>] <h g'>[ <a fis'> <fis d'> <cis h'>] | \barNumberCheck #80
   <d a'>2. <e ais>4 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   <d h'>4) r4 r2 |  % 82
   R1*6 | % 88
   r2 r4 ais' | % 89
@@ -1490,10 +1493,10 @@ IIGloriaOIIrIMusic = \relative c''' {
   <a dis a'> | % 123
   <gis e' gis>1~ | % 124
   <gis e' gis> \bar"||"  \barNumberCheck #125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" \barNumberCheck #126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   R1*12 | % 138
   \vOne r2 r4 gis' | % 139
   a h cis d | \barNumberCheck #140
@@ -1529,7 +1532,7 @@ IIGloriaOIIrIMusic = \relative c''' {
   e1~ |  % 181
   <cis e>1\fermata \bar"|."
 }
-IIGloriaOIIrIIMusic = \relative c'' {
+GloriaOIIrIIMusic = \relative c'' {
   \vTwo r4 | % 1
   e1~ | % 2
   e2. r4 | % 3
@@ -1552,26 +1555,26 @@ IIGloriaOIIrIIMusic = \relative c'' {
   a4 fis'2~ fis8[ e] | % 57
   d4 cis h e~ | % 58
   e1 \bar"||"  % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   s1*12 | % 71
   fis,2. g4 | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   f4 r4 r2 | % 73
   s1*8 | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   s1*8 | % 89
   fis1~ | \barNumberCheck #90
   fis1~ | % 91
   fis2~ fis4 r | % 92
-  s1*17 | % 109 
+  s1*17 | % 109
   fis1 | \barNumberCheck #110
   gis2 a | % 111
   s1*14 \bar"||" \barNumberCheck #125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   s2 \bar"||" \barNumberCheck #126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   s1*12 | % 138
   r2 r4 gis'4 | % 139
   e1~ | \barNumberCheck #140
@@ -1582,10 +1585,10 @@ IIGloriaOIIrIIMusic = \relative c'' {
   a2. r4 | % 173
   s1*6 | % 179
   <a e>1~ | \barNumberCheck #180
-  << { <a e>~ } \context Voice = IIGloriaOIIrIIIVoice { \voiceFour \once \override NoteColumn #'force-hshift = #-2 cis2 h } >> | % 181
+  << { <a e>~ } \context Voice = GloriaOIIrIIIVoice { \voiceFour \once \override NoteColumn #'force-hshift = #-2 cis2 h } >> | % 181
   <a e>1 \bar"||"
 }
-IIGloriaOIIlIMusic = \relative c'' {
+GloriaOIIlIMusic = \relative c'' {
   \vOne r4 | % 1
   d1~ | % 2
   d2. r4 | % 3
@@ -1601,7 +1604,7 @@ IIGloriaOIIlIMusic = \relative c'' {
   d2. r4 | % 15
   d1~ | % 16
   d2. \oneV r4 | % 17
-  R1*11 | % 28 
+  R1*11 | % 28
   r4 <h dis fis>\staccato <fis h dis>\staccato r4 | % 29
   R1*3 | % 32
   r4 <h cis eis gis>\staccato <gis h cis eis>\staccato r4 | % 33
@@ -1625,17 +1628,17 @@ IIGloriaOIIlIMusic = \relative c'' {
   \vOne cis4 a' h a | % 57
   a2 gis | % 58
   a1 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   \oneV R1*11 | \barNumberCheck #70
   \clef "bass" r8 a,8[ d cis] fis[ e cis h] | % 71
   a1~ | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   a4 r r2 | % 73
   R1*6 | % 79
   r8 fis[ h a] d[ cis a g] | \barNumberCheck #80
   fis1~ | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   fis4 r r2 | % 82
   R1*6 | % 88
   \vOne r2 r4 s4 | % 89
@@ -1669,10 +1672,10 @@ IIGloriaOIIlIMusic = \relative c'' {
   <f h dis> | % 123
   <e h' e>1~ | % 124
   <e h' e> \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2^\fermataMarkup \bar"||" % 126
-  \tempo \IIGloriaTempoIV
-  \IIGloriaTimeIV
+  \tempo \GloriaTempoIV
+  \GloriaTimeIV
   R1*12 | % 138
   \vOne r2 r4 \clef "treble" s4 | % 139
   d''1~ | \barNumberCheck #140
@@ -1708,7 +1711,7 @@ IIGloriaOIIlIMusic = \relative c'' {
   cis2 h | % 181
   cis1\fermata \bar"|."
 }
-IIGloriaOIIlIIMusic = \relative c' {
+GloriaOIIlIIMusic = \relative c' {
   \vTwo
   e4 | % 1
   fis gis a h | % 2
@@ -1731,8 +1734,8 @@ IIGloriaOIIlIIMusic = \relative c' {
   cis,4 d8[ cis] d[ e] fis4~ | % 57
   fis2. e8[ d] | % 58
   cis1 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   s1*29 | % 88
   r2 r4 \clef "bass" fis,4 | % 89
   gis ais h cis | \barNumberCheck #90
@@ -1742,9 +1745,9 @@ IIGloriaOIIlIIMusic = \relative c' {
   a1 | \barNumberCheck #110
   gis2 fis | % 111
   s1*14 \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   s2 \bar"||" % 126
-  \IIGloriaTimeIV
+  \GloriaTimeIV
   s1*12 | % 138
   r2 r4 \clef "treble" e'4 | % 139
   fis gis a h | \barNumberCheck #140
@@ -1757,7 +1760,7 @@ IIGloriaOIIlIIMusic = \relative c' {
   <e a> \bar"|."
 }
 
-IIGloriaOIIbassMusic = \relative c { 
+GloriaOIIbassMusic = \relative c {
   e4 | % 1
   e,1~ | % 2
   e2. e'4 | % 3
@@ -1778,7 +1781,7 @@ IIGloriaOIIbassMusic = \relative c {
   R1 | % 41
   r2 r4 e\staccato | % 42
   e,1~ | % 43
-  e2. e'4 | % 44 
+  e2. e'4 | % 44
   e,1~ | % 45
   e2. d'4\staccato | % 46
   cis2\marcato a\marcato | % 47
@@ -1791,17 +1794,17 @@ IIGloriaOIIbassMusic = \relative c {
   fis fis, gis a | % 57
   h cis8[ d] e4 e, | % 58
   a1 \bar"||" % 59
-  \tempo \IIGloriaTempoII
-  \IIGloriaTimeII
+  \tempo \GloriaTempoII
+  \GloriaTimeII
   R1*11 | \barNumberCheck #70
   fis1 | % 71
   r8 cis'8[( gis' fis] h[ a f e] | % 72
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   d4) r r2 | % 73
   R1*6 | % 79
   d1 | \barNumberCheck #80
   r8 a[( e' d] g[ fis d cis] | % 81
-  \tempo \IIGloriaTempoIII
+  \tempo \GloriaTempoIII
   h4) r r2 | % 82
   R1*7 | % 89
   fis1~ | \barNumberCheck #90
@@ -1832,10 +1835,10 @@ IIGloriaOIIbassMusic = \relative c {
   R1 | % 123
   e1~ | % 124
   e1 \bar"||" % 125
-  \IIGloriaTimeIII
+  \GloriaTimeIII
   R2-\fermataMarkup \bar"||" % 126
-  \IIGloriaTimeIV
-  \tempo \IIGloriaTempoIV
+  \GloriaTimeIV
+  \tempo \GloriaTempoIV
   R1*12 | % 138
   r2 r4 e' | % 139
   e,1~ | \barNumberCheck #140
@@ -1871,40 +1874,40 @@ IIGloriaOIIbassMusic = \relative c {
   <a a'>\fermata \bar"|."
 }
 
-IIGloriaOIIlClef = \clef "treble"
+GloriaOIIlClef = \clef "treble"
 
-IIGloriaOIrStaff = \context Staff = "IIGloriaOIrSt" <<
-  \context Voice= "IIGloriaOIrIVoice" << \vOne\IIGloriaSettings \IIGloriaKey \OIrClef \IIGloriaOIrIMusic >>
-  \context Voice= "IIGloriaOIrIIVoice" << \vTwo\IIGloriaSettings \IIGloriaKey \OIrClef \IIGloriaOIrIIMusic >>
-  \context Voice= "IIGloriaOIrIIIVoice" << \vThree >>
+GloriaOIrStaff = \context Staff = "GloriaOIrSt" <<
+  \context Voice= "GloriaOIrIVoice" << \vOne\GloriaSettings \GloriaKey \OIrClef \GloriaOIrIMusic >>
+  \context Voice= "GloriaOIrIIVoice" << \vTwo\GloriaSettings \GloriaKey \OIrClef \GloriaOIrIIMusic >>
+  \context Voice= "GloriaOIrIIIVoice" << \vThree >>
 >>
-IIGloriaOIlStaff = \context Staff = "IIGloriaOIlSt" <<
-  \context Voice= "IIGloriaOIlIVoice" { \vOne\IIGloriaSettings \IIGloriaKey \OIlClef \IIGloriaOIlIMusic }
-%   \context Dynamics 
-  \context Voice= "IIGloriaOIlIIVoice" { \vTwo\IIGloriaSettings \IIGloriaKey \OIlClef \IIGloriaOIlIIMusic }
+GloriaOIlStaff = \context Staff = "GloriaOIlSt" <<
+  \context Voice= "GloriaOIlIVoice" { \vOne\GloriaSettings \GloriaKey \OIlClef \GloriaOIlIMusic }
+%   \context Dynamics
+  \context Voice= "GloriaOIlIIVoice" { \vTwo\GloriaSettings \GloriaKey \OIlClef \GloriaOIlIIMusic }
 >>
-IIGloriaOIStaff = \context PianoStaff = "IIGloriaOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
-  \context Staff = "IIGloriaOIrSt" << s1*180 >>
-  \context Staff = "IIGloriaOIlSt" << s1*180 >>
-  \IIGloriaOIrStaff
-%   \new Dynamics = "IIGloriaOIdynamicsSt" \IIGloriaOIdynamicsMusic
-  \IIGloriaOIlStaff
-%   \new Dynamics = "IIGloriaOIpedalSt" \IIGloriaOIpedalMusic
+GloriaOIStaff = \context PianoStaff = "GloriaOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
+  \context Staff = "GloriaOIrSt" << s1*180 >>
+  \context Staff = "GloriaOIlSt" << s1*180 >>
+  \GloriaOIrStaff
+%   \new Dynamics = "GloriaOIdynamicsSt" \GloriaOIdynamicsMusic
+  \GloriaOIlStaff
+%   \new Dynamics = "GloriaOIpedalSt" \GloriaOIpedalMusic
 >>
-% 
-IIGloriaOIIrStaff = \context Staff = "IIGloriaOIIrSt" <<
-  \context Voice= "IIGloriaOIIrIVoice" << \vOne\IIGloriaSettings \IIGloriaKey \OIIrClef \IIGloriaOIIrIMusic >>
-  \context Voice= "IIGloriaOIIrIIVoice" << \vTwo\IIGloriaSettings \IIGloriaKey \OIIrClef \IIGloriaOIIrIIMusic >>
+
+GloriaOIIrStaff = \context Staff = "GloriaOIIrSt" <<
+  \context Voice= "GloriaOIIrIVoice" << \vOne\GloriaSettings \GloriaKey \OIIrClef \GloriaOIIrIMusic >>
+  \context Voice= "GloriaOIIrIIVoice" << \vTwo\GloriaSettings \GloriaKey \OIIrClef \GloriaOIIrIIMusic >>
 >>
-IIGloriaOIIlStaff = \context Staff = "IIGloriaOIIlSt" <<
-  \context Voice= "IIGloriaOIIlIVoice" { \vOne\IIGloriaSettings \IIGloriaKey \IIGloriaOIIlClef \IIGloriaOIIlIMusic }
-  \context Voice= "IIGloriaOIIlIIVoice" { \vTwo\IIGloriaSettings \IIGloriaKey \IIGloriaOIIlClef \IIGloriaOIIlIIMusic }
+GloriaOIIlStaff = \context Staff = "GloriaOIIlSt" <<
+  \context Voice= "GloriaOIIlIVoice" { \vOne\GloriaSettings \GloriaKey \GloriaOIIlClef \GloriaOIIlIMusic }
+  \context Voice= "GloriaOIIlIIVoice" { \vTwo\GloriaSettings \GloriaKey \GloriaOIIlClef \GloriaOIIlIIMusic }
 >>
-IIGloriaOIIhandsStaff = \context PianoStaff = "IIGloriaOIIhandsSt" <<
-  \context Staff = "IIGloriaOIIrSt" << s1*180 >>
-  \context Staff = "IIGloriaOIIlSt" << s1*180 >>
-  \IIGloriaOIIrStaff
-%   \new Dynamics = "IIGloriaOIIdynamicsSt" \IIGloriaOIIdynamicsMusic
-  \IIGloriaOIIlStaff
-%   \new Dynamics = "IIGloriaOIpedalSt" \IIGloriaOIpedalMusic
+GloriaOIIhandsStaff = \context PianoStaff = "GloriaOIIhandsSt" <<
+  \context Staff = "GloriaOIIrSt" << s1*180 >>
+  \context Staff = "GloriaOIIlSt" << s1*180 >>
+  \GloriaOIIrStaff
+%   \new Dynamics = "GloriaOIIdynamicsSt" \GloriaOIIdynamicsMusic
+  \GloriaOIIlStaff
+%   \new Dynamics = "GloriaOIpedalSt" \GloriaOIpedalMusic
 >>
diff --git a/Vierne_MesseSolennelle_03_Sanctus.ly b/Vierne_MesseSolennelle_Music_03_Sanctus.ily
similarity index 76%
rename from Vierne_MesseSolennelle_03_Sanctus.ly
rename to Vierne_MesseSolennelle_Music_03_Sanctus.ily
index ed5a6e246cdd36c854adbc870d42e2fc4829c399..593fbbe909bd53ef3c05872e7b8343c871a2ad74 100644
--- a/Vierne_MesseSolennelle_03_Sanctus.ly
+++ b/Vierne_MesseSolennelle_Music_03_Sanctus.ily
@@ -1,25 +1,22 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
+\version "2.13.1"
 
-IIISanctusPieceName = "Sanctus"
-IIISanctusTempo = "Maestoso ma no troppo lento."
+SanctusPieceName = "Sanctus"
+SanctusTempo = "Maestoso ma no troppo lento."
 
-IIISanctusKey = \notemode {
-  \key cis \minor
-}
-IIISanctusSettings = \notemode {  
-  \tempo \IIISanctusTempo 
-  \time 4/4
+SanctusKey = \key cis \minor
+SanctusTimeSignature = \time 4/4
+
+SanctusSettings = \notemode {
+  \tempo \SanctusTempo
 }
 
-IIISanctusSMusic = \relative c'' {
+SanctusSMusic = \relative c'' {
   R1*8 | % 9
-  \setCresc
   cis4.(\cresc fis,8) a2 | \barNumberCheck #10
-  \setCrescMolto d2\endcresc\crescMolto cis | % 11
+  d2\!\crescMolto cis | % 11
   d4. d8 cis2 | % 12
   c2. c4 | % 13
-  h8.\endCrescMolto\f h16 h4 r2\fermata | % 14
+  h8.\!\f h16 h4 r2\fermata | % 14
   h8.\ff h16 cis4 dis e | % 15
   fis e~( \times 2/3 {e8[ dis cis])} h4 | % 16
   his4( cis8.) cis16 fis4( e8[ dis]) | % 17
@@ -40,16 +37,30 @@ IIISanctusSMusic = \relative c'' {
   e1 | % 34
   e2 r2 \bar"|."
 }
+\addQuote "SanctusSMusic" { \SanctusSMusic }
 
-IIISanctusAMusic = \relative c'' {
+SanctusSLyrics = \lyricmode {
+  Sanc -- tus
+  % 10
+  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
+  % 15
+  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
+  % 20
+  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et __ ter -- ra glo -- ri -- a __
+  % 25
+  tu -- a ho --
+  % 30
+  san -- na ho -- san -- na! __ in ex -- cel -- sis!
+}
+
+SanctusAMusic = \relative c'' {
   R1*7 | % 8
-  \setCrescPoco
-  a4.(\crescPoco cis,8) fis2\endCrescPoco | 
+  a4.(\crescPoco cis,8) fis2\! |
   R1 | \barNumberCheck #10
-  \setCrescMolto eis2\crescMolto fis | % 11
+  eis2\crescMolto fis | % 11
   eis4. eis8 fis2 | % 12
   g2. e4 | % 13
-  dis8.\endCrescMolto\f dis16 dis4 r2\fermata | % 14
+  dis8.\!\f dis16 dis4 r2\fermata | % 14
   h8.\ff h16 cis4 dis e | % 15
   fis e~( \times 2/3 {e8[ dis cis])} h4 | % 16
   his4( cis8.) cis16 fis4( e8[ dis]) | % 17
@@ -70,21 +81,36 @@ IIISanctusAMusic = \relative c'' {
   fis4 r fis^\pocoAllarg a | % 33
   a2( fis) | % 34
   gis2 r2 \bar"|."
-  
+
+}
+\addQuote "SanctusAMusic" { \SanctusAMusic }
+
+SanctusALyrics = \lyricmode {
+  Sanc -- tus
+  % 10
+  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
+  % 15
+  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
+  % 20
+  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra glo -- ri -- a __
+  % 25
+  tu -- a ho -- san -- na ho --
+  % 30
+  san -- na ho -- san -- na! __ in ex -- cel -- sis!
 }
 
-IIISanctusTMusic = \relative c' {
+SanctusTMusic = \relative c' {
   R1*4 | % 5
-  e4.(\p gis,8) cis2 | 
+  e4.(\p gis,8) cis2 |
   R1*4 | \barNumberCheck #10
-  \setCrescMolto h2\crescMolto cis | % 11
+  h2\crescMolto cis | % 11
   h4. h8 cis2 | % 12
   e2. g,4 | % 13
-  <fis a>8.\endCrescMolto\f <fis a>16 <fis a>4 r2\fermata | % 14
+  <fis a>8.\!\f <fis a>16 <fis a>4 r2\fermata | % 14
   h8.\ff h16 cis4 dis e | % 15
   fis e~( \times 2/3{ e8[ dis cis])} h4 | % 16
   his4( cis8.) cis16 fis4( e8[ dis]) | % 17
-  e4 e r2 | % 18 
+  e4 e r2 | % 18
   cis8. cis16 dis4 eis fis | % 19
   gis fis~( \times 2/3 {fis8[ eis dis])} cis4 | \barNumberCheck #20
   cisis4( dis8.) dis16 gis4( fis8[ eis]) | % 21
@@ -103,15 +129,30 @@ IIISanctusTMusic = \relative c' {
   h1 | % 34
   h2 r2 \bar"|."
 }
+\addQuote "SanctusTMusic" { \SanctusTMusic }
 
-IIISanctusBMusic = \relative c' {
+SanctusTLyrics = \lyricmode {
+  Sanc -- tus
+  % 10
+  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
+  % 15
+  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
+  % 20
+  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra glo -- ri -- a __
+  % 25
+  tu -- a ho -- san -- na ho -- san -- na ho --
+  % 30
+  san -- na ho -- san -- na! __ in ex -- cel -- sis!
+}
+
+SanctusBMusic = \relative c' {
   R1 | % 2
-  h4.(\p e,8) gis2 | 
+  h4.(\p e,8) gis2 |
   R1*7 | \barNumberCheck #10
-  \setCrescMolto gis2\crescMolto a | % 11
+  gis2\crescMolto a | % 11
   gis4. gis8 a2 | % 12
   b2. b,4 | % 13
-  h8.\endCrescMolto\f h16 h4 r2\fermata | % 14
+  h8.\!\f h16 h4 r2\fermata | % 14
   h8.\ff h16 cis4 dis e | % 15
   fis e~( \times 2/3 {e8[ dis cis])} h4 | % 16
   his4( cis8.) cis16 fis4( e8[ dis]) | % 17
@@ -134,68 +175,27 @@ IIISanctusBMusic = \relative c' {
   e1 | % 34
   e2 r2 \bar"|."
 }
+\addQuote "SanctusBMusic" { \SanctusBMusic }
 
-IIISanctusSLyrics = \lyricmode {
+SanctusBLyrics = \lyricmode {
   Sanc -- tus
   % 10
   Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
   % 15
   et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
   % 20
-  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et __ ter -- ra glo -- ri -- a __ 
-  % 25 
-  tu -- a ho -- 
-  % 30 
+  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et __ ter -- ra glo -- ri -- a __
+  % 25
+  tu -- a ho -- san -- na ho -- san -- na ho -- san -- na ho --
+  % 30
   san -- na ho -- san -- na! __ in ex -- cel -- sis!
 }
 
-IIISanctusALyrics = \lyricmode {
-  Sanc -- tus
-  % 10
-  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
-  % 15
-  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
-  % 20
-  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra glo -- ri -- a __ 
-  % 25 
-  tu -- a ho -- san -- na ho -- 
-  % 30 
-  san -- na ho -- san -- na! __ in ex -- cel -- sis!
+SanctusOIdynamicsMusic = {
 }
-
-IIISanctusTLyrics = \lyricmode {
-  Sanc -- tus
-  % 10
-  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
-  % 15
-  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
-  % 20
-  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra glo -- ri -- a __ 
-  % 25 
-  tu -- a ho -- san -- na ho -- san -- na ho -- 
-  % 30 
-  san -- na ho -- san -- na! __ in ex -- cel -- sis!
-}
-
-IIISanctusBLyrics = \lyricmode {
-  Sanc -- tus
-  % 10
-  Sanc -- tus Do -- mi -- nus De -- us Sa -- ba -- oth Ple -- ni sunt coe -- li
-  % 15
-  et ter -- ra glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et ter -- ra
-  % 20
-  glo -- ri -- a __ tu -- a ple -- ni sunt coe -- li et __ ter -- ra glo -- ri -- a __ 
-  % 25 
-  tu -- a ho -- san -- na ho -- san -- na ho -- san -- na ho -- 
-  % 30 
-  san -- na ho -- san -- na! __ in ex -- cel -- sis!
+SanctusOIpedalMusic = {
 }
-
-IIISanctusOIdynamicsMusic = { 
-}
-IIISanctusOIpedalMusic = { 
-}
-IIISanctusOIrIMusic = \relative c' {
+SanctusOIrIMusic = \relative c' {
   \oneV\slurUp
   r8 <h e gis h>4( <h e gis h> <h e gis h> <h e gis h>8) | % 2
   r8 <h e gis h>4( <h e gis h> <h e gis h> <h e gis h>8) | % 3
@@ -229,9 +229,9 @@ IIISanctusOIrIMusic = \relative c' {
   r8 <cis fis a cis>4 <cis fis a cis>4 <cis fis a cis>4 <cis fis a cis>8 | % 31
   <fis a cis>1~ | % 32
   <fis a cis>4 r <fis a cis>\marcato <fis a dis>\marcato | % 33
-  << { <h e>1~ | <h e>2 } \\ {a2 fis | gis } >> r2 \bar"|."  
+  << { <h e>1~ | <h e>2 } \\ {a2 fis | gis } >> r2 \bar"|."
 }
-IIISanctusOIlIMusic = \relative c, {
+SanctusOIlIMusic = \relative c, {
   \oneV\slurDown
   e8.[( fis16] gis8.[ h16] e8.[ fis16] gis16[ fis e8]) | % 2
   e,8.[( fis16] gis8.[ h16] e8.[ fis16] gis16[ fis e8]) | % 3
@@ -263,19 +263,19 @@ IIISanctusOIlIMusic = \relative c, {
   e,8.[( fis16] gis8.[ cis16] e8.[ fis16] gis16[ fis e8]) | % 29
   e,8.[( fis16] a8.[ cis16] e8.[ fis16] a16[ fis e8]) | \barNumberCheck #30
   e,8.[( fis16] a8.[ cis16] e8.[ fis16] a16[ fis e8]) | % 31
-  << 
-    { <a cis>1~ | <a cis>4 } \\ 
-    { <e e,>1~ | <e e,>4 } 
+  <<
+    { <a cis>1~ | <a cis>4 } \\
+    { <e e,>1~ | <e e,>4 }
   >> r4 <e a cis>\marcato <e a cis>\marcato | % 33
-  << 
+  <<
     { <e h'>1~ | <e h'>2 } \\
     { e,1~ | e2 }
   >> r2 \bar"|."
 }
 
-IIISanctusOIIdynamicsMusic = {
+SanctusOIIdynamicsMusic = {
 }
-IIISanctusOIIrIMusic = \relative c'' {
+SanctusOIIrIMusic = \relative c'' {
   \oneV
   R1*2 | % 3
   r2 <h e gis h>2 | % 4
@@ -302,9 +302,9 @@ IIISanctusOIIrIMusic = \relative c'' {
   R1 | % 32
   <cis fis a>4\marcato r <cis fis a>\marcato r | % 33
   << {\vOne  a'2 fis | gis } \\ {<h, e>1~  | <h e>2 } >> r2 \bar"|."
-  
+
 }
-IIISanctusOIIlIMusic = \relative c' {
+SanctusOIIlIMusic = \relative c' {
   \oneV \clef "treble"
   R1*2 | % 3
   <h e gis>2 r |
@@ -319,7 +319,7 @@ IIISanctusOIIlIMusic = \relative c' {
   <h dis fis a>2 r\fermata | % 14
   R1*3 | % 17
   \clef "bass" cis,,8.[( dis16] e8.[ gis16] cis8.[ dis16] e16[ dis cis8]) | % 18
-  R1*3 | 
+  R1*3 |
   dis,8.[( eis16] fis8.[ ais16] dis8.[ eis16] fis16[ eis dis8]) | % 22
   R1*3 | % 25
   a'8.[( fis16] dis8.[ cis16] h8.[ ais16] a16[ gis fis8] | % 26
@@ -333,10 +333,10 @@ IIISanctusOIIlIMusic = \relative c' {
   << { a'2 fis | gis } \\ { <h, e>1~ | <h e>2} >> r2 \bar"|."
 }
 
-IIISanctusOIIbassMusic = \relative c, { 
+SanctusOIIbassMusic = \relative c, {
   e1~\p | % 2
   e~ | % 3
-  e~ | % 4 
+  e~ | % 4
   e~ | % 5
   e~ | % 6
   e~ | % 7
@@ -355,33 +355,33 @@ IIISanctusOIIbassMusic = \relative c, {
   R1 | % 32
   e'4\marcato r e\marcato r | % 33
   e,1~ | % 34
-  e2 r \bar"|."  
+  e2 r \bar"|."
 }
 
-IIISanctusOIIlClef = \clef "treble"
+SanctusOIIlClef = \clef "treble"
 
-IIISanctusOIrStaff = \context Staff = "IIISanctusOIrSt" <<
-  \context Voice= "IIISanctusOIrIVoice" { \IIISanctusSettings \IIISanctusKey \OIrClef \IIISanctusOIrIMusic }
+SanctusOIrStaff = \context Staff = "SanctusOIrSt" <<
+  \context Voice= "SanctusOIrIVoice" { \SanctusSettings \SanctusKey \OIrClef \SanctusOIrIMusic }
 >>
-IIISanctusOIlStaff = \context Staff = "IIISanctusOIlSt" <<
-  \context Voice= "IIISanctusOIlIVoice" { \vOne\IIISanctusSettings \IIISanctusKey \OIlClef \IIISanctusOIlIMusic }
+SanctusOIlStaff = \context Staff = "SanctusOIlSt" <<
+  \context Voice= "SanctusOIlIVoice" { \vOne\SanctusSettings \SanctusKey \OIlClef \SanctusOIlIMusic }
 >>
-IIISanctusOIStaff = \context PianoStaff = "IIISanctusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
-  \IIISanctusOIrStaff
-%   \new Dynamics = "IIISanctusOIdynamicsSt" \IIISanctusOIdynamicsMusic
-  \IIISanctusOIlStaff
-%   \new Dynamics = "IIISanctusOIpedalSt" \IIISanctusOIpedalMusic
+SanctusOIStaff = \context PianoStaff = "SanctusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
+  \SanctusOIrStaff
+%   \new Dynamics = "SanctusOIdynamicsSt" \SanctusOIdynamicsMusic
+  \SanctusOIlStaff
+%   \new Dynamics = "SanctusOIpedalSt" \SanctusOIpedalMusic
 >>
 
-IIISanctusOIIrStaff = \context Staff = "IIISanctusOIIrSt" <<
-  \context Voice= "IIISanctusOIIrIVoice" { \IIISanctusSettings \IIISanctusKey \OIIrClef \IIISanctusOIIrIMusic }
+SanctusOIIrStaff = \context Staff = "SanctusOIIrSt" <<
+  \context Voice= "SanctusOIIrIVoice" { \SanctusSettings \SanctusKey \OIIrClef \SanctusOIIrIMusic }
 >>
-IIISanctusOIIlStaff = \context Staff = "IIISanctusOIIlSt" <<
-  \context Voice= "IIISanctusOIIlIVoice" { \IIISanctusSettings \IIISanctusKey \IIISanctusOIIlClef \IIISanctusOIIlIMusic }
+SanctusOIIlStaff = \context Staff = "SanctusOIIlSt" <<
+  \context Voice= "SanctusOIIlIVoice" { \SanctusSettings \SanctusKey \SanctusOIIlClef \SanctusOIIlIMusic }
 >>
-IIISanctusOIIhandsStaff = \context PianoStaff = "IIISanctusOIIhandsSt" <<
-  \IIISanctusOIIrStaff
-%   \new Dynamics = "IIISanctusOIIdynamicsSt" \IIISanctusOIIdynamicsMusic
-  \IIISanctusOIIlStaff
-%   \new Dynamics = "IIISanctusOIpedalSt" \IIISanctusOIpedalMusic
+SanctusOIIhandsStaff = \context PianoStaff = "SanctusOIIhandsSt" <<
+  \SanctusOIIrStaff
+%   \new Dynamics = "SanctusOIIdynamicsSt" \SanctusOIIdynamicsMusic
+  \SanctusOIIlStaff
+%   \new Dynamics = "SanctusOIpedalSt" \SanctusOIpedalMusic
 >>
diff --git a/Vierne_MesseSolennelle_04_Benedictus.ly b/Vierne_MesseSolennelle_Music_04_Benedictus.ily
similarity index 73%
rename from Vierne_MesseSolennelle_04_Benedictus.ly
rename to Vierne_MesseSolennelle_Music_04_Benedictus.ily
index 85e5a5c3c5499e2a560fc73fc2937e87665fcc91..0da371879c70a5320bc1f7e82e5d94a93c6b6335 100644
--- a/Vierne_MesseSolennelle_04_Benedictus.ly
+++ b/Vierne_MesseSolennelle_Music_04_Benedictus.ily
@@ -1,22 +1,20 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
+\version "2.13.1"
 
-IVBenedictusPieceName = "Benedictus"
-IVBenedictusTempo = "Poco più vivo."
-IVBenedictusTempoNr = #84
-IVBenedictusTempoII = "A tempo."
-IVBenedictusTempoIINr = #72
+BenedictusPieceName = "Benedictus"
+BenedictusTempo = "Poco più vivo."
+BenedictusTempoNr = #84
+BenedictusTempoII = "A tempo."
+BenedictusTempoIINr = #72
 
 
-IVBenedictusKey = \notemode {
-  \key cis \minor
-}
-IVBenedictusSettings = \notemode {  
-  \tempo \IVBenedictusTempo 
-  \time 4/4
+BenedictusKey = \key cis \minor
+BenedictusTimeSignature = \time 4/4
+
+BenedictusSettings = \notemode {
+  \tempo \BenedictusTempo
 }
 
-IVBenedictusSMusic = \relative c'' {
+BenedictusSMusic = \relative c'' {
   R1*3 | % 4
   r2 r4 gis8\p gis | % 5
   gis4 gis r gis | % 6
@@ -36,7 +34,7 @@ IVBenedictusSMusic = \relative c'' {
   << { a( es'4.) des8 b[( ges]) } { s2 s4\< s4 } >> | % 36
   f8.\!\> f16 f4\! r2 | % 37
   R1*3 | \barNumberCheck #40
-  r8 r16 \setCrescMolto d'16\crescMolto d2 d4 | % 41
+  r8 r16 d'16\crescMolto d2 d4 | % 41
   R1 | % 42
   r8 r16 es16 es2 es4 | % 43
   R1 | % 44
@@ -45,7 +43,7 @@ IVBenedictusSMusic = \relative c'' {
   fis1 | % 47
   h,4 r r2 | % 48
   R1^\pocoRit | % 49
-  \tempo \IVBenedictusTempoII
+  \tempo \BenedictusTempoII
   R1*3 | % 52
   r2 r4 r8 r16 fis'\f | % 53
   fis4.( a,8) cis4 r8 r16 cis16\ff | % 54
@@ -54,8 +52,29 @@ IVBenedictusSMusic = \relative c'' {
   e1 | % 57
   e2 r \bar"|."
 }
+\addQuote "BenedictusSMusic" { \BenedictusSMusic }
 
-IVBenedictusAMusic = \relative c' {
+BenedictusSLyrics = \lyricmode {
+  Be -- ne --
+  % 5
+  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
+  % 25
+  Be -- ne -- dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
+  % 30
+  Be -- ne -- dic -- tus qui ve -- nit in
+  % 35
+  no -- mi -- ne Do -- mi -- ni
+  % 40
+  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
+  % 45
+  ho -- san -- na,
+  % 50
+  ho -- san -- na, ho -- san -- na! __
+  % 55
+  in ex -- cel -- sis!
+}
+
+BenedictusAMusic = \relative c' {
   R1*3 | % 4
   r2 r4 e8\p e | % 5
   e4 e r e | % 6
@@ -75,7 +94,7 @@ IVBenedictusAMusic = \relative c' {
   << { f( c'4.) b8 ges8[( es]) } { s2 s4\< s4 } >> | % 36
   es8.\!\> es16 es4\! r2 | % 37
   R1*3 | \barNumberCheck #40
-  r8 r16 \setCrescMolto a16\crescMolto a2 a4\endCrescMolto | % 41
+  r8 r16 a16\crescMolto a2 a4\! | % 41
   R1 | % 42
   r8 r16 a16 a2 a4 | % 43
   R1 | % 44
@@ -84,7 +103,7 @@ IVBenedictusAMusic = \relative c' {
   a1 | % 47
   a4 r r2 | % 48
   R1^\pocoRit | % 49
-  \tempo \IVBenedictusTempoII
+  \tempo \BenedictusTempoII
   R1*2 | % 51
   r2 r4 r8 r16 cis\f | % 52
   cis4.( fis,8) a4 r8 r16 a16 | % 53
@@ -94,8 +113,31 @@ IVBenedictusAMusic = \relative c' {
   a2( fis) | % 57
   gis2 r2 \bar"|."
 }
+\addQuote "BenedictusAMusic" { \BenedictusAMusic }
+
+BenedictusALyrics = \lyricmode {
+  Be -- ne --
+  % 5
+  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
+  % 15
+  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne
+  % 20
+  Do -- mi -- ni
+  % 30
+  Be -- ne -- dic -- tus qui ve -- nit in
+  % 35
+  no -- mi -- ne Do -- mi -- ni
+  % 40
+  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
+  % 45
+  ho -- san -- na,
+  % 50
+  ho -- san -- na, ho -- san -- na, ho -- san -- na! __
+  % 55
+  in ex -- cel -- sis!
+}
 
-IVBenedictusTMusic = \relative c' {
+BenedictusTMusic = \relative c' {
   R1*3 | % 4
   r2 r4 cis8\p cis | % 5
   cis4 cis r cis |
@@ -115,7 +157,7 @@ IVBenedictusTMusic = \relative c' {
   << {a( es'4.) des8 b[( ges]) } { s2 s4\< s4 } >> | % 36
   f8.\!\> f16 f4\! r2 | % 37
   R1*3 | \barNumberCheck #40
-  r8 r16 \setCrescMolto d'16\crescMolto d2 d4\endCrescMolto | % 41
+  r8 r16 d'16\crescMolto d2 d4\! | % 41
   R1 | % 42
   r8 r16 c16 c2 c4 | % 43
   R1 | % 44
@@ -134,8 +176,31 @@ IVBenedictusTMusic = \relative c' {
   h1 | % 57
   h2 r \bar"|."
 }
+\addQuote "BenedictusTMusic" { \BenedictusTMusic }
+
+BenedictusTLyrics = \lyricmode {
+  Be -- ne --
+  % 5
+  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
+  % 15
+  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne
+  % 20
+  Do -- mi -- ni
+  % 30
+  Be -- ne -- dic -- tus qui ve -- nit in
+  % 35
+  no -- mi -- ne Do -- mi -- ni
+  % 40
+  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
+  % 45
+  ho -- san -- na,
+  % 50
+  ho -- san -- na ho -- san -- na, ho -- san -- na, ho -- san -- na! __
+  % 55
+  in ex -- cel -- sis!
+}
 
-IVBenedictusBMusic = \relative c' {
+BenedictusBMusic = \relative c' {
   R1*15 | % 16
   r2 r4 gis8\p gis | % 17
   gis4 gis r gis | % 18
@@ -143,7 +208,7 @@ IVBenedictusBMusic = \relative c' {
   gis4(\< cis,4.) dis8 e8[ fis] | \barNumberCheck #20
   gis4.\!\> gis8 gis2 | % 21
   R1*19\! | \barNumberCheck #40
-  r8 r16 \setCrescMolto f16\crescMolto f2 f4\endCrescMolto | % 41
+  r8 r16 f16\crescMolto f2 f4\! | % 41
   R1 | % 42
   r8 r16 f16 f2 f4 | % 43
   R1 | % 44
@@ -152,7 +217,7 @@ IVBenedictusBMusic = \relative c' {
   h1 | % 47
   h,4 r r2 | % 48
   R1^\pocoRit | % 49
-  \tempo \IVBenedictusTempoII
+  \tempo \BenedictusTempoII
   r2 r4 r8 r16 h'16\f | \barNumberCheck #50
   h4.( e,8) gis4 r8 r16 gis16 | % 51
   gis4.( e8) e4 r8 r16 e16 | % 52
@@ -163,74 +228,11 @@ IVBenedictusBMusic = \relative c' {
   e1 | % 57
   e2 r2 \bar"|."
 }
+\addQuote "BenedictusBMusic" { \BenedictusBMusic }
 
-IVBenedictusSLyrics = \lyricmode {
-  Be -- ne -- 
-  % 5 
-  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
-  % 25
-  Be -- ne -- dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
-  % 30
-  Be -- ne -- dic -- tus qui ve -- nit in 
-  % 35 
-  no -- mi -- ne Do -- mi -- ni  
-  % 40
-  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
-  % 45
-  ho -- san -- na, 
-  % 50
-  ho -- san -- na, ho -- san -- na! __
-  % 55 
-  in ex -- cel -- sis!
-}
-
-IVBenedictusALyrics = \lyricmode {
-  Be -- ne -- 
-  % 5 
-  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
-  % 15
-  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne 
-  % 20
-  Do -- mi -- ni
-  % 30
-  Be -- ne -- dic -- tus qui ve -- nit in 
-  % 35 
-  no -- mi -- ne Do -- mi -- ni  
-  % 40
-  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
-  % 45
-  ho -- san -- na, 
-  % 50
-  ho -- san -- na, ho -- san -- na, ho -- san -- na! __
-  % 55 
-  in ex -- cel -- sis!
-}
-
-IVBenedictusTLyrics = \lyricmode {
-  Be -- ne -- 
-  % 5 
-  dic -- tus qui ve -- nit in no -- mi -- ne Do -- mi -- ni
+BenedictusBLyrics = \lyricmode {
   % 15
-  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne 
-  % 20
-  Do -- mi -- ni
-  % 30
-  Be -- ne -- dic -- tus qui ve -- nit in 
-  % 35 
-  no -- mi -- ne Do -- mi -- ni  
-  % 40
-  Ho -- san -- na, ho -- san -- na, ho -- san -- na,
-  % 45
-  ho -- san -- na,
-  % 50
-  ho -- san -- na ho -- san -- na, ho -- san -- na, ho -- san -- na! __
-  % 55 
-  in ex -- cel -- sis!
-}
-
-IVBenedictusBLyrics = \lyricmode {
-  % 15
-  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne 
+  Be -- ne -- dic -- tus, qui ve -- nit in no -- mi -- ne
   % 20
   Do -- mi -- ni
   % 40
@@ -239,15 +241,15 @@ IVBenedictusBLyrics = \lyricmode {
   ho -- san -- na, ho
   % 50
   san -- na, ho -- san -- na ho -- san -- na, ho -- san -- na, ho -- san -- na! __
-  % 55 
+  % 55
   in ex -- cel -- sis!
 }
 
-IVBenedictusOIdynamicsMusic = { 
+BenedictusOIdynamicsMusic = {
 }
-IVBenedictusOIpedalMusic = { 
+BenedictusOIpedalMusic = {
 }
-IVBenedictusOIrIMusic = \relative c' {
+BenedictusOIrIMusic = \relative c' {
   \oneV
   <e gis>4( <fis a> <gis h>2 | % 2
   <a cis>4 <h dis> \vOne s2 | %3
@@ -256,7 +258,7 @@ IVBenedictusOIrIMusic = \relative c' {
   R1*8 | % 13
   \slurUp
   <h,, dis>4( <cis e> <dis fis>2 | % 14
-  <e gis>4 <fis ais> \vOne s2 | % 15 
+  <e gis>4 <fis ais> \vOne s2 | % 15
   cis'4 h8[ ais] gis4 e' | % 16
   dis2.)  \oneV r4 | % 17
   R1*8 | % 25
@@ -291,7 +293,7 @@ IVBenedictusOIrIMusic = \relative c' {
   <fis a cis>4 r <fis a cis>4\marcato <fis a dis>\marcato | % 56
   << { <h e>1~ | <h e>2} \\ { a2 fis | gis } >> r2 \bar"|."
 }
-IVBenedictusOIrIIMusic = \relative c'' {
+BenedictusOIrIIMusic = \relative c'' {
   \vTwo
   s1 | % 2
   s2 <cis~ e>2 | % 3
@@ -305,9 +307,9 @@ IVBenedictusOIrIIMusic = \relative c'' {
   \stemUp g2 a \vTwo | % 28
   s1*6 | % 34
   \stemUp g2 a \vTwo | % 35
-  
+
 }
-IVBenedictusOIlIMusic = \relative c' {
+BenedictusOIlIMusic = \relative c' {
   \oneV e2 <dis fis>4 <cis e> | % 2
   <h dis>2 <a cis>4 <gis h> | % 3
   \vOne a h cis dis | % 4
@@ -350,7 +352,7 @@ IVBenedictusOIlIMusic = \relative c' {
   \vOne <e h'>1~ | % 57
   <e h'>2 r2 \bar"|."
 }
-IVBenedictusOIlIIMusic = \relative c {
+BenedictusOIlIIMusic = \relative c {
   \vTwo
   s1*2 | % 3
   fis1 | % 4
@@ -364,7 +366,7 @@ IVBenedictusOIlIIMusic = \relative c {
   des[( es f es] des[ c des es]) | % 28
   des[( es f es] des[ c des es]) | % 29
   des[( es f des] c[ a ges f]) | \barNumberCheck #30
-  s1*2 | % 32  
+  s1*2 | % 32
   des'8[( es f es] des[ c des es]) | % 33
   des[( es f es] des[ c des es]) | % 34
   des[( es f es] des[ c des es]) | % 35
@@ -386,9 +388,9 @@ IVBenedictusOIlIIMusic = \relative c {
   e2 r2 \bar"|."
 }
 
-IVBenedictusOIIdynamicsMusic = {
+BenedictusOIIdynamicsMusic = {
 }
-IVBenedictusOIIrIMusic = \relative c''' {
+BenedictusOIIrIMusic = \relative c''' {
   \oneV
   R1*8 | % 9
   <cis e>4( <h dis> <ais cis>2 | \barNumberCheck #10
@@ -417,7 +419,7 @@ IVBenedictusOIIrIMusic = \relative c''' {
   h[( cis dis cis] h[ ais a gis]) | % 47
   fis4 r r2 | % 48
   R1 | % 49
-  \tempo \IVBenedictusTempoII
+  \tempo \BenedictusTempoII
   R1 | \barNumberCheck #50
   r2 r4 <h e gis h> | % 51
   r2 r4 <cis e gis cis> | % 52
@@ -429,7 +431,7 @@ IVBenedictusOIIrIMusic = \relative c''' {
   a'2 fis | % 57
   gis r2 \bar"|."
 }
-IVBenedictusOIIrIIMusic = \relative c'' {
+BenedictusOIIrIIMusic = \relative c'' {
   \vTwo
   s1*10 | % 11
   dis4 cis8[ h] ais4 gis4~ | % 12
@@ -441,7 +443,7 @@ IVBenedictusOIIrIIMusic = \relative c'' {
   <h'' e>1~ | % 57
   <h e>2 r2 \bar"|."
 }
-IVBenedictusOIIlIMusic = \relative c, {
+BenedictusOIIlIMusic = \relative c, {
   \oneV
   \clef "bass" R1*8 | % 9
   <cis cis'>1~ | \barNumberCheck #10
@@ -479,7 +481,7 @@ IVBenedictusOIIlIMusic = \relative c, {
   << { a'2 fis | gis } \\ { <h, e>1~ | <h e>2} >> r2 \bar"|."
 }
 
-IVBenedictusOIIbassMusic = \relative c, { 
+BenedictusOIIbassMusic = \relative c, {
   R1*8 | % 9
   cis2 dis4 e | \barNumberCheck #10
   fis2 gis4 ais | % 11
@@ -517,34 +519,34 @@ IVBenedictusOIIbassMusic = \relative c, {
   e2 r \bar"|."
 }
 
-IVBenedictusOIIlClef = \clef "treble"
+BenedictusOIIlClef = \clef "treble"
 
-IVBenedictusOIrStaff = \context Staff="IVBenedictusOIrSt" <<
-  \context Voice="IVBenedictusOIrIVoice" { \IVBenedictusSettings \IVBenedictusKey \OIrClef \IVBenedictusOIrIMusic }
-  \context Voice="IVBenedictusOIrIIVoice" { \IVBenedictusSettings \IVBenedictusKey \OIrClef \IVBenedictusOIrIIMusic }
+BenedictusOIrStaff = \context Staff="BenedictusOIrSt" <<
+  \context Voice="BenedictusOIrIVoice" { \BenedictusSettings \BenedictusKey \OIrClef \BenedictusOIrIMusic }
+  \context Voice="BenedictusOIrIIVoice" { \BenedictusSettings \BenedictusKey \OIrClef \BenedictusOIrIIMusic }
 >>
-IVBenedictusOIlStaff = \context Staff = "IVBenedictusOIlSt" <<
-  \context Voice= "IVBenedictusOIlIVoice" { \vOne\IVBenedictusSettings \IVBenedictusKey \OIlClef \IVBenedictusOIlIMusic }
-%   \context Dynamics 
-  \context Voice= "IVBenedictusOIlIIVoice" { \vTwo\IVBenedictusSettings \IVBenedictusKey \OIlClef \IVBenedictusOIlIIMusic }
+BenedictusOIlStaff = \context Staff = "BenedictusOIlSt" <<
+  \context Voice= "BenedictusOIlIVoice" { \vOne\BenedictusSettings \BenedictusKey \OIlClef \BenedictusOIlIMusic }
+%   \context Dynamics
+  \context Voice= "BenedictusOIlIIVoice" { \vTwo\BenedictusSettings \BenedictusKey \OIlClef \BenedictusOIlIIMusic }
 >>
-IVBenedictusOIStaff = \context PianoStaff = "IVBenedictusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
-  \IVBenedictusOIrStaff
-%   \new Dynamics = "IVBenedictusOIdynamicsSt" \IVBenedictusOIdynamicsMusic
-  \IVBenedictusOIlStaff
-%   \new Dynamics = "IVBenedictusOIpedalSt" \IVBenedictusOIpedalMusic
+BenedictusOIStaff = \context PianoStaff = "BenedictusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
+  \BenedictusOIrStaff
+%   \new Dynamics = "BenedictusOIdynamicsSt" \BenedictusOIdynamicsMusic
+  \BenedictusOIlStaff
+%   \new Dynamics = "BenedictusOIpedalSt" \BenedictusOIpedalMusic
 >>
-% 
-IVBenedictusOIIrStaff = \context Staff = "IVBenedictusOIIrSt" <<
-  \context Voice= "IVBenedictusOIIrIVoice" << \vOne\IVBenedictusSettings \IVBenedictusKey \OIIrClef \IVBenedictusOIIrIMusic >>
-  \context Voice= "IVBenedictusOIIrIIVoice" << \vTwo\IVBenedictusSettings \IVBenedictusKey \OIIrClef \IVBenedictusOIIrIIMusic >>
+
+BenedictusOIIrStaff = \context Staff = "BenedictusOIIrSt" <<
+  \context Voice= "BenedictusOIIrIVoice" << \vOne\BenedictusSettings \BenedictusKey \OIIrClef \BenedictusOIIrIMusic >>
+  \context Voice= "BenedictusOIIrIIVoice" << \vTwo\BenedictusSettings \BenedictusKey \OIIrClef \BenedictusOIIrIIMusic >>
 >>
-IVBenedictusOIIlStaff = \context Staff = "IVBenedictusOIIlSt" <<
-  \context Voice= "IVBenedictusOIIlIVoice" { \vOne\IVBenedictusSettings \IVBenedictusKey \IVBenedictusOIIlClef \IVBenedictusOIIlIMusic }
+BenedictusOIIlStaff = \context Staff = "BenedictusOIIlSt" <<
+  \context Voice= "BenedictusOIIlIVoice" { \vOne\BenedictusSettings \BenedictusKey \BenedictusOIIlClef \BenedictusOIIlIMusic }
 >>
-IVBenedictusOIIhandsStaff = \context PianoStaff = "IVBenedictusOIIhandsSt" <<
-  \IVBenedictusOIIrStaff
-%   \new Dynamics = "IVBenedictusOIIdynamicsSt" \IVBenedictusOIIdynamicsMusic
-  \IVBenedictusOIIlStaff
-%   \new Dynamics = "IVBenedictusOIpedalSt" \IVBenedictusOIpedalMusic
+BenedictusOIIhandsStaff = \context PianoStaff = "BenedictusOIIhandsSt" <<
+  \BenedictusOIIrStaff
+%   \new Dynamics = "BenedictusOIIdynamicsSt" \BenedictusOIIdynamicsMusic
+  \BenedictusOIIlStaff
+%   \new Dynamics = "BenedictusOIpedalSt" \BenedictusOIpedalMusic
 >>
diff --git a/Vierne_MesseSolennelle_05_Agnus.ly b/Vierne_MesseSolennelle_Music_05_Agnus.ily
similarity index 68%
rename from Vierne_MesseSolennelle_05_Agnus.ly
rename to Vierne_MesseSolennelle_Music_05_Agnus.ily
index 63710f12032524dd09f1caf43aa4e238e7a04968..dfa3ee3a792138d93b45697285048f6f0faa2cb3 100644
--- a/Vierne_MesseSolennelle_05_Agnus.ly
+++ b/Vierne_MesseSolennelle_Music_05_Agnus.ily
@@ -1,70 +1,70 @@
-\version "2.11.35"
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
+\version "2.13.1"
 
-VAgnusPieceName = "Agnus Dei"
-VAgnusTempo = "Andante."
-VAgnusTempoNr = #92
-VAgnusTempoII = "A Tempo."
+AgnusPieceName = "Agnus Dei"
+AgnusTempo = "Andante."
+AgnusTempoNr = #92
+AgnusTempoII = "A Tempo."
 
-VAgnusKey =  \key cis \minor
-VAgnusKeyII =  \key h \minor
-VAgnusKeyIII =  \key fis \minor
-VAgnusKeyIV =  \key ais \minor
-VAgnusSettings = \notemode {  
-  \tempo \VAgnusTempo 
-  \time 3/4
+AgnusKey = \key cis \minor
+AgnusKeyII = \key h \minor
+AgnusKeyIII = \key fis \minor
+AgnusKeyIV = \key ais \minor
+AgnusTimeSignature = \time 3/4
+
+AgnusSettings = \notemode {
+  \tempo \AgnusTempo
 }
 
-VAgnusSMusic = \relative c'' {
+AgnusSMusic = \relative c'' {
   R2.*4 | % 5
   cis2\p h4 | % 6
   gis4( fis) gis | % 7
   a( h cis) | % 8
   fis,2 fis4 | % 9
-  \setCresc a4(\cresc gis fis) | \barNumberCheck #10
-  dis( e) c'\endcresc | % 11
-  \setDim h2.\dim | % 12
-  h2\enddim\p r4 | % 13
+  a4(\cresc gis fis) | \barNumberCheck #10
+  dis( e) c'\! | % 11
+  h2.\dim | % 12
+  h2\!\p r4 | % 13
   h2\f h4 | % 14
   d2\sf c4 | % 15
   h4.( a8 h[ c]) | % 16
   h2 r4 | % 17
   R2.*4 | % 21
-  \setCresc ais2\cresc fisis4 | % 22
-  fisis( gis) e'\endcresc | % 23
-  \setDim dis2.\dim | % 24
-  dis2\enddim\p r4 | % 25
+  ais2\cresc fisis4 | % 22
+  fisis( gis) e'\! | % 23
+  dis2.\dim | % 24
+  dis2\!\p r4 | % 25
   R2.*6 \bar"||"  % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   h2\p a4 | % 32
   fis4( e) fis | % 33
   g( a h) | % 34
   e,2 e4 | % 35
-  \setCresc g4(\cresc fis e) | % 36
+  g4(\cresc fis e) | % 36
   cis4( d) h' | % 37
-  \setDim a2.\endcresc\dim | % 38
-  a2\enddim\p r4 | % 39
+  a2.\!\dim | % 38
+  a2\!\p r4 | % 39
   a2\f a4 | \barNumberCheck #40
   c2 b4 | % 41
   a4.( g8 a[ b]) | % 42
   a2 r4 | % 43
   R2.*4 | % 47
-  \setCresc gis2\cresc eis4 | % 48
+  gis2\cresc eis4 | % 48
   eis( fis) d' | % 49
-  \setDim cis2.\endcresc\dim \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
-  cis2\enddim\p r4 | % 51
+  cis2.\!\dim \bar"||" \barNumberCheck #50
+  \AgnusKeyIII
+  cis2\!\p r4 | % 51
   R2.*15 | % 66
-  \setCrescMolto a2\crescMolto ais4 | % 67
+  a2\crescMolto ais4 | % 67
   h2 h4 | % 68
   r4 h( his) | % 69
   cis2 cis4 | \barNumberCheck #70
-  cis2.\endCrescMolto\f | % 71
+  cis2.\!\f | % 71
   d4( e) fis | % 72
   cis2.(^\pocoRit | % 73
-  \setDim d4\dim e) eis8 r\enddim \bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  d4\dim e) eis8 r\! \bar"||" % 74
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   fis2\subitopp fis4 | % 75
   fis( eis) dis | % 76
   gis,4.( ais8 his[ ais]) | % 77
@@ -73,13 +73,13 @@ VAgnusSMusic = \relative c'' {
   his( cis) dis | \barNumberCheck #80
   dis( cis fisis,) | % 81
   gis2. | % 82
-  \setCresc cis2(\cresc his4) | % 83
+  cis2(\cresc his4) | % 83
   h2( a8) r | % 84
   cis2( his4) | % 85
   gis2( fisis8) r | % 86
-  \setDim fis4.(\endcresc\dim gis8 ais[ cis] | % 87
+  fis4.(\!\dim gis8 ais[ cis] | % 87
   fis,4 eis dis) | % 88
-  cis4\enddim\p r r | % 89
+  cis4\!\p r r | % 89
   R2.*7 | % 96
   gis'2.(\< | % 97
   ais2.) | % 98
@@ -96,49 +96,87 @@ VAgnusSMusic = \relative c'' {
   R2.*4\! | % 112
   R2.^\fermataMarkup \bar"|."
 }
+\addQuote "AgnusSMusic" { \AgnusSMusic }
 
-VAgnusAMusic = \relative c' {
+AgnusSLyrics = \lyricmode {
+  % 5
+  A -- gnus Dei -- i, qui __ tol -- lis pec --
+  % 10
+  ca -- ta mun -- di, mi -- se -- re -- re
+  % 15
+  no -- bis,
+  % 20
+  mi -- se -- re -- re no -- bis!
+  % 30
+  A -- gnus De -- i qui __ tol -- lis
+  % 35
+  pec -- ca -- ta mun -- di mi -- se --
+  % 40
+  re -- re  no -- bis
+  % 45
+  mi -- se -- re -- re  no --
+  % 50
+  bis
+  % 65
+  A -- gnus De -- i qui tol -- lis
+  % 70
+  pec -- ca -- ta mun -- di do -- na
+  % 75
+  no -- bis pa -- cem do -- na no -- bis
+  % 80
+  pa -- cem do -- na no --
+  % 85
+  bis pa -- cem
+  % 95
+  Do -- na
+  % 100
+  no -- bis pa --
+  % 105
+  cem! __
+}
+
+AgnusAMusic = \relative c' {
   R2.*4 | % 5
   e2\p e4 | % 6
   e2 e4 |  % 7
   e4( dis cis) | % 8
   cis( his) cis | % 9
-  \setCresc dis2(\cresc his4) | \barNumberCheck #10
+  dis2(\cresc his4) | \barNumberCheck #10
   his4( cis) e | % 11
-  \setDim e4.(\endcresc\dim dis8[ cis dis]) | % 12
+  e4.(\!\dim dis8[ cis dis]) | % 12
   e2\p r4 | % 13
   R2.*8 | % 21
-  \setCresc dis4(\cresc e) e | % 22
+  dis4(\cresc e) e | % 22
   e( dis) gis | % 23
-  \setDim gis4.(\endcresc\dim fisis8 eis8[ fisis]) | % 24
-  gis2\enddim\p r4 | % 25
+  gis4.(\!\dim fisis8 eis8[ fisis]) | % 24
+  gis2\!\p r4 | % 25
   R2.*6 \bar"||" % 31
   \key h \minor
   d2\p d4 | % 32
   d2 d4 | % 33
   d4( cis h) | % 34
   h( ais) h | % 35
-  \setCresc cis2(\cresc ais4) | % 36
+  cis2(\cresc ais4) | % 36
   ais4( h) d | % 37
-  \setDim d4.(\endcresc\dim cis8[ h cis]) | % 38
-  d2\enddim\p r4 | % 39
+  d4.(\!\dim cis8[ h cis]) | % 38
+  d2\!\p r4 | % 39
   R2.*8 | % 47
-  \setCresc cis4(\cresc d) d | % 48
+  cis4(\cresc d) d | % 48
   d( cis) fis | % 49
-  \setDim fis4.(\endcresc\dim eis8 dis8[ eis]) \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
-  fis2\enddim\p r4 | % 51
+  fis4.(\!\dim eis8 dis8[ eis]) \bar"||" \barNumberCheck #50
+  \AgnusKeyIII
+  fis2\!\p r4 | % 51
   R2.*15 | % 66
-  \setCrescMolto fis2\crescMolto fis4 | % 67
+  fis2\crescMolto fis4 | % 67
   fis4( gis) a | % 68
   gis2. | % 69
   gis4( a) h | \barNumberCheck #70
-  a2.\endCrescMolto\f | % 71
+  a2.\!\f | % 71
   a2 a4 | % 72
   a2.~ | % 73
-  \setDim a2\dim a8 r\enddim \bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  a2\dim a8 r\! \bar"||" % 74
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   gis4(\subitopp ais) cis | % 75
   his( gis) fis | % 76
   eis2( disis4 | % 77
@@ -147,13 +185,13 @@ VAgnusAMusic = \relative c' {
   ais'4( gis) fis | \barNumberCheck #80
   eis2( disis4) | % 81
   eis4( dis d) | % 82
-  \setCresc cis2.\cresc | % 83
+  cis2.\cresc | % 83
   d2~ d8 r | % 84
   cis2. | % 85
   cis2~ cis8 r | % 86
-  \setDim cis2.(\endcresc\dim | % 87
+  cis2.(\!\dim | % 87
   his2.) | % 88
-  cis4\enddim\p r r | % 89
+  cis4\!\p r r | % 89
   R2.*7 | % 96
   eis2.~\< | % 97
   eis2. | % 98
@@ -170,61 +208,95 @@ VAgnusAMusic = \relative c' {
   R2.*4\! | % 112
   R2.^\fermataMarkup \bar"|."
 }
+\addQuote "AgnusAMusic" { \AgnusAMusic }
+
+AgnusALyrics = \lyricmode {
+  % 5
+  A -- gnus Dei -- i, qui __ tol -- lis pec --
+  % 10
+  ca -- ta mun -- di,
+  % 20
+  mi -- se -- re -- re no -- bis!
+  % 30
+  A -- gnus De -- i qui __ tol -- lis
+  % 35
+  pec -- ca -- ta mun -- di
+  % 45
+  mi -- se -- re -- re  no --
+  % 50
+  bis
+  % 65
+  A -- gnus De -- i qui tol -- lis
+  % 70
+  pec -- ca -- ta mun -- di do -- na
+  % 75
+  no -- bis pa -- cem do -- na no -- bis
+  % 80
+  pa -- cem do -- na no --
+  % 85
+  bis pa -- cem
+  % 95
+  Do -- na
+  % 100
+  no -- bis pa --
+  % 105
+  cem! __
+}
 
-VAgnusTMusic = \relative c' {
+AgnusTMusic = \relative c' {
   R2.*4 | % 5
   cis2\p cis4 | % 6
   cis2 cis4 | % 7
   cis4( h a) | % 8
   a2 a4 | % 9
-  \setCresc fis4(\cresc gis a) | \barNumberCheck #10
+  fis4(\cresc gis a) | \barNumberCheck #10
   a4( gis) g | % 11
-  \setDim fis(\endcresc\dim h a) | % 12
-  gis2\enddim\p r4 | % 13
+  fis(\!\dim h a) | % 12
+  gis2\!\p r4 | % 13
   R2.*4 | % 17
   h2\p h4 | % 18
   dis2\sf cis4 | % 19
   ais4.( gis8 ais8[ h]) | \barNumberCheck #20
   ais2 r4 | % 21
-  \setCresc fisis4(\cresc gis) ais | % 22
+  fisis4(\cresc gis) ais | % 22
   ais( h) cis | % 23
-  \setDim ais(\endcresc\dim dis cis) | % 24
-  h2\enddim\p r4 |% 25
+  ais(\!\dim dis cis) | % 24
+  h2\!\p r4 |% 25
   R2.*6 \bar"||"  % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   h2\p h4 | % 32
   h2 h4 | % 33
   h4( a g) | % 34
   g2 g4 | % 35
-  \setCresc e4(\cresc fis g) | % 36
+  e4(\cresc fis g) | % 36
   g( fis) f | % 37
-  \setDim e(\endcresc\dim a g) | % 38
-  fis2\enddim\p r4 | % 39
+  e(\!\dim a g) | % 38
+  fis2\!\p r4 | % 39
   R2.*4 | % 43
   a2\p a4 | % 44
   cis2 h4 | % 45
   gis4.( fis8 gis8[ a]) | % 46
   g2 r4 | % 47
-  \setCresc eis4(\cresc fis) gis | % 48
+  eis4(\cresc fis) gis | % 48
   gis( a) h | % 49
-  \setDim gis(\endcresc\dim cis h) \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
-  a2\enddim\p r4 | % 51
+  gis(\!\dim cis h) \bar"||" \barNumberCheck #50
+  \AgnusKeyIII
+  a2\!\p r4 | % 51
   R2.*11 | % 62
-  \setCrescPoco a2.\crescPoco | % 63
+  a2.\crescPoco | % 63
   h2 h4 | % 64
   cis( d e | % 65
   d2) cis4 | % 66
-  \setCrescMolto e(\endCrescPoco\crescMolto d) c | % 67
+  e(\!\crescMolto d) c | % 67
   h2 fis'4 | % 68
   fis( e d) | % 69
   cis2 g'4\breathe | \barNumberCheck #70
-  gis(\endCrescMolto\f fis e) | % 71
+  gis(\!\f fis e) | % 71
   d2( cis4~ | % 72
   cis8[ gis']) fis4( e) | % 73
-  \setDim d2\dim cis8 r\enddim\bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  d2\dim cis8 r\!\bar"||" % 74
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   his4(\subitopp cis4) eis | % 75
   dis( ais) his | % 76
   dis( cis his | % 77
@@ -233,13 +305,13 @@ VAgnusTMusic = \relative c' {
   fis( eis) dis | \barNumberCheck #80
   gis,4.( ais8 his8[ ais]) | % 81
   gis2. | % 82
-  \setCresc gis2.\cresc | % 83
+  gis2.\cresc | % 83
   a2~ a8 r | % 84
   gis2. | % 85
   a2~ a8 r | % 86
-  \setDim ais4.(\dim gis8 fis8[ gis] | % 87
+  ais4.(\dim gis8 fis8[ gis] | % 87
   ais4 gis fis) | % 88
-  eis\enddim\p r r | % 89
+  eis\!\p r r | % 89
   R2.*7 | % 96
   cis'2.~\< | % 97
   cis2. | % 98
@@ -256,57 +328,97 @@ VAgnusTMusic = \relative c' {
   R2.*4\! | % 112
   R2.-\fermataMarkup \bar"|."
 }
+\addQuote "AgnusTMusic" { \AgnusTMusic }
+
+AgnusTLyrics = \lyricmode {
+  % 5
+  A -- gnus Dei -- i, qui __ tol -- lis pec --
+  % 10
+  ca -- ta mun -- di, mi -- se -- re -- re
+  % 15
+  no -- bis,
+  % 20
+  mi -- se -- re -- re no -- bis!
+  % 30
+  A -- gnus De -- i qui __ tol -- lis
+  % 35
+  pec -- ca -- ta mun -- di
+  % 40
+  mi -- se -- re -- re
+  % 45
+  no -- bis mi -- se -- re -- re no --
+  % 50
+  bis
+  % 60
+  pec -- ca -- ta mun --
+  % 65
+  di A -- gnus De -- i qui tol -- lis
+  % 70
+  pec -- ca -- ta mun -- di do -- na
+  % 75
+  no -- bis pa -- cem do -- na no -- bis
+  % 80
+  pa -- cem do -- na no --
+  % 85
+  bis pa -- cem
+  % 95
+  Do -- na
+  % 100
+  no -- bis pa --
+  % 105
+  cem! __
+}
 
-VAgnusBMusic = \relative c {
+AgnusBMusic = \relative c {
   R2.*4 | % 5
   cis4(\p e) gis4 | % 6
   h( a) gis | % 7
   fis2. | % 8
   e4( dis) cis | % 9
-  \setCresc his2(\cresc gis4) | \barNumberCheck #10
+  his2(\cresc gis4) | \barNumberCheck #10
   cis2 ais4 | % 11
-  \setDim h2.\endcresc\dim | % 12
-  e2\enddim\p r4 | % 13
+  h2.\!\dim | % 12
+  e2\!\p r4 | % 13
   R2.*8 | % 21
-  \setCresc cis2\cresc cis4 | % 22
+  cis2\cresc cis4 | % 22
   h2 ais4 | % 23
-  \setDim dis2.\endcresc\dim | % 24
-  gis,2\enddim\p r4 | % 25
+  dis2.\!\dim | % 24
+  gis,2\!\p r4 | % 25
   R2.*6 \bar"||"  % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   h4(\p d) fis | % 32
   a( g) fis | % 33
   e2. | % 34
   d4( cis) h | % 35
-  \setCresc ais2(\cresc fis4) | % 36
+  ais2(\cresc fis4) | % 36
   h2 gis4 | % 37
-  \setDim a2.\endcresc\dim | % 38
-  d2\enddim\p r4 | % 39
+  a2.\!\dim | % 38
+  d2\!\p r4 | % 39
   R2.*8 | % 47
-  \setCresc h2\cresc h4 | % 48
+  h2\cresc h4 | % 48
   a2 gis4 | % 49
-  \setDim cis2.\endcresc\dim \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
-  fis,2\enddim\p r4 | % 51
+  cis2.\!\dim \bar"||" \barNumberCheck #50
+  \AgnusKeyIII
+  fis,2\!\p r4 | % 51
   R2.*7 | % 58
   e'2\p e4 | % 59
   fis2 fis4 | \barNumberCheck #60
   gis( a h) | % 61
   a2 gis4 | % 62
-  \setCrescPoco g2.\crescPoco | % 63
+  g2.\crescPoco | % 63
   fis2 fis4 | % 64
   e4( d cis | % 65
   h2) a4 | % 66
-  \setCrescMolto d2\endCrescPoco\crescMolto d4 | % 67
+  d2\!\crescMolto d4 | % 67
   dis2 dis4 | % 68
   e2. | % 69
   eis2 eis4 | \barNumberCheck #70
-  fis2.\endCrescMolto\f | % 71
+  fis2.\!\f | % 71
   fis2 fis4 | % 72
   fis2.~ | % 73
-  \setDim fis2\dim fisis8 r8\enddim \bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  fis2\dim fisis8 r8\! \bar"||" % 74
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   gis2\subitopp gis4 | % 75
   gis2 gis4 | % 76
   gis2.~( | % 77
@@ -315,13 +427,13 @@ VAgnusBMusic = \relative c {
   gis,4( ais) his | \barNumberCheck #80
   cis2. | % 81
   cis4( dis e) | % 82
-  \setCresc eis2.\cresc | % 83
+  eis2.\cresc | % 83
   fis2~ fis8 r | % 84
   eis2. | % 85
   e2~ e8 r | % 86
-  \setDim dis2.(\endcresc\dim | % 87
+  dis2.(\!\dim | % 87
   gis,) | % 88
-  cis4\enddim\p r r | % 89
+  cis4\!\p r r | % 89
   R2.*7 | % 96
   cis'2.(\< | % 97
   ais) | % 98
@@ -338,162 +450,54 @@ VAgnusBMusic = \relative c {
   R2.*4\! | % 112
   R2.-\fermataMarkup \bar"|."
 }
+\addQuote "AgnusBMusic" { \AgnusBMusic }
 
-VAgnusSLyrics = \lyricmode {
-  % 5
-  A -- gnus Dei -- i, qui __ tol -- lis pec -- 
-  % 10
-  ca -- ta mun -- di, mi -- se -- re -- re 
-  % 15
-  no -- bis, 
-  % 20
-  mi -- se -- re -- re no -- bis!
-  % 30
-  A -- gnus De -- i qui __ tol -- lis
-  % 35
-  pec -- ca -- ta mun -- di mi -- se -- 
-  % 40
-  re -- re  no -- bis
-  % 45
-  mi -- se -- re -- re  no --
-  % 50 
-  bis
-  % 65
-  A -- gnus De -- i qui tol -- lis 
-  % 70
-  pec -- ca -- ta mun -- di do -- na 
-  % 75
-  no -- bis pa -- cem do -- na no -- bis
-  % 80 
-  pa -- cem do -- na no -- 
-  % 85 
-  bis pa -- cem
-  % 95
-  Do -- na
-  % 100 
-  no -- bis pa --
-  % 105 
-  cem! __
-}
-
-VAgnusALyrics = \lyricmode {
-  % 5
-  A -- gnus Dei -- i, qui __ tol -- lis pec -- 
-  % 10
-  ca -- ta mun -- di, 
-  % 20
-  mi -- se -- re -- re no -- bis!
-  % 30
-  A -- gnus De -- i qui __ tol -- lis
-  % 35
-  pec -- ca -- ta mun -- di 
-  % 45
-  mi -- se -- re -- re  no --
-  % 50 
-  bis
-  % 65
-  A -- gnus De -- i qui tol -- lis 
-  % 70
-  pec -- ca -- ta mun -- di do -- na 
-  % 75
-  no -- bis pa -- cem do -- na no -- bis
-  % 80 
-  pa -- cem do -- na no -- 
-  % 85 
-  bis pa -- cem
-  % 95
-  Do -- na
-  % 100 
-  no -- bis pa --
-  % 105 
-  cem! __
-}
-
-VAgnusTLyrics = \lyricmode {
-  % 5
-  A -- gnus Dei -- i, qui __ tol -- lis pec -- 
-  % 10
-  ca -- ta mun -- di, mi -- se -- re -- re 
-  % 15
-  no -- bis, 
-  % 20
-  mi -- se -- re -- re no -- bis!
-  % 30
-  A -- gnus De -- i qui __ tol -- lis
-  % 35
-  pec -- ca -- ta mun -- di 
-  % 40 
-  mi -- se -- re -- re 
-  % 45
-  no -- bis mi -- se -- re -- re no --
-  % 50 
-  bis
-  % 60
-  pec -- ca -- ta mun --
-  % 65
-  di A -- gnus De -- i qui tol -- lis 
-  % 70
-  pec -- ca -- ta mun -- di do -- na 
-  % 75
-  no -- bis pa -- cem do -- na no -- bis
-  % 80 
-  pa -- cem do -- na no -- 
-  % 85 
-  bis pa -- cem
-  % 95
-  Do -- na
-  % 100 
-  no -- bis pa --
-  % 105 
-  cem! __
-}
-
-VAgnusBLyrics = \lyricmode {
+AgnusBLyrics = \lyricmode {
   % 5
-  A -- gnus Dei -- i, qui tol -- lis pec -- 
+  A -- gnus Dei -- i, qui tol -- lis pec --
   % 10
-  ca -- ta mun -- di, 
+  ca -- ta mun -- di,
   % 20
   mi -- se -- re -- re no -- bis!
   % 30
   A -- gnus De -- i qui __ tol -- lis
   % 35
-  pec -- ca -- ta mun -- di 
+  pec -- ca -- ta mun -- di
   % 45
   mi -- se -- re -- re  no --
-  % 50 
+  % 50
   bis
   % 55
-  A -- gnus De -- i 
+  A -- gnus De -- i
   % 60
   qui tol -- lis pec -- ca -- ta mun --
   % 65
-  di A -- gnus De -- i qui tol -- lis 
+  di A -- gnus De -- i qui tol -- lis
   % 70
-  pec -- ca -- ta mun -- di do -- na 
+  pec -- ca -- ta mun -- di do -- na
   % 75
   no -- bis pa -- cem do -- na no -- bis
-  % 80 
-  pa -- cem do -- na no -- 
-  % 85 
+  % 80
+  pa -- cem do -- na no --
+  % 85
   bis pa -- cem
   % 95
   Do -- na
-  % 100 
+  % 100
   no -- bis pa --
-  % 105 
+  % 105
   cem! __
 }
 
-VAgnusOIdynamicsMusic = { 
+AgnusOIdynamicsMusic = {
 }
-VAgnusOIpedalMusic = { 
+AgnusOIpedalMusic = {
 }
-VAgnusOIrIMusic = \relative c'' {
+AgnusOIrIMusic = \relative c'' {
   \oneV
   gis2.^( | % 2
   <fis a> | % 3
-  <gis h> | % 4 
+  <gis h> | % 4
   <fis his> | % 5
   \vOne cis'2)( h4 | % 6
   gis fis gis | % 7
@@ -517,7 +521,7 @@ VAgnusOIrIMusic = \relative c'' {
   dis2.~ | % 24
   dis2 r4 | % 25
   \oneV R2.*6 \bar"||" % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   \vOne h2( a4 | % 32
   fis e fis | % 33
   g a h | % 34
@@ -537,7 +541,7 @@ VAgnusOIrIMusic = \relative c'' {
   \clef "treble" gis'2 eis4~ | % 48
   eis fis d' | % 49
   cis2.~ \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   cis2 r4 | % 51
   \oneV R2.*7 | % 58
   \vOne r4 e4( dis~ | % 59
@@ -556,8 +560,8 @@ VAgnusOIrIMusic = \relative c'' {
   d4 e fis | % 72
   cis2. | % 73
   d4 e eis) \bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   fis2.~( | % 75
   fis4 eis dis | % 76
   gis,4. ais8 his[ ais] | % 77
@@ -590,7 +594,7 @@ VAgnusOIrIMusic = \relative c'' {
   R2.*4 | % 112
   R2.^\fermataMarkup
 }
-VAgnusOIrIIMusic = \relative c' {
+AgnusOIrIIMusic = \relative c' {
   \vTwo
   s2.*4 | % 5
   e2.~ | % 6
@@ -615,7 +619,7 @@ VAgnusOIrIIMusic = \relative c' {
   gis4. fisis8 eis[ fisis] | % 24
   gis2 r4 | % 25
   s2.*6 \bar"||"  % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   d2.~ | % 32
   d2.~ | % 33
   d4 cis h~ | % 34
@@ -636,7 +640,7 @@ VAgnusOIrIIMusic = \relative c' {
   cis'4 d2~ | % 48
   d4 cis fis~ | % 49
   fis4. eis8 dis8[ eis] \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII fis2 r4 | % 51
+  \AgnusKeyIII fis2 r4 | % 51
   s2.*7 | % 58
   r4 <e gis>2~ | % 59
   <e a>2.~ | \barNumberCheck #60
@@ -654,7 +658,7 @@ VAgnusOIrIIMusic = \relative c' {
   a~ | % 72
   a~ | % 73
   a \bar "||" % 74
-  \VAgnusKeyIV \tempo \VAgnusTempoII
+  \AgnusKeyIV \tempo \AgnusTempoII
   gis4 ais cis | % 75
   his gis fis | % 76
   eis2 disis4 | % 77
@@ -672,7 +676,7 @@ VAgnusOIrIIMusic = \relative c' {
   cis4 r r | % 89
   s2.*24 \bar"|."
 }
-VAgnusOIlIMusic = \relative c' {
+AgnusOIlIMusic = \relative c' {
   \clef "bass"
   \oneV R2.*2 | % 3
   e2. | % 4
@@ -698,7 +702,7 @@ VAgnusOIlIMusic = \relative c' {
   ais dis cis | % 24
   h2 r4 | % 25
   \oneV R2.*6 \bar"||" % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   \vOne h2.~ | % 32
   h2.~ | % 33
   h4 a g~ | % 34
@@ -718,7 +722,7 @@ VAgnusOIlIMusic = \relative c' {
   \vOne eis4 fis gis~ | % 48
   gis a h | % 49
   gis cis h \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   a2 r4 | % 51
   \oneV R2.*7 | % 58
   e2.( | % 59
@@ -738,7 +742,7 @@ VAgnusOIlIMusic = \relative c' {
   d2 cis4 | % 72
   gis'4 fis e | % 73
   d2 cis4 \bar"||" % 74
-  \VAgnusKeyIV \tempo \VAgnusTempoII
+  \AgnusKeyIV \tempo \AgnusTempoII
   his4 cis eis | % 75
   dis ais his | % 76
   dis cis his | % 77
@@ -770,7 +774,7 @@ VAgnusOIlIMusic = \relative c' {
   R2.*4 | % 112
   R2.^\fermataMarkup \bar"|."
 }
-VAgnusOIlIIMusic = \relative c {
+AgnusOIlIIMusic = \relative c {
   \vTwo
   s2.*4 | % 5
   cis4 e gis | % 6
@@ -793,7 +797,7 @@ VAgnusOIlIIMusic = \relative c {
   dis2. | % 24
   gis,2 r4 | % 25
   s2.*6 \bar"||" % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   h4 d fis | % 32
   a g fis | % 33
   e2. | % 34
@@ -811,8 +815,8 @@ VAgnusOIlIIMusic = \relative c {
   s2.*2 | % 47
   h2. | % 48
   a2 gis4 | % 49
-  cis2. \bar"||" \barNumberCheck #50 
-  \VAgnusKeyIII
+  cis2. \bar"||" \barNumberCheck #50
+  \AgnusKeyIII
   fis,2 r4 | % 51
   s2.*11 | % 62
   gis'2.( |
@@ -827,7 +831,7 @@ VAgnusOIlIIMusic = \relative c {
   fis2.~ |
   fis2.~ |
   fis2 g4) \bar"||" % 74
-  \VAgnusKeyIV
+  \AgnusKeyIV
   gis2.~ | % 75
   gis~ | % 76
   gis~ | % 77
@@ -843,9 +847,9 @@ VAgnusOIlIIMusic = \relative c {
   s2.*17 \bar"|."
 }
 
-VAgnusOIIdynamicsMusic = {
+AgnusOIIdynamicsMusic = {
 }
-VAgnusOIIrIMusic = \relative c' {
+AgnusOIIrIMusic = \relative c' {
   \oneV R2.*23 | % 24
   <h gis'>2.~ | % 25
   <h gis'>2.~ | % 26
@@ -854,9 +858,9 @@ VAgnusOIIrIMusic = \relative c' {
   cis4 dis e~ | % 29
   e dis d | \barNumberCheck #30
   cis fis e \bar"||" % 31
-  \VAgnusKeyII d4 r r | % 32
+  \AgnusKeyII d4 r r | % 32
   \oneV R2.*18 \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   \vOne r4 cis' d | % 51
   e d cis | % 52
   h2.~ | % 53
@@ -868,7 +872,7 @@ VAgnusOIIrIMusic = \relative c' {
   e4 r r | % 59
   \oneV
   R2.*15 \bar"||" \barNumberCheck #74
-  \VAgnusKeyIV \tempo \VAgnusTempoII
+  \AgnusKeyIV \tempo \AgnusTempoII
   R2.*14 | % 88
   \vOne cis'4. dis8 eis8[ dis] | % 89
   cis4 ais gis | \barNumberCheck #90
@@ -890,16 +894,16 @@ VAgnusOIIrIMusic = \relative c' {
   <cis eis gis cis>2.~ | % 112
   <cis eis gis cis>4)\fermata r4 r4 \bar"|."
 }
-VAgnusOIIrIIMusic = \relative c' {
+AgnusOIIrIIMusic = \relative c' {
   \vTwo
   s2.*26 | % 27
   gis4 fisis gis | % 28
   ais2 fisis4~ | % 29
   fisis gis h4~ | \barNumberCheck #30
   h4. ais8 gis8[ ais] \bar"||" % 31
-  \VAgnusKeyII h4 r4 r4 | % 32
+  \AgnusKeyII h4 r4 r4 | % 32
   s2.*18 \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   r4 a'2~ | % 51
   a2.~ | % 52
   a4 gis g | % 53
@@ -909,9 +913,9 @@ VAgnusOIIrIIMusic = \relative c' {
   a2.~ | % 57
   a4. fis8 gis[ a] | % 58
   gis4 r r | % 59
-  s2.*15 \bar"||" 
-  \tempo \VAgnusTempoII
-  \VAgnusKeyIV
+  s2.*15 \bar"||"
+  \tempo \AgnusTempoII
+  \AgnusKeyIV
   s2.*14 | % 88
   eis'4 fis gis8[ fis] | % 89
   eis4 dis his | \barNumberCheck #90
@@ -924,7 +928,7 @@ VAgnusOIIrIIMusic = \relative c' {
   cis2 r4 | % 97
   s2.*16 \bar"||"
 }
-VAgnusOIIlIMusic = \relative c'' {
+AgnusOIIlIMusic = \relative c'' {
   \oneV R2.*23 | % 24
   gis2( fis4 | % 25
   dis cis dis | % 26
@@ -933,10 +937,10 @@ VAgnusOIIlIMusic = \relative c'' {
   e4( dis cis | % 29
   ais h g' | \barNumberCheck #30
   fis2.~ \bar"||" % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   fis4) r r | % 32
   R2.*18 \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   r4 fis2~ | % 51
   fis2.~ | % 52
   fis4 e dis | % 53
@@ -947,7 +951,7 @@ VAgnusOIIlIMusic = \relative c'' {
   h4. a8 h[ c] | % 58
   h4 r r | % 59
   R2.*15 \bar"||" % 74
-  \tempo \VAgnusTempoII \VAgnusKeyIV
+  \tempo \AgnusTempoII \AgnusKeyIV
   R2.*14 | % 88
   \vOne gis'4 ais his8[ ais] | % 89
   gis4 fis dis | \barNumberCheck #90
@@ -970,10 +974,10 @@ VAgnusOIIlIMusic = \relative c'' {
   <gis cis eis>2.~ | % 112
   <gis cis eis>4\fermata r4 r \bar"|."
 }
-VAgnusOIIlIIMusic = \relative c' {
+AgnusOIIlIIMusic = \relative c' {
   \vTwo
   s2.*73 \bar"||" % 74
-  \tempo \VAgnusTempoII \VAgnusKeyIV
+  \tempo \AgnusTempoII \AgnusKeyIV
   s2.*14 | % 88
   \vTwo
   cis2.~ | % 89
@@ -988,7 +992,7 @@ VAgnusOIIlIIMusic = \relative c' {
   s2.*16 \bar"|."
 }
 
-VAgnusOIIbassMusic = \relative c { 
+AgnusOIIbassMusic = \relative c {
   R2.*23 | % 24
   gis4 h dis | % 25
   fis e dis | % 26
@@ -997,22 +1001,22 @@ VAgnusOIIbassMusic = \relative c {
   fisis2 dis4 | % 29
   gis2 eis4 | \barNumberCheck #30
   fis2. \bar"||"  % 31
-  \VAgnusKeyII
+  \AgnusKeyII
   h4 r r | % 32
   R2.*18 \bar"||" \barNumberCheck #50
-  \VAgnusKeyIII
+  \AgnusKeyIII
   fis'2(\f e4 | % 51
   cis h cis | % 52
   d e fis | % 53
   h,2.) | % 54
   d4( cis h | % 55
   gis a fis' | %  56
-  \setDim e2.~\dim | % 57
+  e2.~\dim | % 57
   e~ | % 58
-  e4)\enddim r r | % 59
+  e4)\! r r | % 59
   R2.*15 \bar"||" % 74
-  \VAgnusKeyIV
-  \tempo \VAgnusTempoII
+  \AgnusKeyIV
+  \tempo \AgnusTempoII
   gis,2.~ | % 75
   gis~ | % 76
   gis~ | % 77
@@ -1039,38 +1043,38 @@ VAgnusOIIbassMusic = \relative c {
   cis2 r4 | \barNumberCheck #110
   cis2.~( | % 111
   cis~ | % 112
-  cis4)\fermata r4 r \bar"|."  
+  cis4)\fermata r4 r \bar"|."
 }
 
-VAgnusOIIlClef = \clef "treble"
+AgnusOIIlClef = \clef "treble"
 
-VAgnusOIrStaff = \context Staff = "VAgnusOIrSt" <<
-  \context Voice= "VAgnusOIrIVoice" << \vOne\VAgnusSettings \VAgnusKey \OIrClef \VAgnusOIrIMusic >>
-  \context Voice= "VAgnusOIrIIVoice" << \vTwo\VAgnusSettings \VAgnusKey \OIrClef \VAgnusOIrIIMusic >>
+AgnusOIrStaff = \context Staff = "AgnusOIrSt" <<
+  \context Voice= "AgnusOIrIVoice" << \vOne\AgnusSettings \AgnusKey \OIrClef \AgnusOIrIMusic >>
+  \context Voice= "AgnusOIrIIVoice" << \vTwo\AgnusSettings \AgnusKey \OIrClef \AgnusOIrIIMusic >>
 >>
-VAgnusOIlStaff = \context Staff = "VAgnusOIlSt" <<
-  \context Voice= "VAgnusOIlIVoice" { \vOne\VAgnusSettings \VAgnusKey \OIlClef \VAgnusOIlIMusic }
-%   \context Dynamics 
-  \context Voice= "VAgnusOIlIIVoice" { \vTwo\VAgnusSettings \VAgnusKey \OIlClef \VAgnusOIlIIMusic }
+AgnusOIlStaff = \context Staff = "AgnusOIlSt" <<
+  \context Voice= "AgnusOIlIVoice" { \vOne\AgnusSettings \AgnusKey \OIlClef \AgnusOIlIMusic }
+%   \context Dynamics
+  \context Voice= "AgnusOIlIIVoice" { \vTwo\AgnusSettings \AgnusKey \OIlClef \AgnusOIlIIMusic }
 >>
-VAgnusOIStaff = \context PianoStaff = "VAgnusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
-  \VAgnusOIrStaff
-%   \new Dynamics = "VAgnusOIdynamicsSt" \VAgnusOIdynamicsMusic
-  \VAgnusOIlStaff
-%   \new Dynamics = "VAgnusOIpedalSt" \VAgnusOIpedalMusic
+AgnusOIStaff = \context PianoStaff = "AgnusOISt" \with {instrumentName = \OIInstrumentName shortInstrumentName = \OIShortInstrumentName } <<
+  \AgnusOIrStaff
+%   \new Dynamics = "AgnusOIdynamicsSt" \AgnusOIdynamicsMusic
+  \AgnusOIlStaff
+%   \new Dynamics = "AgnusOIpedalSt" \AgnusOIpedalMusic
 >>
 
-VAgnusOIIrStaff = \context Staff = "VAgnusOIIrSt" <<
-  \context Voice= "VAgnusOIIrIVoice" << \vOne\VAgnusSettings \VAgnusKey \OIIrClef \VAgnusOIIrIMusic >>
-  \context Voice= "VAgnusOIIrIIVoice" << \vTwo\VAgnusSettings \VAgnusKey \OIIrClef \VAgnusOIIrIIMusic >>
+AgnusOIIrStaff = \context Staff = "AgnusOIIrSt" <<
+  \context Voice= "AgnusOIIrIVoice" << \vOne\AgnusSettings \AgnusKey \OIIrClef \AgnusOIIrIMusic >>
+  \context Voice= "AgnusOIIrIIVoice" << \vTwo\AgnusSettings \AgnusKey \OIIrClef \AgnusOIIrIIMusic >>
 >>
-VAgnusOIIlStaff = \context Staff = "VAgnusOIIlSt" <<
-  \context Voice= "VAgnusOIIlIVoice" { \vOne\VAgnusSettings \VAgnusKey \VAgnusOIIlClef \VAgnusOIIlIMusic }
-  \context Voice= "VAgnusOIIlIIVoice" { \vTwo\VAgnusSettings \VAgnusKey \VAgnusOIIlClef \VAgnusOIIlIIMusic }
+AgnusOIIlStaff = \context Staff = "AgnusOIIlSt" <<
+  \context Voice= "AgnusOIIlIVoice" { \vOne\AgnusSettings \AgnusKey \AgnusOIIlClef \AgnusOIIlIMusic }
+  \context Voice= "AgnusOIIlIIVoice" { \vTwo\AgnusSettings \AgnusKey \AgnusOIIlClef \AgnusOIIlIIMusic }
 >>
-VAgnusOIIhandsStaff = \context PianoStaff = "VAgnusOIIhandsSt" <<
-  \VAgnusOIIrStaff
-%   \new Dynamics = "VAgnusOIIdynamicsSt" \VAgnusOIIdynamicsMusic
-  \VAgnusOIIlStaff
-%   \new Dynamics = "VAgnusOIpedalSt" \VAgnusOIpedalMusic
+AgnusOIIhandsStaff = \context PianoStaff = "AgnusOIIhandsSt" <<
+  \AgnusOIIrStaff
+%   \new Dynamics = "AgnusOIIdynamicsSt" \AgnusOIIdynamicsMusic
+  \AgnusOIIlStaff
+%   \new Dynamics = "AgnusOIpedalSt" \AgnusOIpedalMusic
 >>
diff --git a/Vierne_MesseSolennelle_OI.ly b/Vierne_MesseSolennelle_OI.ly
deleted file mode 100644
index 21d50d487ecd58faa5cf7b5563316b8cfdcd6c95..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_OI.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_Instrument.ly"
-
-#(set-default-paper-size "a4" 'landscape)
-\header { instrument = "Orgue de choeur" }
-
-\createScore #"IKyrie" #'("OI")
-\createScore #"IIGloria" #'("OI")
-\createScore #"IIISanctus" #'("OI")
-\createScore #"IVBenedictus" #'("OI")
-\createScore #"VAgnus" #'("OI")
diff --git a/Vierne_MesseSolennelle_OI.pdf b/Vierne_MesseSolennelle_OI.pdf
deleted file mode 100644
index 1c416963a406fb7dc5c3ae704fd966c53202eea4..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_OI.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_OII.ly b/Vierne_MesseSolennelle_OII.ly
deleted file mode 100644
index 345cb5da7d2d09bf3ce7b76b631ae5e9dae946d6..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_OII.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_Instrument.ly"
-
-#(set-default-paper-size "a4" 'landscape)
-\header { instrument = "Grand Orgue" }
-
-\createScore #"IKyrie" #'("OII")
-\createScore #"IIGloria" #'("OII")
-\createScore #"IIISanctus" #'("OII")
-\createScore #"IVBenedictus" #'("OII")
-\createScore #"VAgnus" #'("OII")
diff --git a/Vierne_MesseSolennelle_OII.pdf b/Vierne_MesseSolennelle_OII.pdf
deleted file mode 100644
index a8c215eaec45a1f101b03f2c3600385420415bcd..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_OII.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_S.ly b/Vierne_MesseSolennelle_S.ly
deleted file mode 100644
index d08d3f6742e2e696f5c63226936a36abcc967924..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_S.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_VocalVoice.ly"
-
-\header { instrument = "Soprano" }
-
-\createScore #"IKyrie" #'("S")
-\createScore #"IIGloria" #'("S")
-\createScore #"IIISanctus" #'("S")
-\createScore #"IVBenedictus" #'("S")
-\createScore #"VAgnus" #'("S")
diff --git a/Vierne_MesseSolennelle_S.pdf b/Vierne_MesseSolennelle_S.pdf
deleted file mode 100644
index 77c7067c8d0074e7d85fda9043fb93204e4b5d46..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_S.pdf and /dev/null differ
diff --git a/Vierne_MesseSolennelle_Score_Choral.ly b/Vierne_MesseSolennelle_Score_Choral.ly
new file mode 100644
index 0000000000000000000000000000000000000000..e2b5bde1cd20e30dd0ed0ca1a4ac63c07a42c569
--- /dev/null
+++ b/Vierne_MesseSolennelle_Score_Choral.ly
@@ -0,0 +1,16 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \ChoralScoreTitle
+  scorenumber = \markup{\scoreNumber \ChoralScoreNumber}
+}
+
+\createNoCuesScore #"Kyrie" #'("ChoralScore")
+\createNoCuesScore #"Gloria" #'("ChoralScore")
+\createNoCuesScore #"Sanctus" #'("ChoralScore")
+\createNoCuesScore #"Benedictus" #'("ChoralScore")
+\createNoCuesScore #"Agnus" #'("ChoralScore")
+
diff --git a/Vierne_MesseSolennelle_Score_Organ.ly b/Vierne_MesseSolennelle_Score_Organ.ly
new file mode 100644
index 0000000000000000000000000000000000000000..c7d9e733d3c2fa8212497c8af29afe7f6b38b57e
--- /dev/null
+++ b/Vierne_MesseSolennelle_Score_Organ.ly
@@ -0,0 +1,16 @@
+\version "2.13.1"
+\include "Vierne_MesseSolennelle_Settings_VocalScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \OrganScoreTitle
+  scorenumber = \markup{\scoreNumber \OrganScoreNumber}
+}
+
+\createNoCuesScore #"Kyrie" #'("OrganScore")
+\createNoCuesScore #"Gloria" #'("OrganScore")
+\createNoCuesScore #"Sanctus" #'("OrganScore")
+\createNoCuesScore #"Benedictus" #'("OrganScore")
+\createNoCuesScore #"Agnus" #'("OrganScore")
+
diff --git a/Vierne_MesseSolennelle_Settings.ily b/Vierne_MesseSolennelle_Settings.ily
new file mode 100644
index 0000000000000000000000000000000000000000..930e2e63eb627957d0ddd2b5d835224924b5a4b1
--- /dev/null
+++ b/Vierne_MesseSolennelle_Settings.ily
@@ -0,0 +1,12 @@
+#(set-default-paper-size "a4")
+#(ly:set-option 'point-and-click #f)
+
+\include "deutsch.ly"
+
+\include "Vierne_MesseSolennelle_Settings_Global.ily"
+\include "Vierne_MesseSolennelle_Music_01_Kyrie.ily"
+\include "Vierne_MesseSolennelle_Music_02_Gloria.ily"
+\include "Vierne_MesseSolennelle_Music_03_Sanctus.ily"
+\include "Vierne_MesseSolennelle_Music_04_Benedictus.ily"
+\include "Vierne_MesseSolennelle_Music_05_Agnus.ily"
+
diff --git a/Vierne_MesseSolennelle_Settings.ly b/Vierne_MesseSolennelle_Settings.ly
deleted file mode 100644
index 3e1b0fd9f6176783becbb0f3c38488ff6c75f79f..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_Settings.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-
-#(set-default-paper-size "a4")
-#(ly:set-option 'point-and-click #f)
-
-\include "Vierne_MesseSolennelle_Settings_Global.ly"
-\include "Vierne_MesseSolennelle_01_Kyrie.ly"
-\include "Vierne_MesseSolennelle_02_Gloria.ly"
-\include "Vierne_MesseSolennelle_03_Sanctus.ly"
-\include "Vierne_MesseSolennelle_04_Benedictus.ly"
-\include "Vierne_MesseSolennelle_05_Agnus.ly"
diff --git a/Vierne_MesseSolennelle_Settings_FullScore.ily b/Vierne_MesseSolennelle_Settings_FullScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..f169dc1f90d9f58a637340a12bcf54afded81f78
--- /dev/null
+++ b/Vierne_MesseSolennelle_Settings_FullScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_fullscore.ily"
+\include "Vierne_MesseSolennelle_Settings.ily"
diff --git a/Vierne_MesseSolennelle_Settings_FullScore.ly b/Vierne_MesseSolennelle_Settings_FullScore.ly
deleted file mode 100644
index e23f36155177832af2ad71a0436cfd7723bfee33..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_Settings_FullScore.ly
+++ /dev/null
@@ -1,27 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-% changes to the global score settings for full scores
-\include "Vierne_MesseSolennelle_Settings.ly"
-
-#(set-default-paper-size "a4")
-#(set-global-staff-size 14.5)
-
-\paper {
-  systemSeparatorMarkup = \slashSeparator
-  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
-
-\layout {
-  \context {
-      \Score
-      \override VerticalAlignment #'max-stretch = #10000000
-  }
-}
-
-\header { 
-  titlepagetitle = \markup \center-column { \line {"Messe Solennelle"} \line {en \concat{ut\sharp} mineur} }
-  publisher = \markup \center-column { "Edition Kainhofer, 2008" \line{\scoreNumber \FullScoreNumber}}
-  ensemble = \markup { \fill-line { "Chant et Orgue" } }
-  instruments = \markup\null
-  scoretype = "Partitur / Full Score"
-}
-
diff --git a/Vierne_MesseSolennelle_Settings_Global.ly b/Vierne_MesseSolennelle_Settings_Global.ily
similarity index 52%
rename from Vierne_MesseSolennelle_Settings_Global.ly
rename to Vierne_MesseSolennelle_Settings_Global.ily
index e55ef8fb38f13b3073aa2eb19272a70518773290..bc33a13348b28245f3078af841485f5391c726a3 100644
--- a/Vierne_MesseSolennelle_Settings_Global.ly
+++ b/Vierne_MesseSolennelle_Settings_Global.ily
@@ -1,44 +1,32 @@
-\version "2.11.35"
+\version "2.13.1"
 
-\include "orchestrallily/orchestrallily.ly"
-\include "orchestrallily/oly_settings_names.ly"
+\include "orchestrallily/orchestrallily.ily"
+\include "orchestrallily/oly_settings_names.ily"
 
-EKnumber="EK-F0023"
+scorenumber="EK-0005"
 
-
-\header { 
+\header {
   title = "Messe Solennelle"
   subtitle = \markup{en \concat{ut\sharp} mineur}
   composer = "Louis Vierne (1870-1937)"
-
-  enteredby = "Reinhold Kainhofer"
-  maintainer = "R. Kainhofer"
-  maintainerEmail = "reinhold@kainhofer.com"
-  lastupdated = "Februar 2008"
-  copyright = \markup \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."}
+  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."}
   }
-   
-  tagline = \markup { \center-align { \small \teeny \line { Computersatz von \maintainer mit \with-url #"http://www.LilyPond.org" { \teeny www. \hspace #-1.0 LilyPond \hspace #-1.0 \teeny .org}\hspace #-1.0 , \lastupdated\hspace #-1.0 . } } }
 }
 
+% Possibly adjust the \orchestralScoreStructure here...
 \orchestralScoreStructure #'(
 ; Vocal voices
-  ("Ch" "ChoirStaff" ("S" "A" "T" "B"))
+  ("ChoralScore" "ChoirStaff" ("S" "A" "T" "B"))
 ; Organs
   ("OI" "PianoStaff" ("OIr" "OIl"))
   ("OII" "StaffGroup" ("OIIhands" "OIIbass"))
   ("OIIhands" "PianoStaff" ("OIIr" "OIIl"))
 ; full scores
-  ("FullScore" "SimultaneousMusic" ("Ch" "OI" "OII"))
+  ("OrganScore" "SimultaneousMusic" ("ChoralScore" "OI" "OII"))
 )
 
-
-\include "deutsch.ly"
-
-
-
 %%% Clef definitions, either old-style (using the Breitkopf style) or new style
 OIrClef = \clef "treble"
 OIlClef = \clef "bass"
@@ -49,62 +37,24 @@ OIIbassClef = \clef "bass"
 OIInstrumentName = \markup { \column { "Orgue" "de" "Chœur" } }
 OIIInstrumentName = \markup {\column {"Grand" "Orgue"}}
 
+OIInstrumentTitle = "Orgue  de Chœur"
+OIIInstrumentTitle = "Grand Orgue"
+
 OIShortInstrumentName = \markup { \column { "O. de" "Ch." } }
 OIIShortInstrumentName = \markup { \column { \line{"G."\hspace #-1.5 \raise #1.0 \teeny "d" "O." }} }
 
 
+
 \layout {
-  \context { \Staff 
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. . 3)
+  \context { \Staff
     \override VerticalAxisGroup #'remove-empty = ##f
   }
-  \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
-%     hairpinToBarline = ##t
-%     autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 1))
-%     autoCautionaries = #'()
-%   }
-%   \context { \StaffGroup 
-%     \consists "Instrument_name_engraver"
-%   }
-}
-
-
-setCrescMolto = {
-    \set crescendoText = \markup { \italic "cresc.molto" }
-    \set crescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
-crescMolto = #(make-span-event 'CrescendoEvent START)
-endCrescMolto = #(make-span-event 'CrescendoEvent STOP)
 
-setCrescPoco = {
-    \set crescendoText = \markup { \italic "cresc.poco a poco" }
-    \set crescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
-}
-crescPoco = #(make-span-event 'CrescendoEvent START)
-endCrescPoco = #(make-span-event 'CrescendoEvent STOP)
-
-
-setDimMolto = {
-    \set decrescendoText = \markup { \italic "dim.molto" }
-    \set crescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
-}
-dimMolto = #(make-span-event 'DecrescendoEvent START)
-endDimMolto = #(make-span-event 'DecrescendoEvent STOP)
 
-% setDecresc = {
-%     \set decrescendoText = \markup { \italic "decresc." }
-%     \set decrescendoSpanner = #'dashed-line
-% }
-% decresc = #(make-span-event 'DecrescendoEvent START)
-% enddecresc = #(make-span-event 'DecrescendoEvent STOP)
+crescMolto = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "cresc.molto")
+crescPoco = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "cresc.poco a poco")
+dimMolto = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "dim.molto")
 
 pocoAllarg = \markup {\italic "poco allarg."}
 pocoRit = \markup {\italic "poco rit."}
@@ -118,11 +68,11 @@ vThree = {\voiceThree \revert MultiMeasureRest #'staff-position }
 vFour = {\voiceFour \revert MultiMeasureRest #'staff-position }
 oneV = {\oneVoice \revert MultiMeasureRest #'staff-position }
 
-semprefff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+semprefff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "fff")))
-sempreff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+sempreff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "ff")))
-subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "subito" #:dynamic "pp")))
 
 OrganR = \markup{R.}
diff --git a/Vierne_MesseSolennelle_Settings_Instrument.ily b/Vierne_MesseSolennelle_Settings_Instrument.ily
new file mode 100644
index 0000000000000000000000000000000000000000..be817af6e7711cd38197cc759a356cc9c7f1eb21
--- /dev/null
+++ b/Vierne_MesseSolennelle_Settings_Instrument.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "Vierne_MesseSolennelle_Settings.ily"
diff --git a/Vierne_MesseSolennelle_Settings_Instrument.ly b/Vierne_MesseSolennelle_Settings_Instrument.ly
deleted file mode 100644
index 3fe581b3a7230aa82f127ec9823b91b5bd0df89b..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_Settings_Instrument.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-% changes to the global score settings for single-instrument sheets
-\include "Vierne_MesseSolennelle_Settings.ly"
-
-#(set-default-paper-size "a4")
-% #(set-global-staff-size 21)
-
-\paper {
-  ragged-bottom = ##f
-  ragged-last-bottom = ##t
-  % Allow line-breaks only at rests!
-  #(define page-breaking ly:page-turn-breaking)
-}
-\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
-    \consists "Page_turn_engraver"
-%     minimumPageTurnLength = #(ly:make-moment 9 8)
-  } 
-}
diff --git a/Vierne_MesseSolennelle_Settings_VocalScore.ily b/Vierne_MesseSolennelle_Settings_VocalScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..8f7c7f52b5a122b3a7be7a73561ac33cd6f5b172
--- /dev/null
+++ b/Vierne_MesseSolennelle_Settings_VocalScore.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Vierne_MesseSolennelle_Settings.ily"
diff --git a/Vierne_MesseSolennelle_Settings_VocalVoice.ily b/Vierne_MesseSolennelle_Settings_VocalVoice.ily
new file mode 100644
index 0000000000000000000000000000000000000000..ee11cd90676968f8cf3fab005434b763ed7b9427
--- /dev/null
+++ b/Vierne_MesseSolennelle_Settings_VocalVoice.ily
@@ -0,0 +1,2 @@
+\include "orchestrallily/oly_settings_vocalvoice.ily"
+\include "Vierne_MesseSolennelle_Settings.ily"
diff --git a/Vierne_MesseSolennelle_Settings_VocalVoice.ly b/Vierne_MesseSolennelle_Settings_VocalVoice.ly
deleted file mode 100644
index f461d6172df65221d72819f909c73052bd22f14b..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_Settings_VocalVoice.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-% changes to the global score settings for single-instrument sheets
-\include "Vierne_MesseSolennelle_Settings.ly"
-
-#(set-default-paper-size "a4")
-% #(set-global-staff-size 21)
-
-\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"
-  }
-  \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/Vierne_MesseSolennelle_T.ly b/Vierne_MesseSolennelle_T.ly
deleted file mode 100644
index 8a0da0b88aa53b849bb0178e61e1423ecde3b9f2..0000000000000000000000000000000000000000
--- a/Vierne_MesseSolennelle_T.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-%lilypond input for Vierne's Messe Solennelle
-\include "Vierne_MesseSolennelle_Settings_VocalVoice.ly"
-
-\header { instrument = "Tenore" }
-
-\createScore #"IKyrie" #'("T")
-\createScore #"IIGloria" #'("T")
-\createScore #"IIISanctus" #'("T")
-\createScore #"IVBenedictus" #'("T")
-\createScore #"VAgnus" #'("T")
diff --git a/Vierne_MesseSolennelle_T.pdf b/Vierne_MesseSolennelle_T.pdf
deleted file mode 100644
index 6a601048417cf47be4c91d7a02a6e59457a555e9..0000000000000000000000000000000000000000
Binary files a/Vierne_MesseSolennelle_T.pdf and /dev/null differ
diff --git a/patches/Vierne_MesseSolennelle_Instrument_OI.ly.patch b/patches/Vierne_MesseSolennelle_Instrument_OI.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bd5b83487dd698d7c41e74e36cbe521558bbac2b
--- /dev/null
+++ b/patches/Vierne_MesseSolennelle_Instrument_OI.ly.patch
@@ -0,0 +1,16 @@
+--- Vierne_MesseSolennelle_Instrument_OI.ly.new	2009-09-20 19:59:08.000000000 +0200
++++ Vierne_MesseSolennelle_Instrument_OI.ly	2009-09-20 19:15:57.000000000 +0200
+@@ -2,10 +2,12 @@
+ \include "Vierne_MesseSolennelle_Settings_Instrument.ily"
+ 
+ \header {
+-  instrument = \OIInstrumentName
++  instrument = \OIInstrumentTitle
+   scorenumber = \markup{\scoreNumber \OINumber}
+ }
+ 
++#(set-default-paper-size "a4" 'landscape)
++
+ \createScore #"Kyrie" #'("OI")
+ \createScore #"Gloria" #'("OI")
+ \createScore #"Sanctus" #'("OI")
diff --git a/patches/Vierne_MesseSolennelle_Instrument_OII.ly.patch b/patches/Vierne_MesseSolennelle_Instrument_OII.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fbebec5614b5cf6182c1e5a1d2062ea0c35f3e0b
--- /dev/null
+++ b/patches/Vierne_MesseSolennelle_Instrument_OII.ly.patch
@@ -0,0 +1,16 @@
+--- Vierne_MesseSolennelle_Instrument_OII.ly.new	2009-09-20 19:59:08.000000000 +0200
++++ Vierne_MesseSolennelle_Instrument_OII.ly	2009-09-20 19:14:49.000000000 +0200
+@@ -2,10 +2,12 @@
+ \include "Vierne_MesseSolennelle_Settings_Instrument.ily"
+ 
+ \header {
+-  instrument = \OIIInstrumentName
++  instrument = \OIIInstrumentTitle
+   scorenumber = \markup{\scoreNumber \OIINumber}
+ }
+ 
++#(set-default-paper-size "a4" 'landscape)
++
+ \createScore #"Kyrie" #'("OII")
+ \createScore #"Gloria" #'("OII")
+ \createScore #"Sanctus" #'("OII")
diff --git a/patches/Vierne_MesseSolennelle_Settings_Global.ily.patch b/patches/Vierne_MesseSolennelle_Settings_Global.ily.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7c2852dc855f28956b407d8807e329d1174952d9
--- /dev/null
+++ b/patches/Vierne_MesseSolennelle_Settings_Global.ily.patch
@@ -0,0 +1,120 @@
+--- Vierne_MesseSolennelle_Settings_Global.ily.new	2009-09-20 19:59:08.000000000 +0200
++++ Vierne_MesseSolennelle_Settings_Global.ily	2009-09-20 19:55:07.000000000 +0200
+@@ -6,8 +6,8 @@
+ scorenumber="EK-0005"
+ 
+ \header {
+-  title = "Messe solennelle"
+-  subtitle = "en ut\sharp majeur"
++  title = "Messe Solennelle"
++  subtitle = \markup{en \concat{ut\sharp} mineur}
+   composer = "Louis Vierne (1870-1937)"
+   copyright = \markup \abs-fontsize #9 \column{
+       \line { "2009, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
+@@ -16,8 +16,102 @@
+ }
+ 
+ % Possibly adjust the \orchestralScoreStructure here...
++\orchestralScoreStructure #'(
++; Vocal voices
++  ("ChoralScore" "ChoirStaff" ("S" "A" "T" "B"))
++; Organs
++  ("OI" "PianoStaff" ("OIr" "OIl"))
++  ("OII" "StaffGroup" ("OIIhands" "OIIbass"))
++  ("OIIhands" "PianoStaff" ("OIIr" "OIIl"))
++; full scores
++  ("OrganScore" "SimultaneousMusic" ("ChoralScore" "OI" "OII"))
++)
+ 
+-% Add custom keys here, e.g.
+-% CorKey = \key g \major
+-% CorIKey = \CorKey
+-% CorIIKey = \CorKey
++%%% Clef definitions, either old-style (using the Breitkopf style) or new style
++OIrClef = \clef "treble"
++OIlClef = \clef "bass"
++OIIrClef = \clef "treble"
++OIIlClef = \clef "bass"
++OIIbassClef = \clef "bass"
++
++OIInstrumentName = \markup { \column { "Orgue" "de" "Chœur" } }
++OIIInstrumentName = \markup {\column {"Grand" "Orgue"}}
++
++OIInstrumentTitle = "Orgue  de Chœur"
++OIIInstrumentTitle = "Grand Orgue"
++
++OIShortInstrumentName = \markup { \column { "O. de" "Ch." } }
++OIIShortInstrumentName = \markup { \column { \line{"G."\hspace #-1.5 \raise #1.0 \teeny "d" "O." }} }
++
++
++\layout {
++  \context { \Staff
++    \override VerticalAxisGroup #'remove-empty = ##f
++  }
++}
++
++
++crescMolto = #(make-music 'CrescendoEvent 'span-direction START
++                     'span-type 'text 'span-text "cresc.molto")
++crescPoco = #(make-music 'CrescendoEvent 'span-direction START
++                     'span-type 'text 'span-text "cresc.poco a poco")
++dimMolto = #(make-music 'DecrescendoEvent 'span-direction START
++                     'span-type 'text 'span-text "dim.molto")
++
++pocoAllarg = \markup {\italic "poco allarg."}
++pocoRit = \markup {\italic "poco rit."}
++dolce = \markup {\italic "dolce."}
++cantabile = ^\markup {\italic "cantabile"}
++sostenuto = ^\markup {\italic "sostenuto"}
++
++vOne = {\voiceOne \revert MultiMeasureRest #'staff-position }
++vTwo = {\voiceTwo \revert MultiMeasureRest #'staff-position }
++vThree = {\voiceThree \revert MultiMeasureRest #'staff-position }
++vFour = {\voiceFour \revert MultiMeasureRest #'staff-position }
++oneV = {\oneVoice \revert MultiMeasureRest #'staff-position }
++
++semprefff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
++'(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "fff")))
++sempreff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
++'(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "ff")))
++subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
++'(0 . 0) #:right-align #:normal-text #:italic "subito" #:dynamic "pp")))
++
++OrganR = \markup{R.}
++OrganGPR = \markup{G.P.R.}
++OrganPedGPR = \markup{PED.G.P.R.}
++OrganPR = \markup{P.R.}
++OrganPed = \markup{PED.}
++OrganMan = \markup{MAN.}
++
++\layout {
++  \context {
++    \type "Engraver_group"
++    \name Dynamics
++    \alias Voice % So that \cresc works, for example.
++    \consists "Output_property_engraver"
++
++    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
++    pedalSustainStrings = #'("Ped." "*Ped." "*")
++    pedalUnaCordaStrings = #'("una corda" "" "tre corde")
++
++    \consists "Piano_pedal_engraver"
++    \consists "Script_engraver"
++    \consists "Dynamic_engraver"
++    \consists "Text_engraver"
++
++    \override TextScript #'font-size = #2
++    \override TextScript #'font-shape = #'italic
++    \override DynamicText #'extra-offset = #'(0 . 2.5)
++    \override Hairpin #'extra-offset = #'(0 . 2.5)
++
++    \consists "Skip_event_swallow_translator"
++
++    \consists "Axis_group_engraver"
++  }
++  \context {
++    \PianoStaff
++    \accepts Dynamics
++%     \override VerticalAlignment #'forced-distance = #7
++  }
++}