diff --git a/Makefile b/Makefile
index 90f277f446530eebf07ae2770c472426796d2182..9b2b30d055c9f71cf5fcd9208395accf2491e4dc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ OUT=out
 
 base = Preindl_InTuoNomine
 SRCS = $(base)_Music_InTuoNomine.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
-instruments = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B Vc Cb VcB
+instruments = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B VcB Vc Cb
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
@@ -15,7 +15,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
 
-additionalscores =
+additionalscores = 
 
 .PHONY: all clean
 all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
diff --git a/Preindl_InTuoNomine_Instrument_FlI.ly b/Preindl_InTuoNomine_Instrument_FlI.ly
index 005e217cb9ebdbda24a843ab10699faf9b73831c..0ceb6279150d5f0fcaf387466bffbbd39bf3dd16 100644
--- a/Preindl_InTuoNomine_Instrument_FlI.ly
+++ b/Preindl_InTuoNomine_Instrument_FlI.ly
@@ -8,15 +8,3 @@
 
 \createScore #"InTuoNomine" #'("FlI")
 
-\layout {
-  \context {
-    \Score
-    % Force multi-measure rests to be written as one span
-%     \override MultiMeasureRest #'expand-limit = #3
-%     skipBars = ##t
-%     autoBeaming = ##f
-%     \override Hairpin #'to-barline = ##f
-    \override BarNumber #'break-visibility = #'#(#t #t #t)
-  }
-}
-
diff --git a/Preindl_InTuoNomine_Settings_Global.ily b/Preindl_InTuoNomine_Settings_Global.ily
index 0dd96fa1e6b260412c9f3791052e1925e7c1857c..562eb98ad9f2cdfa1e79bf48092d6de2a4fcd875 100644
--- a/Preindl_InTuoNomine_Settings_Global.ily
+++ b/Preindl_InTuoNomine_Settings_Global.ily
@@ -11,7 +11,7 @@ scorenumber="EK-0058"
   titlepagesubtitle = "Offertorium No.21"
   composer = "Joseph Preindl (1756-1823)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { "2010," \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\scorenumber.} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
+      \line { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\scorenumber.} 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."}
   }
 }
diff --git a/TeX_Preindl_InTuoNomine_Include_About.itex b/TeX_Preindl_InTuoNomine_Include_About.itex
index fa1a168449a5f5093b75cdb42ff2a61c747c5b3d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/TeX_Preindl_InTuoNomine_Include_About.itex
+++ b/TeX_Preindl_InTuoNomine_Include_About.itex
@@ -1,10 +0,0 @@
-\addcontentsline{toc}{section}{Joseph Preindl}
-%
-% \begin{multicols}{2}\raggedcolumns
-% \prefacesection{Vorwort}
-% TODO
-% \columnbreak
-% \prefacesection{Preface}
-% TODO
-% \end{multicols}
-% \vfill
diff --git a/TeX_Preindl_InTuoNomine_Include_Bio.itex b/TeX_Preindl_InTuoNomine_Include_Bio.itex
index 6f1aeb46ee0565dd4ca094da52e0380bebe59a18..b881e2902febff16f13b7c9185c372115a178a28 100644
--- a/TeX_Preindl_InTuoNomine_Include_Bio.itex
+++ b/TeX_Preindl_InTuoNomine_Include_Bio.itex
@@ -1,3 +1,4 @@
+\addcontentsline{toc}{section}{Joseph Preindl}
 \chapter*{Joseph Preindl (1756--1823)}
 
 \begin{multicols}{2}
