diff --git a/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily b/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily
index c44885721e278417bd336b7a06dc6441482c1a4f..861bb085407408ac997edaf6745e63ad5e227185 100644
--- a/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily
+++ b/Eybler_Offertorium_FremitMare_HV92_Settings_Global.ily
@@ -37,67 +37,3 @@ ClKey = \key g \major
 TrbKey = \key g \major
 TrbIKey = \TrbKey
 TrbIIKey = \TrbKey
-
-
-\orchestralScoreStructure #'(
-; Part-combined staves for full score
-  ("Fl" "PartCombinedStaff" ("FlI" "FlII"))
-  ("Ob" "PartCombinedStaff" ("ObI" "ObII"))
-%   ;("Cl" "PartCombinedStaff" ("ClI" "ClII"))
-  ("Fag" "PartCombinedStaff" ("FagI" "FagII"))
-  ("Wd" "StaffGroup" ("Fl" "Ob" "Cl" "Fag" "CFag"))
-
-  ("Cor" "PartCombinedStaff" ("CorI" "CorII"))
-  ("Trb" "PartCombinedStaff" ("TrbI" "TrbII"))
-  ("Tbe" "PartCombinedStaff" ("TbeI" "TbeII"))
-  ("Br" "StaffGroup" ("Cor" "Trb" "Tbe" "Tba"))
-
-; long score; no part-combined staves, but GrandStaves instead
-  ("FlLong" "GrandStaff" ("FlI" "FlII"))
-  ("ObLong" "GrandStaff" ("ObI" "ObII"))
-  ("FagLong" "GrandStaff" ("FagI" "FagII"))
-  ("WdLong" "StaffGroup" ("FlLong" "ObLong" "Cl" "FagLong" "CFag"))
-
-  ("CorLong" "GrandStaff" ("CorI" "CorII"))
-  ("TrbLong" "GrandStaff" ("TrbI" "TrbII"))
-  ("TbeLong" "GrandStaff" ("TbeI" "TbeII" "TbeIII"))
-  ("BrLong" "StaffGroup" ("CorLong" "TrbLong" "TbeLong" "Tba"))
-
-; Percussion
-  ("Perc" "StaffGroup" ("Tim"))
-
-; Strings, they are the same in long and short full score  
-  ("V" "GrandStaff" ("VI" "VII"))
-  ("Str" "StaffGroup" ("V" "Va"))
-  ("VceB" "StaffGroup" ("Vc" "Cb" "VcB"))
-  ("FullStr" "StaffGroup" ("V" "Va" "Vc" "Cb" "VcB"))
-
-; Choral score
-  ("Solo" "SimultaneousMusic" ("SSolo" "ASolo" "TSolo" "BSolo"))
-  ("Ch" "ChoirStaff" ("S" "A" "T" "B"))
-  ("ChoirScore" "SimultaneousMusic" ("Ch"))
-  ("SoloScore" "SimultaneousMusic" ("Solo"))
-  ("SoloChoirScore" "SimultaneousMusic" ("Solo" "Ch"))
-
-; Organ score (inkl. Figured bass)
-  ("OFb" "FiguredBass" ())
-  ("FiguredBass" "FiguredBass" ())
-  ;("Organ" "SimultaneousMusic" ("OFb" "O"))
-  ("BC" "ParallelVoicesStaff" ("OFb" "O" "FiguredBass"))
-  
-  ("O" "PianoStaff" ("OI" "OII"))
-  ("OI" "ParallelVoicesStaff" ("OIa" "OIb"))
-  ("OII" "ParallelVoicesStaff" ("OIIa" "OIIb"))
-
-; Full Scores
-  ("FullScore" "SimultaneousMusic" ("Wd" "Br" "Perc" "Str" "ChoirScore" "Organ" "O" "BC" "VceB"))
-  ("LongScore" "SimultaneousMusic" ("WdLong" "BrLong" "Perc" "Str" "ChoirScore" "Organ" "O" "BC" "VceB"))
-
-; Piano reduction
-  ;("Piano" "SimultaneousMusic" ("Organ"))
-  ("OrganScore" "SimultaneousMusic" ("ChoirScore" "O" "BC"))
-  ("PianoScore" "SimultaneousMusic" ("ChoirScore" "O" "Piano"))
-
-; Full scores: Orchestral score and long score including organ
-  ("ChStrQ" "SimultaneousMusic" ("Str" "Ch" "VceB"))
-)
diff --git a/Makefile b/Makefile
index 4739625c26ee94a7ae1b7e223a97e7016245d979..da5955a5848d351265b700fd5d918900e7eca0cd 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,6 @@ clean:
 $(instruments): % : Eybler_Offertorium_FremitMare_HV92_Instrument_%.pdf $(SRCS)
 $(scores): % : Eybler_Offertorium_FremitMare_HV92_Score_%.pdf $(SRCS)
 
