diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
index 5a355b34ca2bc8b6387d345c48f18a1da7b3ba85..755b749c614cae1b009191a73453978d0426642d 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
@@ -13,48 +13,48 @@
 \begin{center}
 
 \scorelistbox{
-Zu diesem Werk liegt folgendes Aufführungsmaterial vor:
-
-% \FullScoreName{} (\scoreNumber\FullScoreNumber),
-\LongScoreName{} (\scoreNumber\LongScoreNumber),
-\VocalScoreName{} (\scoreNumber\VocalScoreNumber),
-\ParticellScoreName{} (\scoreNumber\ParticellScoreNumber),
-\ChoralScoreName{} (\scoreNumber\ChoralScoreNumber);
-% \OriginalScoreName{} (\scoreNumber\OriginalScoreNumber),
-
-\SName{} (\scoreNumber\SNumber),
-\AName{} (\scoreNumber\ANumber),
-\TName{} (\scoreNumber\TNumber),
-\BName{} (\scoreNumber\BNumber);
-
-\InstrumentsName{} (\scoreNumber\InstrumentsNumber),
-\ContinuoName{} (\scoreNumber\ContinuoNumber),
-\VIName{} (\scoreNumber\VINumber),
-\VIIName{} (\scoreNumber\VIINumber),
-\VaName{} (\scoreNumber\VaNumber),
-\VcBName{} (\scoreNumber\VcBNumber),
-\ObIName{} (\scoreNumber\ObINumber),
-\ObIIName{} (\scoreNumber\ObIINumber),
-\ClName{} (\scoreNumber\ClNumber),
-\TrbIName{} (\scoreNumber\TrbINumber),
-\TrbIIName{} (\scoreNumber\TrbIINumber),
-\TimName{} (\scoreNumber\TimNumber).
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+% \FullScoreName{} (-\FullScoreNumber),
+\LongScoreName{} (-\LongScoreNumber),
+\VocalScoreName{} (-\VocalScoreNumber),
+\ParticellScoreName{} (-\ParticellScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+% \OriginalScoreName{} (-\OriginalScoreNumber),
+
+\SName{} (-\SNumber),
+\AName{} (-\ANumber),
+\TName{} (-\TNumber),
+\BName{} (-\BNumber);
+
+\InstrumentsName{} (-\InstrumentsNumber),
+\ContinuoName{} (-\ContinuoNumber),
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VaName{} (-\VaNumber),
+\VcBName{} (-\VcBNumber),
+\ObIName{} (-\ObINumber),
+\ObIIName{} (-\ObIINumber),
+\ClName{} (-\ClNumber),
+\TrbIName{} (-\TrbINumber),
+\TrbIIName{} (-\TrbIINumber),
+\TimName{} (-\TimNumber).
 }
 \end{center}
 
 \vfill
 \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
-\begin{itemize}
+\begin{hauptquellen}
 \item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
 \item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: HK.2525 Mus.
 \item Offertorium \q{Fremit mare} (d), Originalausgabe, chem. Druckerei, Wien, 1814. Stimmensatz (Nr. 2137).
-\end{itemize}
+\end{hauptquellen}
 
 \vfill
 
 \makeatletter
-\copyrightbox{© \@year, Edition Kainhofer, Vienna\newline
+\copyrightbox{© \@year, \@publisher\newline
 1. Auflage / 1st Printing \@year\newline
-Computersatz mit Lilypond 2.13.1, \href{http://www.lilypond.org/}{http://www.lilypond.org/}\newline
+Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
index a0273e3f49aa5a56aff1e4f159671ec884caf7de..ee47693c6e73eb76e1e103c7ad99c863204f25dc 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
@@ -1,11 +1,13 @@
-\subsection*{Text des \q{Fremit mare cum furore} (Offertorium, HV 92)}
+\subsection*{Text des \q{Fremit mare cum furore}: TODO}
 
 \begin{small}
 
 \subsection*{FremitMare}
 \nopagebreak
 \begin{lyricstable}
-TODO & TODO & TODO \\
+TODO & TODO & TODO \\[0.5em]
+
+ & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)}
 \end{lyricstable}
 
 
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
index 067dd2d7ceaa03241153ad603a2037783051eeb9..5990540f432bfd1781c3e839daae615b66ac7397 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
@@ -15,23 +15,22 @@
 \input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Preface_Long.itex}
 
 \phantomsection
-\addcontentsline{toc}{section}{\ObIName}
-\includescore{Instrument_ObI}
-\phantomsection
-\addcontentsline{toc}{section}{\ObIIName}
-\includescore{Instrument_ObII}
+\addcontentsline{toc}{section}{\ContinuoName}
+\includescore{Instrument_Continuo}
+
 \phantomsection
-\addcontentsline{toc}{section}{\ClName}
-\includescore{Instrument_Cl}
+\addcontentsline{toc}{section}{\SName}
+\includescore{Instrument_S}
 \phantomsection
-\addcontentsline{toc}{section}{\TrbIName}
-\includescore{Instrument_TrbI}
+\addcontentsline{toc}{section}{\AName}
+\includescore{Instrument_A}
 \phantomsection
-\addcontentsline{toc}{section}{\TrbIIName}
-\includescore{Instrument_TrbII}
+\addcontentsline{toc}{section}{\TName}
+\includescore{Instrument_T}
 \phantomsection
-\addcontentsline{toc}{section}{\TimName}
-\includescore{Instrument_Tim}
+\addcontentsline{toc}{section}{\BName}
+\includescore{Instrument_B}
+
 \phantomsection
 \addcontentsline{toc}{section}{\VIName}
 \includescore{Instrument_VI}
@@ -42,23 +41,27 @@
 \addcontentsline{toc}{section}{\VaName}
 \includescore{Instrument_Va}
 \phantomsection
-\addcontentsline{toc}{section}{\SName}
-\includescore{Instrument_S}
+\addcontentsline{toc}{section}{\VcBName}
+\includescore{Instrument_VcB}
+
 \phantomsection
-\addcontentsline{toc}{section}{\AName}
-\includescore{Instrument_A}
+\addcontentsline{toc}{section}{\ObIName}
+\includescore{Instrument_ObI}
 \phantomsection
-\addcontentsline{toc}{section}{\TName}
-\includescore{Instrument_T}
+\addcontentsline{toc}{section}{\ObIIName}
+\includescore{Instrument_ObII}
 \phantomsection
-\addcontentsline{toc}{section}{\BName}
-\includescore{Instrument_B}
+\addcontentsline{toc}{section}{\ClName}
+\includescore{Instrument_Cl}
 \phantomsection
-\addcontentsline{toc}{section}{\ContinuoName}
-\includescore{Instrument_Continuo}
+\addcontentsline{toc}{section}{\TrbIName}
+\includescore{Instrument_TrbI}
 \phantomsection
-\addcontentsline{toc}{section}{\VcBName}
-\includescore{Instrument_VcB}
+\addcontentsline{toc}{section}{\TrbIIName}
+\includescore{Instrument_TrbII}
+\phantomsection
+\addcontentsline{toc}{section}{\TimName}
+\includescore{Instrument_Tim}
 
 
 \cleardoublepage
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
index f8e0ec76b216385a694e80985c8fa6a6ba63d160..1cc56b8d2ae61b6edcc945a55542f1c5974ea333 100644
--- a/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
@@ -1,27 +1,21 @@
-% Title Page
-\composer{Joseph Eybler (1765-1846)}
-%\composerdate{(TODO-TODO)}
-% \poet{}
-% \poetdate{}
+\composer{Joseph Eybler}
+\composerdate{(1765-1846)}
 \title{Fremit mare cum furore}
 \subtitle{Offertorium, HV 92}
 % \description{Für Chor (SATB) und Orgel oder Orchester}
 % \instrumentation{2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
-\editor{Reinhold Kainhofer}
-\publisher{Edition Kainhofer, Vienna}
+\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna}
 \year{2009}
+\scoreinfo{Urtext}
 
 \basename{Eybler_Offertorium_FremitMare_HV92}
 
 \newcommand{\scoreNumber}[1]{EK-1092-#1}
 \newcommand{\scoreTitle}{Joseph Eybler (1765-1846): Fremit mare cum furore}
-% \newcites{bio}{Biography}
-% \newcites{sources}{Benutzte Vorlagen}
 
 \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/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.pdf
index 4d8d7ecd09ebe4f9bc235c356924462ea6a46dfe..326d7b3c73c14e186c659e737236c98051afcb67 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choral.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.pdf
index 95913e006b1632b6fd75e6a8fa225b3010a22769..cbaca5626e0db414cf85dd8c0b3bd771905a8601 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.pdf
index eae6608fd620415e8fafb388914b7da8fe26901b..2526ff160ce009f7658f632c7d7db188d4cb8835 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.pdf
index ddc156fecdf7b909fdf94c2649b22a5da99b2053..27fd8387a5522463c446604fb92331adbbf3868b 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.pdf
index 4be62a26160b9c634b98710a6a1916a13c80d0ef..507055b3a0e628bd80b84cf8f5e0df41babed50f 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Original.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.pdf
index f1666f23410b8b9145779bdf249d6eeb66a3618c..a3ea25fed7acf7629fdfc995a9b61c9387f7982a 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Particell.pdf differ
diff --git a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.pdf b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.pdf
index 71c1425f43e60e7c5cbae2a5cf0dc0f44a8eb040..a254f5e516d469082d5187d05a7c1ae76d02e32a 100644
Binary files a/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.pdf and b/out/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Vocal.pdf differ