diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly
new file mode 100644
index 0000000000000000000000000000000000000000..e9c626d8e8bb65154fb94d708501d2d00cf43297
--- /dev/null
+++ b/Eybler_Graduale_SperateInDeo_HV41_Instrument_Continuo.ly
@@ -0,0 +1,10 @@
+\version "2.13.1"
+\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+
+\header {
+  instrument = \ContinuoInstrumentName
+  scorenumber = \markup{\scoreNumber \ContinuoNumber}
+}
+
+\createScore #"GradualeSperateInDeo" #'("Continuo")
+
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.ly
deleted file mode 100644
index abb74afde3623f8326db7f6180541e3b957e3fbf..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
-
-\header {
-  instrument = \OrganInstrumentName
-  scorenumber = \markup{\scoreNumber \OrganNumber}
-}
-
-\createScore #"GradualeSperateInDeo" #'("Organ")
-
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.pdf b/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.pdf
deleted file mode 100644
index dc18946e41cf382d0aa5048bff061617701ca906..0000000000000000000000000000000000000000
Binary files a/Eybler_Graduale_SperateInDeo_HV41_Instrument_Organ.pdf and /dev/null differ
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.ly
deleted file mode 100644
index 840ec373b8b4694fdfd3bd8b57da3f0c6a6f74ae..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
-
-\header {
-  instrument = \TbeIInstrumentName
-  scorenumber = \markup{\scoreNumber \TbeINumber}
-}
-
-\createScore #"GradualeSperateInDeo" #'("TbeI")
-
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.pdf b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.pdf
deleted file mode 100644
index 26603527790249ec0db69489ff3b9e9003d07440..0000000000000000000000000000000000000000
Binary files a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeI.pdf and /dev/null differ
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.ly
deleted file mode 100644
index 49012e576f8344313300afc62cb0f092e32fc07b..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
-
-\header {
-  instrument = \TbeIIInstrumentName
-  scorenumber = \markup{\scoreNumber \TbeIINumber}
-}
-
-\createScore #"GradualeSperateInDeo" #'("TbeII")
-
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.pdf b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.pdf
deleted file mode 100644
index cc72ae89fa5e772f80f46bf649dd6646cadec072..0000000000000000000000000000000000000000
Binary files a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TbeII.pdf and /dev/null differ
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly
new file mode 100644
index 0000000000000000000000000000000000000000..da1484da8fb966b0ce8e9cb00218e89a2e9a7c65
--- /dev/null
+++ b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbI.ly
@@ -0,0 +1,10 @@
+\version "2.13.1"
+\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+
+\header {
+  instrument = \TrbIInstrumentName
+  scorenumber = \markup{\scoreNumber \TrbINumber}
+}
+
+\createScore #"GradualeSperateInDeo" #'("TrbI")
+
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly
new file mode 100644
index 0000000000000000000000000000000000000000..fb1f765aee5b71cee6d0ddbbf8f005219a94a2b5
--- /dev/null
+++ b/Eybler_Graduale_SperateInDeo_HV41_Instrument_TrbII.ly
@@ -0,0 +1,10 @@
+\version "2.13.1"
+\include "Eybler_Graduale_SperateInDeo_HV41_Settings_Instrument.ily"
+
+\header {
+  instrument = \TrbIIInstrumentName
+  scorenumber = \markup{\scoreNumber \TrbIINumber}
+}
+
+\createScore #"GradualeSperateInDeo" #'("TrbII")
+
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.ly b/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.ly
deleted file mode 100644
index 055aa1de26ab6de7ee9409555d15dd992283c1e2..0000000000000000000000000000000000000000
--- a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.13.1"
-\include "Eybler_Graduale_SperateInDeo_HV41_Settings_FullScore.ily"
-\setCreateMIDI ##t
-\setCreatePDF ##t
-
-\header {
-  scoretype = \OrganScoreTitle
-  scorenumber = \markup{\scoreNumber \OrganScoreNumber}
-}
-
-\createScore #"GradualeSperateInDeo" #'("OrganScore")
-
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.midi b/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.midi
deleted file mode 100644
index 6abae53e1efe9b746d7d6809d1005968731b6d45..0000000000000000000000000000000000000000
Binary files a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.midi and /dev/null differ
diff --git a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.pdf b/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.pdf
deleted file mode 100644
index e0237864a0ad23b963542380c5c55b6f6da3748c..0000000000000000000000000000000000000000
Binary files a/Eybler_Graduale_SperateInDeo_HV41_Score_Organ.pdf and /dev/null differ
diff --git a/Makefile b/Makefile
index 7e432f6b04b26aef7ed7217cafac6eb650f45da2..e72b8efd73f0398e09d3f089551e8ae1a9b5ad57 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCS = Eybler_Graduale_SperateInDeo_HV41_Music_GradualeSperateInDeo.ily Eybler_Graduale_SperateInDeo_HV41_Settings.ily
 
