diff --git a/Eybler_UnamPetii_HV43_Score_Original.ly b/Eybler_UnamPetii_HV43_Score_Original.ly
index dbd8e9c0b0d9a22990d3cdd29e3bd64519051c1e..d7184d7ada33bc986b667994a2ad08db3c241efe 100644
--- a/Eybler_UnamPetii_HV43_Score_Original.ly
+++ b/Eybler_UnamPetii_HV43_Score_Original.ly
@@ -7,6 +7,9 @@
   scoretype = \OriginalScoreTitle
   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
 }
+SClef = \clef "soprano"
+AClef = \clef "alto"
+TClef = \clef "tenor"
 
 TIClef = \clef "tenor"
 TIIClef = \clef "tenor"
diff --git a/Makefile b/Makefile
index 0ec226204ab250f985c22121548a0a99a5f4d65c..07fc6a5da08da6bc9453e973d6565a6a02c9b4bd 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
 additionalscores = 
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) $(additionalscores) tex 
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
@@ -26,6 +26,8 @@ scores: $(scores)
 clean:
 	rm -rf $(OUT)
 
+lily: $(pdfs) $(additionalscores)
+
 $(OUT) :
 	mkdir -p $(OUT)
 
@@ -47,5 +49,5 @@ latex: $(pdfs) $(texpdfs)
 latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: latex --output-directory=$(OUT)/ $<
 
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex b/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex
index f60d127f5057f5cbe0e98878d404dfa3f1591e74..a028fb8e9f142ef1dbcf993283215a3354b1aa57 100644
--- a/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex
+++ b/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex b/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex
index 831aa7d6cebd01b6464ff5bca4e35aebc2be6091..09121355cc4b26b821fdf08a7c80854c32ff2b0a 100644
--- a/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex
+++ b/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Original.tex b/TeX_Eybler_UnamPetii_HV43_Score_Original.tex
index ad378076b7b3066182d109f9673f45da0fd6ae86..3041196559413cb2f06219e230dff58de0fcb91e 100644
--- a/TeX_Eybler_UnamPetii_HV43_Score_Original.tex
+++ b/TeX_Eybler_UnamPetii_HV43_Score_Original.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
diff --git a/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf b/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf
index d3a600025a79bfd8a673834f92bfa298066c11ff..1397c7c0e628965a2220461bf0c4ef3566a4da11 100644
Binary files a/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf and b/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf differ
diff --git a/out/Eybler_UnamPetii_HV43_Instrument_BII.pdf b/out/Eybler_UnamPetii_HV43_Instrument_BII.pdf
index 7f1ac56fa4b2abc3de5cf5be4eb5a28c54280ac4..23e915fa682d9f6765f2e3898079166d9aacf70c 100644
Binary files a/out/Eybler_UnamPetii_HV43_Instrument_BII.pdf and b/out/Eybler_UnamPetii_HV43_Instrument_BII.pdf differ
diff --git a/out/Eybler_UnamPetii_HV43_Instrument_TI.pdf b/out/Eybler_UnamPetii_HV43_Instrument_TI.pdf
index 043d846de2657f0f6b738ef67eb952913cac435d..777cc5cf7dc1ae6adcf592ad56604508c172ae66 100644
Binary files a/out/Eybler_UnamPetii_HV43_Instrument_TI.pdf and b/out/Eybler_UnamPetii_HV43_Instrument_TI.pdf differ
diff --git a/out/Eybler_UnamPetii_HV43_Instrument_TII.pdf b/out/Eybler_UnamPetii_HV43_Instrument_TII.pdf
index 642a0f7ea725eb0f01306e7b868e637154dcac2a..93343acfb923e347252b8e38d28ec164d73fc763 100644
Binary files a/out/Eybler_UnamPetii_HV43_Instrument_TII.pdf and b/out/Eybler_UnamPetii_HV43_Instrument_TII.pdf differ
diff --git a/out/Eybler_UnamPetii_HV43_Score_Choral.midi b/out/Eybler_UnamPetii_HV43_Score_Choral.midi
index adb516736dc4dac8c8ee9a93dee4514a892f1501..375c51adcb1d240b09ce2371d60e2bdc56e11356 100644
Binary files a/out/Eybler_UnamPetii_HV43_Score_Choral.midi and b/out/Eybler_UnamPetii_HV43_Score_Choral.midi differ
diff --git a/out/Eybler_UnamPetii_HV43_Score_Choral.pdf b/out/Eybler_UnamPetii_HV43_Score_Choral.pdf
index d87f4f42eb7a225d7753968c6310bb8c07f910e1..3c570ee324dee6398f0fd23c607f58f18dfc7f98 100644
Binary files a/out/Eybler_UnamPetii_HV43_Score_Choral.pdf and b/out/Eybler_UnamPetii_HV43_Score_Choral.pdf differ
diff --git a/out/Eybler_UnamPetii_HV43_Score_Original.midi b/out/Eybler_UnamPetii_HV43_Score_Original.midi
index adb516736dc4dac8c8ee9a93dee4514a892f1501..375c51adcb1d240b09ce2371d60e2bdc56e11356 100644
Binary files a/out/Eybler_UnamPetii_HV43_Score_Original.midi and b/out/Eybler_UnamPetii_HV43_Score_Original.midi differ
diff --git a/out/Eybler_UnamPetii_HV43_Score_Original.pdf b/out/Eybler_UnamPetii_HV43_Score_Original.pdf
index be5b68a8304fecf6946c66b35cbbe88880a5ed08..7667e760628225d691802238524b0f3a0a88c42e 100644
Binary files a/out/Eybler_UnamPetii_HV43_Score_Original.pdf and b/out/Eybler_UnamPetii_HV43_Score_Original.pdf differ
diff --git a/out/TeX_Eybler_UnamPetii_HV43_Score_Choral.pdf b/out/TeX_Eybler_UnamPetii_HV43_Score_Choral.pdf
index ce2f7f002ae03ce8d09b9d627bddbb89d8654487..a043d6b06834630a38c4ea128ca1458c9884d53d 100644
Binary files a/out/TeX_Eybler_UnamPetii_HV43_Score_Choral.pdf and b/out/TeX_Eybler_UnamPetii_HV43_Score_Choral.pdf differ
diff --git a/out/TeX_Eybler_UnamPetii_HV43_Score_Instruments.pdf b/out/TeX_Eybler_UnamPetii_HV43_Score_Instruments.pdf
index ea47e13ca58a4f299c9e6108e3ab683cc95ce048..fd1c6be93129a1f9667ef038f4cec66bc1c41d6b 100644
Binary files a/out/TeX_Eybler_UnamPetii_HV43_Score_Instruments.pdf and b/out/TeX_Eybler_UnamPetii_HV43_Score_Instruments.pdf differ
diff --git a/out/TeX_Eybler_UnamPetii_HV43_Score_Original.pdf b/out/TeX_Eybler_UnamPetii_HV43_Score_Original.pdf
index a9d86dea76da12d4d9f83705f132d6a90ab21a0e..ce3d746425502f32983ad92406d948ad28dfb460 100644
Binary files a/out/TeX_Eybler_UnamPetii_HV43_Score_Original.pdf and b/out/TeX_Eybler_UnamPetii_HV43_Score_Original.pdf differ
diff --git a/patches/TeX_Eybler_UnamPetii_HV43_Settings.itex.patch b/patches/TeX_Eybler_UnamPetii_HV43_Settings.itex.patch
index 988657ed7336d03429dd54f85a468729d772644f..7a46d089cd0ba8617bbebabe2bda491c9d0409df 100644
--- a/patches/TeX_Eybler_UnamPetii_HV43_Settings.itex.patch
+++ b/patches/TeX_Eybler_UnamPetii_HV43_Settings.itex.patch
@@ -1,18 +1,16 @@
---- TeX_Eybler_UnamPetii_HV43_Settings.itex.new	2009-10-01 12:24:54.000000000 +0200
-+++ TeX_Eybler_UnamPetii_HV43_Settings.itex	2009-10-01 12:24:16.000000000 +0200
-@@ -2,9 +2,9 @@
+--- TeX_Eybler_UnamPetii_HV43_Settings.itex.new	2009-10-05 16:35:15.000000000 +0200
++++ TeX_Eybler_UnamPetii_HV43_Settings.itex	2009-10-01 14:50:23.000000000 +0200
+@@ -2,8 +2,8 @@
  \subtitle{Graduale, HV 43}
  \composer{Joseph Eybler}
  \composerdate{(1765-1846)}
 -% \description{Per Coro (SATB) ed Organo o Orchestra}
 -% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)}
--\editor{Reinhold Kainhofer}
 +\description{Per Soli (TTBB) a capella}
 +% \instrumentation{TODO 2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
-+\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
+ \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
  \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
  \year{2009}
- \scoreinfo{Urtext}
 @@ -20,3 +20,13 @@
  }