diff --git a/TeX_Preindl_InTuoNomine_Include_ContentsMaterial.itex b/TeX_Preindl_InTuoNomine_Include_ContentsMaterial.itex
index 3396ff8fb3f81f255177724e5ee1733d33dac9f1..f2057766750be9e3ee09cfcbabcbf390dd13b315 100644
--- a/TeX_Preindl_InTuoNomine_Include_ContentsMaterial.itex
+++ b/TeX_Preindl_InTuoNomine_Include_ContentsMaterial.itex
@@ -15,10 +15,21 @@
 \scorelistbox{
 Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 
-\LongScoreName{} (-\LongScoreNumber),
-% \FullScoreName{} (-\FullScoreNumber),
+\FullScoreName{} (-\FullScoreNumber),
 % \VocalScoreName{} (-\VocalScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber);
+\SoloChoralScoreName{} (-\SoloChoralScoreNumber);
+
+\ASoloName{} (-\ASoloNumber),
+\SName{} (-\SNumber),
+\AName{} (-\ANumber),
+\TName{} (-\TNumber),
+\BName{} (-\BNumber);
+
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VcBName{} (-\VcBNumber),
+\VcName{} (-\VcNumber),
+\CbName{} (-\CbNumber);
 
 \FlIName{} (-\FlINumber),
 \FlIIName{} (-\FlIINumber),
@@ -27,22 +38,13 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \ClIName{} (-\ClINumber),
 \ClIIName{} (-\ClIINumber),
 \FagIName{} (-\FagINumber),
-\FagIIName{} (-\FagIINumber),
+\FagIIName{} (-\FagIINumber);
+
 \CorIName{} (-\CorINumber),
 \CorIIName{} (-\CorIINumber),
 \TbeIName{} (-\TbeINumber),
 \TbeIIName{} (-\TbeIINumber),
 \TimName{} (-\TimNumber),
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\ASoloName{} (-\ASoloNumber),
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber),
-\VcBName{} (-\VcBNumber),
-\VcName{} (-\VcNumber),
-\CbName{} (-\CbNumber).
 
 }
 \end{center}
diff --git a/TeX_Preindl_InTuoNomine_Include_Preface_Long.itex b/TeX_Preindl_InTuoNomine_Include_Preface_Long.itex
index af9190543d63c89493c60568c6f161c642d315e8..859f70e5ea99c5df52d4c94eed174a8ac2ffb8eb 100644
--- a/TeX_Preindl_InTuoNomine_Include_Preface_Long.itex
+++ b/TeX_Preindl_InTuoNomine_Include_Preface_Long.itex
@@ -7,7 +7,6 @@
 \input{TeX_Preindl_InTuoNomine_Include_About.itex}
 \input{TeX_Preindl_InTuoNomine_Include_Bio.itex}
 \input{TeX_Preindl_InTuoNomine_Include_Text.itex}
-% \pagebreak
 \end{preface}
 
 \mainmatter
diff --git a/TeX_Preindl_InTuoNomine_Score_Choral.tex b/TeX_Preindl_InTuoNomine_Score_Choral.tex
index 8f7259c356478d918cb1618101d67a5c7e086c84..5e4cb0d3de2aa6b60e5958aa6930a48c05693b99 100644
--- a/TeX_Preindl_InTuoNomine_Score_Choral.tex
+++ b/TeX_Preindl_InTuoNomine_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{editionkainhofer}
+\usepackage[choralscore]{editionkainhofer}
 \input{TeX_Preindl_InTuoNomine_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Preindl_InTuoNomine_Score_Full.tex b/TeX_Preindl_InTuoNomine_Score_Full.tex
index a80d1cf7d80700e5bea07913ece47a2dc2045bf9..b47cc16e339a19d81a8d6efbc08afda0cd8936ae 100644
--- a/TeX_Preindl_InTuoNomine_Score_Full.tex
+++ b/TeX_Preindl_InTuoNomine_Score_Full.tex
@@ -11,7 +11,6 @@
 
 \begin{document}
 \input{TeX_Preindl_InTuoNomine_Include_Coverpage.itex}
-% \input{TeX_Preindl_InTuoNomine_Include_Preface_Long.itex}
 \frontmatter
 \maketitle
 
diff --git a/TeX_Preindl_InTuoNomine_Score_Original.tex b/TeX_Preindl_InTuoNomine_Score_Original.tex
index 40d396cfa9be5a6b43e2f8ae988c0894adb05512..166cdc5c218ad45680ed471be7ab18fd2f228724 100644
--- a/TeX_Preindl_InTuoNomine_Score_Original.tex
+++ b/TeX_Preindl_InTuoNomine_Score_Original.tex
@@ -6,7 +6,7 @@
     pdftitle={\scoreTitle, \OriginalScoreType},
 }
 