-%.pdf : %.ly
+%.pdf : %.ly $(SRCS)
 	lilypond $< 
 
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex
new file mode 100644
index 0000000000000000000000000000000000000000..e163082927bfdf9c940b9fc21855a3a49f391234
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_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_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
new file mode 100644
index 0000000000000000000000000000000000000000..11c322e64fdc62e2e913c0110b91867b98f30863
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex
@@ -0,0 +1,55 @@
+\begin{center}
+
+\begin{minipage}{0.5\textwidth}
+\tableofcontents
+\end{minipage}
+\vfill
+\vfill
+
+\end{center}
+
+
+
+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk liegt folgendes Aufführungsmaterial vor:
+
+\ChoirScoreName{} (\scoreNumber\ChoirScoreNumber),
+\FullScoreName{} (\scoreNumber\FullScoreNumber),
+\OrganScoreName{} (\scoreNumber\OrganScoreNumber),
+\LongScoreName{} (\scoreNumber\LongScoreNumber),
+\InstrumentsName{} (\scoreNumber\InstrumentsNumber),
+\ObIName{} (\scoreNumber\ObINumber),
+\ObIIName{} (\scoreNumber\ObIINumber),
+\ClName{} (\scoreNumber\ClNumber),
+\TrbIName{} (\scoreNumber\TrbINumber),
+\TrbIIName{} (\scoreNumber\TrbIINumber),
+\TimName{} (\scoreNumber\TimNumber),
+\VIName{} (\scoreNumber\VINumber),
+\VIIName{} (\scoreNumber\VIINumber),
+\VaName{} (\scoreNumber\VaNumber),
+\SName{} (\scoreNumber\SNumber),
+\AName{} (\scoreNumber\ANumber),
+\TName{} (\scoreNumber\TNumber),
+\BName{} (\scoreNumber\BNumber),
+\OrganName{} (\scoreNumber\OrganNumber),
+\VcBName{} (\scoreNumber\VcBNumber),
+
+}
+\end{center}
+
+\vfill
+\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+\begin{thebibliography}{THXXXX}
+\bibitem[TODO]{TODOPartitur} Fremit mare cum furore, Originalausgabe (Partitur), ORT_TODO, VERLAG_TODO, JAHR_TODO.
+\end{thebibliography}
+
+\vfill
+
+\makeatletter
+\copyrightbox{© \@year, Edition Kainhofer, Vienna\newline
+1. Auflage / 1st Printing \@year\newline
+Computersatz mit Lilypond 2.13.1, \href{http://www.lilypond.org/}{http://www.lilypond.org/}\newline
+Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
+
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex
new file mode 100644
index 0000000000000000000000000000000000000000..6cdc072383af4d6a719ac6c1b589c3f7b4d90404
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex
@@ -0,0 +1,54 @@
+\footnotesize
+\chapter*{Quellen und Lesarten}
+\addcontentsline{toc}{section}{Quellen und Lesarten}
+
+\begin{multicols}{2}
+\subsection*{Quellen:}
+
+\begin{thebibliography}{AA}
+
+\bibitem[A]{TODO}
+Originalausgabe (Partitur), ORT, VERLAG, BESCHREIBUNG, erschienen TODO. 
+\newblock Titel: 
+{\em
+TITEL \textbar
+ETC.
+}
+\newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung, Signatur: TODO
+
+\bibitem[B]{TODO}
+Originalausgabe (Stimmen), ORT, VERLAG, BESCHREIBUNG, erschienen TODO. 
+\newblock Titel: 
+{\em
+TITEL \textbar
+ETC.
+}
+\newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung, Signatur: TODO
+
+
+\end{thebibliography}
+
+DISKUSSION DER QUELLEN
+
+
+
+\subsubsection*{Allgemeine Bemerkungen}
+
+
+\begin{enumerate}
+\item
+TODO
+\end{enumerate}
+
+
+\subsubsection*{Einzelbemerkungen}
+
+\subsubsection*{FremitMare}
+
+\begin{vergleich}
+TODO
+\end{vergleich}
+
+
+
+\end{multicols}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex
new file mode 100644
index 0000000000000000000000000000000000000000..ecbbff6f3f607ec0f2de0d9f15e3101bf21d78e3
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex
@@ -0,0 +1,14 @@
+\section*{Das Leben von Joseph Eybler (1765-1846)}
+
+\begin{multicols}{2}
+TODO
+\end{multicols}
+
+\section*{The life of Joseph Eybler (1765-1846)}
+
+\begin{multicols}{2}
+TODO
+\end{multicols}
+
+Quellen / Sources:\\[0em]
+TODO
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
new file mode 100644
index 0000000000000000000000000000000000000000..630b45f6d8f60de6b14d7a9dad48aa4c290cfeb0
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex
@@ -0,0 +1,17 @@
+\section*{Text }
+
+\begin{small}
+\newenvironment{lyricstable}{\begin{supertabular}{p{0.26\textwidth}p{0.33\textwidth}p{0.33\textwidth}}}{\end{supertabular}}
+
+\subsection*{FremitMare}
+\nopagebreak
+\begin{lyricstable}
+TODO & TODO & TODO \\
+\end{lyricstable}
+
+
+\end{small}
+
+\vspace{1em}
+
+Quelle / Source: TODO
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choir.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choir.tex
new file mode 100644
index 0000000000000000000000000000000000000000..5b323d523c085322b93627fcd72eb1a81badc009
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Choir.tex
@@ -0,0 +1,37 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \ChoirScoreType},
+}
+
+\scoretype{\ChoirScoreType}
+\scorenumber{\scoreNumber\ChoirScoreNumber}
+\ChoirScoreSettings
+
+\begin{document}
+\makefrontpage
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
+\pagebreak
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
+
+\mainmatter
+\cleardoublepage
+
+\includescore{Score_Choir}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+
+\cleardoublepage
+\makebackpage
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex
new file mode 100644
index 0000000000000000000000000000000000000000..cdc3a68f58a50b7f744be2ff7705e44e6bd5339a
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Full.tex
@@ -0,0 +1,37 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \FullScoreType},
+}
+
+\scoretype{\FullScoreType}
+\scorenumber{\scoreNumber\FullScoreNumber}
+\FullScoreSettings
+
+\begin{document}
+\makefrontpage
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
+\pagebreak
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
+
+\mainmatter
+\cleardoublepage
+
+\includescore{Score_Full}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+
+\cleardoublepage
+\makebackpage
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
new file mode 100644
index 0000000000000000000000000000000000000000..5e5997edb08bf0020ec1931b668f28d3d2a35a5e
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Instruments.tex
@@ -0,0 +1,82 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \InstrumentalPartsType},
+}
+
+\scoretype{\InstrumentalPartsType}
+\scorenumber{\scoreNumber\InstrumentalPartsNumber}
+\InstrumentalPartsSettings
+
+\begin{document}
+\makefrontpage
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
+\pagebreak
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
+
+\mainmatter
+\cleardoublepage
+
+\phantomsection
+\addcontentsline{toc}{section}{\ObIName}
+\includescore{Instrument_ObI}
+\phantomsection
+\addcontentsline{toc}{section}{\ObIIName}
+\includescore{Instrument_ObII}
+\phantomsection
+\addcontentsline{toc}{section}{\ClName}
+\includescore{Instrument_Cl}
+\phantomsection
+\addcontentsline{toc}{section}{\TrbIName}
+\includescore{Instrument_TrbI}
+\phantomsection
+\addcontentsline{toc}{section}{\TrbIIName}
+\includescore{Instrument_TrbII}
+\phantomsection
+\addcontentsline{toc}{section}{\TimName}
+\includescore{Instrument_Tim}
+\phantomsection
+\addcontentsline{toc}{section}{\VIName}
+\includescore{Instrument_VI}
+\phantomsection
+\addcontentsline{toc}{section}{\VIIName}
+\includescore{Instrument_VII}
+\phantomsection
+\addcontentsline{toc}{section}{\VaName}
+\includescore{Instrument_Va}
+\phantomsection
+\addcontentsline{toc}{section}{\SName}
+\includescore{Instrument_S}
+\phantomsection
+\addcontentsline{toc}{section}{\AName}
+\includescore{Instrument_A}
+\phantomsection
+\addcontentsline{toc}{section}{\TName}
+\includescore{Instrument_T}
+\phantomsection
+\addcontentsline{toc}{section}{\BName}
+\includescore{Instrument_B}
+\phantomsection
+\addcontentsline{toc}{section}{\OrganName}
+\includescore{Instrument_Organ}
+\phantomsection
+\addcontentsline{toc}{section}{\VcBName}
+\includescore{Instrument_VcB}
+
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+
+\cleardoublepage
+\makebackpage
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex
new file mode 100644
index 0000000000000000000000000000000000000000..8241cfaa229bfe1a8f48eba7d0e96bc9c0014f41
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Long.tex
@@ -0,0 +1,37 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \LongScoreType},
+}
+
+\scoretype{\LongScoreType}
+\scorenumber{\scoreNumber\LongScoreNumber}
+\LongScoreSettings
+
+\begin{document}
+\makefrontpage
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
+\pagebreak
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
+
+\mainmatter
+\cleardoublepage
+
+\includescore{Score_Long}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+
+\cleardoublepage
+\makebackpage
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Organ.tex b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Organ.tex
new file mode 100644
index 0000000000000000000000000000000000000000..a8139d7960cc8ba5a69ae071b57c8b160134bfaf
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Score_Organ.tex
@@ -0,0 +1,37 @@
+\documentclass[a4paper,10pt,naustrian,twoside]{report}
+\usepackage{orchestrallily/editionkainhofer}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex}
+
+\hypersetup{
+    pdftitle={\scoreTitle, \OrganScoreType},
+}
+
+\scoretype{\OrganScoreType}
+\scorenumber{\scoreNumber\OrganScoreNumber}
+\OrganScoreSettings
+
+\begin{document}
+\makefrontpage
+\frontmatter
+\maketitle
+
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_ContentsMaterial.itex}
+\cleardoublepage
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_About.itex}
+\pagebreak
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Leben.itex}
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_Text.itex}
+
+\mainmatter
+\cleardoublepage
+
+\includescore{Score_Organ}
+
+\cleardoublepage
+\backmatter
+\appendix
+\input{TeX_Eybler_Offertorium_FremitMare_HV92_Include_KritBericht.itex}
+
+\cleardoublepage
+\makebackpage
+\end{document}
diff --git a/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex b/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
new file mode 100644
index 0000000000000000000000000000000000000000..9a06fbc385a4059251974af06346f8bf37d3d3b8
--- /dev/null
+++ b/TeX_Eybler_Offertorium_FremitMare_HV92_Settings.itex
@@ -0,0 +1,27 @@
+% Title Page
+\composer{Joseph Eybler (1765-1846)}
+%\composerdate{(TODO-TODO)}
+% \poet{}
+% \poetdate{}
+\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}
+\year{2009}
+
+\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>}
+}
+