-instruments = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Organ VcB
+instruments = ObI ObII FagI FagII CorI CorII TrbI TrbII Tim VI VII Va S A T B Continuo VcB
 scores = Full Long Particell Choral Original
 
 pdfs = $(instruments:%=Eybler_Graduale_SperateInDeo_HV41_Instrument_%.pdf) $(scores:%=Eybler_Graduale_SperateInDeo_HV41_Score_%.pdf)
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex b/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex
index 2327af059714ea4ff434d9eee77c5ec5bce0f5b3..9d28753df0117057af714e4aa4a540daed5f2cb1 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex
@@ -36,8 +36,8 @@ Zu diesem Werk liegt folgendes Aufführungsmaterial vor:
 \FagIIName{} (\scoreNumber\FagIINumber),
 \CorIName{} (\scoreNumber\CorINumber),
 \CorIIName{} (\scoreNumber\CorIINumber),
-\TbeIName{} (\scoreNumber\TbeINumber),
-\TbeIIName{} (\scoreNumber\TbeIINumber),
+\TrbIName{} (\scoreNumber\TrbINumber),
+\TrbIIName{} (\scoreNumber\TrbIINumber),
 \TimName{} (\scoreNumber\TimNumber).
 
 }
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex b/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex
index ee4c926f2f2e140b6fed7990bb29f713a3714cb8..0f184ad0ae40a404e1409c8e822ec9ff04de5df2 100644
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex
+++ b/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Instruments.tex
@@ -44,11 +44,11 @@
 \addcontentsline{toc}{section}{\CorIIName}
 \includescore{Instrument_CorII}
 \phantomsection
-\addcontentsline{toc}{section}{\TbeIName}
-\includescore{Instrument_TbeI}
+\addcontentsline{toc}{section}{\TrbIName}
+\includescore{Instrument_TrbI}
 \phantomsection
-\addcontentsline{toc}{section}{\TbeIIName}
-\includescore{Instrument_TbeII}
+\addcontentsline{toc}{section}{\TrbIIName}
+\includescore{Instrument_TrbII}
 \phantomsection
 \addcontentsline{toc}{section}{\TimName}
 \includescore{Instrument_Tim}
@@ -74,8 +74,8 @@
 \addcontentsline{toc}{section}{\BName}
 \includescore{Instrument_B}
 \phantomsection
-\addcontentsline{toc}{section}{\OrganName}
-\includescore{Instrument_Organ}
+\addcontentsline{toc}{section}{\ContinuoName}
+\includescore{Instrument_Continuo}
 \phantomsection
 \addcontentsline{toc}{section}{\VcBName}
 \includescore{Instrument_VcB}
diff --git a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Organ.tex b/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Organ.tex
deleted file mode 100644
index 996b10383242a92cd8324cdb07b00f1ea878a4d6..0000000000000000000000000000000000000000
--- a/TeX_Eybler_Graduale_SperateInDeo_HV41_Score_Organ.tex
+++ /dev/null
@@ -1,37 +0,0 @@
-\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Settings.itex}
-
-\hypersetup{
-    pdftitle={\scoreTitle, \OrganScoreType},
-}
-
-\scoretype{\OrganScoreType}
-\scorenumber{\scoreNumber\OrganScoreNumber}
-\OrganScoreSettings
-
-\begin{document}
-\makefrontpage
-\frontmatter
-\maketitle
-
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_ContentsMaterial.itex}
-\cleardoublepage
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_About.itex}
-\pagebreak
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Leben.itex}
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_Text.itex}
-
-\mainmatter
-\cleardoublepage
-
-\includescore{Score_Organ}
-
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Eybler_Graduale_SperateInDeo_HV41_Include_KritBericht.itex}
-
-\cleardoublepage
-\makebackpage
-\end{document}