-\scoretype{\FullScoreType (Original)}
+\scoretype{\OriginalScoreType}
 \scorenumber{\scoreNumber\OriginalScoreNumber}
 
 \begin{document}
diff --git a/out/Preindl_InTuoNomine_Instrument_A.pdf b/out/Preindl_InTuoNomine_Instrument_A.pdf
index cb0356f2713d131277b9e0ac19c5ea63e50394ee..232607711ab9739101d53271e87a0d88adf48feb 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_A.pdf and b/out/Preindl_InTuoNomine_Instrument_A.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_ASolo.pdf b/out/Preindl_InTuoNomine_Instrument_ASolo.pdf
index ab8585a673b83b3831d2184f2ef1db8a3f8653f4..fcbece09f5403cd38c930c732a8484353eec6f89 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_ASolo.pdf and b/out/Preindl_InTuoNomine_Instrument_ASolo.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_B.pdf b/out/Preindl_InTuoNomine_Instrument_B.pdf
index ea5f70bd8f6ad56d2f694a87a501ba8181c1073d..d3beabd8d9f194b6a20d125a25116ba9987bca4d 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_B.pdf and b/out/Preindl_InTuoNomine_Instrument_B.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_Cb.pdf b/out/Preindl_InTuoNomine_Instrument_Cb.pdf
index 9c72ab0dfc83ca0a339462586ed9bb7db4b401cf..6e9f3441667657031f0ace7c6e4c68d429f911b0 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_Cb.pdf and b/out/Preindl_InTuoNomine_Instrument_Cb.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_ClI.pdf b/out/Preindl_InTuoNomine_Instrument_ClI.pdf
index 9fab7a325747aa7fd10e510d23501c9667c7df08..d5dc4d99bcf0b4a995e75c170d119c894c467a38 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_ClI.pdf and b/out/Preindl_InTuoNomine_Instrument_ClI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_ClII.pdf b/out/Preindl_InTuoNomine_Instrument_ClII.pdf
index 0a303eb3f853b995211c20e9af9038015f66571e..9e82d6b15e0967383235679359d45f87c4423363 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_ClII.pdf and b/out/Preindl_InTuoNomine_Instrument_ClII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_CorI.pdf b/out/Preindl_InTuoNomine_Instrument_CorI.pdf
index 3c2c9be19713aa476de44ef46addd99bce3b7bf9..386e6ac4db0def6c11c2830a91a2ccb3bf4125fe 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_CorI.pdf and b/out/Preindl_InTuoNomine_Instrument_CorI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_CorII.pdf b/out/Preindl_InTuoNomine_Instrument_CorII.pdf
index 183c567b546bf0885f722094984c4219099ca1d8..3ba09f6688ae2f8e8c9a57263e5de992f6419162 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_CorII.pdf and b/out/Preindl_InTuoNomine_Instrument_CorII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_FagI.pdf b/out/Preindl_InTuoNomine_Instrument_FagI.pdf
index 19744b9d6034670e06148118e3570504f63d837f..de21387555f52c60a5aaf6ff903ef36e82dc9960 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_FagI.pdf and b/out/Preindl_InTuoNomine_Instrument_FagI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_FagII.pdf b/out/Preindl_InTuoNomine_Instrument_FagII.pdf
index 911ef27c36ffa510525c789ab21f5634070c7559..3b91b2f23e0ab48bf718e7631ba81998b8bdcc47 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_FagII.pdf and b/out/Preindl_InTuoNomine_Instrument_FagII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_FlI.pdf b/out/Preindl_InTuoNomine_Instrument_FlI.pdf
index add4ccb08e1ec1423345356b9c9f1229a1e0838b..af04bfd02cd4bb047b063c35302ac635ad8b286e 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_FlI.pdf and b/out/Preindl_InTuoNomine_Instrument_FlI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_FlII.pdf b/out/Preindl_InTuoNomine_Instrument_FlII.pdf
index f9a2af611152410720152b8c427cb3c27a8bf11e..670712b824c516daa0efd691b71985f988dbaa13 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_FlII.pdf and b/out/Preindl_InTuoNomine_Instrument_FlII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_ObI.pdf b/out/Preindl_InTuoNomine_Instrument_ObI.pdf
index 1d2a0e5380e14acc3668e2017386784a1d978771..97cdbe42ff10f53f6822f4e7972ea6ea3c4c9bb2 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_ObI.pdf and b/out/Preindl_InTuoNomine_Instrument_ObI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_ObII.pdf b/out/Preindl_InTuoNomine_Instrument_ObII.pdf
index bf3738856643838048650597c95a30f2cbfe5423..e37b44c396a7980a8859d081084cad3781f60759 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_ObII.pdf and b/out/Preindl_InTuoNomine_Instrument_ObII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_S.pdf b/out/Preindl_InTuoNomine_Instrument_S.pdf
index 909bb7ce72ea70ea330f9cd47dc7b027ffad013d..8297c83cbbddbfd5ba53a34251ec3c19b9eeffb9 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_S.pdf and b/out/Preindl_InTuoNomine_Instrument_S.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_T.pdf b/out/Preindl_InTuoNomine_Instrument_T.pdf
index 15445f74f03cf266a956a8ca1e57f8a8f8c538aa..80822c544d9f34445b1e876c3cdf5691e57f1753 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_T.pdf and b/out/Preindl_InTuoNomine_Instrument_T.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_TbeI.pdf b/out/Preindl_InTuoNomine_Instrument_TbeI.pdf
index 9ba0fe55166a0efdb47ddcfb53db338966cfc50f..f1281c7b2c0defa86bb6f163e038884ec171de0c 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_TbeI.pdf and b/out/Preindl_InTuoNomine_Instrument_TbeI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_TbeII.pdf b/out/Preindl_InTuoNomine_Instrument_TbeII.pdf
index e00cfc0b8cdd863cb95a2a58a226c33ac55d1c5f..f2d544d6a9c2a8b17da03acd5326b2488b13614c 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_TbeII.pdf and b/out/Preindl_InTuoNomine_Instrument_TbeII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_Tim.pdf b/out/Preindl_InTuoNomine_Instrument_Tim.pdf
index 496380310a9c4a36cf8780e55f4c98734d50bb64..8b094a8cbeb05d629ee86bdfad39d905cf9cd887 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_Tim.pdf and b/out/Preindl_InTuoNomine_Instrument_Tim.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_VI.pdf b/out/Preindl_InTuoNomine_Instrument_VI.pdf
index 269e53a2e0cce00bbc74014a6670eedcc2d6cc13..4a6c04e78c5d255e722be93ba114925956411fe5 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_VI.pdf and b/out/Preindl_InTuoNomine_Instrument_VI.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_VII.pdf b/out/Preindl_InTuoNomine_Instrument_VII.pdf
index 88c403d1b3fa754a8db64996d1a9459b850610bb..7f1d07acd991da6ce2a6f2bd78b6102845d172e0 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_VII.pdf and b/out/Preindl_InTuoNomine_Instrument_VII.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_Vc.pdf b/out/Preindl_InTuoNomine_Instrument_Vc.pdf
index 390275d81dde702c0a13e270d8cb1e6be6574e43..3767401eaa45e2e151d89b9960497f8e0971d3bb 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_Vc.pdf and b/out/Preindl_InTuoNomine_Instrument_Vc.pdf differ
diff --git a/out/Preindl_InTuoNomine_Instrument_VcB.pdf b/out/Preindl_InTuoNomine_Instrument_VcB.pdf
index 290383896d38558061e2727a629e7eac61d978c0..2220d73af20922cce4ca827a570161b8a674129f 100644
Binary files a/out/Preindl_InTuoNomine_Instrument_VcB.pdf and b/out/Preindl_InTuoNomine_Instrument_VcB.pdf differ
diff --git a/out/Preindl_InTuoNomine_Score_Vocal.pdf b/out/Preindl_InTuoNomine_Score_Vocal.pdf
index 7a854dd9b4ae81c08a90f651ca6c178c3e143b2b..e63e59042d3ba14ae416b699ff78767fe5b08c3d 100644
Binary files a/out/Preindl_InTuoNomine_Score_Vocal.pdf and b/out/Preindl_InTuoNomine_Score_Vocal.pdf differ