diff --git a/1043 - Eybler - Unam petii HV43.def b/1043 - Eybler - Unam petii HV43.def
new file mode 100644
index 0000000000000000000000000000000000000000..92941e7045a5681f4898f7b91eef2568661dc363
--- /dev/null
+++ b/1043 - Eybler - Unam petii HV43.def	
@@ -0,0 +1,42 @@
+{
+  "output_dir": "1043 - Eybler - Unam petii HV43",
+  "version": "2.13.1",
+  "template": "EK_Full",
+  "language": "Latin",
+  "additionalscores": [],
+  "options": ["optimal-breaking"],
+
+  "defaults": {
+    "title": "Unam petii",
+    "subtitle": "Graduale, HV 43",
+    "composer": "Joseph Eybler",
+    "composerdate": "1765-1846",
+
+    #"arranger": u"<<arranger>>",
+    #"opus": u"<<opus>>",
+    #"instrumentation": u"<<instrumentation>>",
+    #"key": u"<<key>>",
+    #"language": u"<<language>>",
+    #"duration": u"<<duration>>",
+    #"composition_year": u"<<composition_year>>",
+    #"score_information": u"<<score_information>>",
+    #"genre": u"<<genre>>",
+
+    "year": "2009",
+    "publisher": "Edition Kainhofer, Vienna",
+    "publisherurl": "http://www.edition-kainhofer.com/",
+    "editor": "Reinhold Kainhofer",
+    "editorurl": "http://reinhold.kainhofer.com/",
+    "editormail": "reinhold@kainhofer.com",
+    "scorenumber": "EK-1043",
+    "scoreinfo": "Urtext",
+    "basename": "Eybler_UnamPetii_HV43",
+
+    "instruments": ["TI", "TII", "BI", "BII"],
+    "vocalvoices": ["TI", "TII", "BI", "BII"],
+    "scores": ["Choral", "Original"],
+  },
+
+  "scores": ["UnamPetii"],
+  "latex": {},
+}
diff --git a/Eybler_UnamPetii_HV43_Instrument_BI.ly b/Eybler_UnamPetii_HV43_Instrument_BI.ly
index c38df2411a74fb9d3b98cc4c3f6e1c0938163da1..4d4ae47bc05f68ee85b471abe989f341bd38a22c 100644
--- a/Eybler_UnamPetii_HV43_Instrument_BI.ly
+++ b/Eybler_UnamPetii_HV43_Instrument_BI.ly
@@ -3,7 +3,7 @@
 
 \header {
   instrument = \BIInstrumentName
-  scorenumber = \markup{\scoreNumber \BINumber}
+  instrumentnr = \BINumber
 }
 
 \createScore #"UnamPetii" #'("BI")
diff --git a/Eybler_UnamPetii_HV43_Instrument_BII.ly b/Eybler_UnamPetii_HV43_Instrument_BII.ly
index 514394bcf24f7ecf9df0e9186c85e680be2584be..3dd4b596f8c756c5376879f6d24ac460e9dceeeb 100644
--- a/Eybler_UnamPetii_HV43_Instrument_BII.ly
+++ b/Eybler_UnamPetii_HV43_Instrument_BII.ly
@@ -3,7 +3,7 @@
 
 \header {
   instrument = \BIIInstrumentName
-  scorenumber = \markup{\scoreNumber \BIINumber}
+  instrumentnr = \BIINumber
 }
 
 \createScore #"UnamPetii" #'("BII")
diff --git a/Eybler_UnamPetii_HV43_Instrument_TI.ly b/Eybler_UnamPetii_HV43_Instrument_TI.ly
index 316e38bfe0e29a4baa5c0d85f20bcba88092a9e3..72698780b29b935faf3ad501379a001d8f2a23d7 100644
--- a/Eybler_UnamPetii_HV43_Instrument_TI.ly
+++ b/Eybler_UnamPetii_HV43_Instrument_TI.ly
@@ -3,7 +3,7 @@
 
 \header {
   instrument = \TIInstrumentName
-  scorenumber = \markup{\scoreNumber \TINumber}
+  instrumentnr = \TINumber
 }
 
 \createScore #"UnamPetii" #'("TI")
diff --git a/Eybler_UnamPetii_HV43_Instrument_TII.ly b/Eybler_UnamPetii_HV43_Instrument_TII.ly
index 1534ea450e3a3249ded53d733f5f0a682754335c..5e1bace9c761859571f84f261d6e275f567bf490 100644
--- a/Eybler_UnamPetii_HV43_Instrument_TII.ly
+++ b/Eybler_UnamPetii_HV43_Instrument_TII.ly
@@ -3,7 +3,7 @@
 
 \header {
   instrument = \TIIInstrumentName
-  scorenumber = \markup{\scoreNumber \TIINumber}
+  instrumentnr = \TIINumber
 }
 
 \createScore #"UnamPetii" #'("TII")
diff --git a/Eybler_UnamPetii_HV43_Score_Choral.ly b/Eybler_UnamPetii_HV43_Score_Choral.ly
index 02f83944ee97376990869310ac60c828d378c3f5..251e0ea354119391312eaea8ae72c2d74204ce03 100644
--- a/Eybler_UnamPetii_HV43_Score_Choral.ly
+++ b/Eybler_UnamPetii_HV43_Score_Choral.ly
@@ -5,7 +5,7 @@
 
 \header {
   scoretype = \ChoralScoreTitle
-  scorenumber = \markup{\scoreNumber \ChoralScoreNumber}
+  instrumentnr = \ChoralScoreNumber
 }
 
 \createScore #"UnamPetii" #'("ChoralScore")
diff --git a/Eybler_UnamPetii_HV43_Score_Original.ly b/Eybler_UnamPetii_HV43_Score_Original.ly
index d7184d7ada33bc986b667994a2ad08db3c241efe..5c564318e6a2ef54e24ba0dc4802da23a1ade357 100644
--- a/Eybler_UnamPetii_HV43_Score_Original.ly
+++ b/Eybler_UnamPetii_HV43_Score_Original.ly
@@ -1,20 +1,11 @@
 \version "2.13.1"
+#(ly:set-option 'ancient-style #t)
 \include "Eybler_UnamPetii_HV43_Settings_FullScore.ily"
-\setCreateMIDI ##t
-\setCreatePDF ##t
 
 \header {
   scoretype = \OriginalScoreTitle
-  scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
+  instrumentnr = \OriginalScoreNumber
 }
-SClef = \clef "soprano"
-AClef = \clef "alto"
-TClef = \clef "tenor"
-
-TIClef = \clef "tenor"
-TIIClef = \clef "tenor"
-BIClef = \clef "bass"
-BIIClef = \clef "bass"
 
 \createScore #"UnamPetii" #'("ChoralScore")
 
diff --git a/Eybler_UnamPetii_HV43_Settings_Global.ily b/Eybler_UnamPetii_HV43_Settings_Global.ily
index ba8bcd4530b91d8a6a9a74142d85d98e84f38c00..f02029052a921f729f4225dfc66946d0474a0e3d 100644
--- a/Eybler_UnamPetii_HV43_Settings_Global.ily
+++ b/Eybler_UnamPetii_HV43_Settings_Global.ily
@@ -1,16 +1,13 @@
 \version "2.13.1"
 
-\include "orchestrallily/oly_settings_names.ily"
-
-scorenumber="EK-1043"
 
 \header {
+  scorenumberbase="EK-1043"
   title = "Unam petii"
   subtitle = "Graduale, HV 43"
   composer = "Joseph Eybler (1765-1846)"
-  copyright = \markup \abs-fontsize #9 \column{
-      \line { "2009, " \concat{\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."}
+  copyright = \markup \abs-fontsize #9 \column {
+    \line { "© 2010, " \concat{\with-url #"http://www.edition-kainhofer.com/" {"Edition Kainhofer, Vienna"},} \concat{\fromproperty #'header:scorenumber .} "Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
   }
 }
 
@@ -20,8 +17,8 @@ scorenumber="EK-1043"
 % CorKey = \key g \major
 % CorIKey = \CorKey
 % CorIIKey = \CorKey
-TIClef = \clef "treble_8"
-TIIClef = \clef "treble_8"
+TIClef = \clef "tenor/treble_8"
+TIIClef = \clef "tenor/treble_8"
 BIClef = \clef "bass"
 BIIClef = \clef "bass"
 
diff --git a/Makefile b/Makefile
index 2ea2fd0c08acb26be2a3ca855bb31c92041f32ad..4700faa51fa7649f191f1acaf4a52a188df39261 100644
--- a/Makefile
+++ b/Makefile
@@ -49,5 +49,16 @@ latex: $(pdfs) $(texpdfs)
 latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT):orchestrallily/:.//: latex --output-directory=$(OUT)/ $<
-
+	TEXINPUTS=$(OUT):orchestrallily/:.//: xelatex -interaction=batchmode --output-directory=$(OUT)/ $<
+
+zipdir = $(base)_Final
+dist: $(distfiles)
+	mkdir -p $(zipdir)
+	cp -r $(distfiles) $(zipdir)
+	rename 's/TeX_//' $(zipdir)/*
+	rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
+	zip -jr $(base).zip $(zipdir)
+	rm -rf $(zipdir)
+
+webshop: $(distfiles)
+	python ../../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "1043 - Eybler - Unam petii HV43.def" $(distfiles)
diff --git a/TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex b/TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex
index e5dbdd7a0d3e80f19ea191c69ed33cced96e8401..85991bd6a7536734cf0c8347aeb9b65d64985590 100644
--- a/TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex
@@ -27,15 +27,15 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \vfill
 \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
 \begin{hauptquellen}
-\item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
-\item Handschriftlicher Stimmensatz und Vokalpartitur (als vierstimmes a-capella Graduale) der Peterskirche, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: F 24 St. Peter Wien D 106 (I,II).
+\item Autographe Partitur, Archiv des Schottenstifts, Wien. Signatur: TODO.
+\item Handschriftlicher Stimmensatz und Vokalpartitur (als vierstimmes a-capella Graduale) der Peterskirche, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: A-Wn F 24 St. Peter Wien D 106 (I,II).
 \end{hauptquellen}
 
 \vfill
 
 \makeatletter
-\copyrightbox{© \@year, \@publisher\newline
-1. Auflage / 1st Printing \@year\newline
+\copyrightbox{© \@yearpublished, \@publisher\newline
+1. Auflage / 1st Printing \@yearpublished\newline
 Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex b/TeX_Eybler_UnamPetii_HV43_Score_Choral.tex
index f285c14fcd94f7878c862d53a4b09a8e686393fd..52310a368344abeb41f242f72177d860f9cacf4b 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{editionkainhofer}
+\usepackage[choralscore]{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,6 @@
 
 \scoretype{\ChoralScoreType}
 \scorenumber{\scoreNumber\ChoralScoreNumber}
-\ChoralScoreSettings
 
 \begin{document}
 \input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex}
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex b/TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex
index 88bc884d5c6b4fb0c4aadd9058cb297e712fc2d7..cc109d3a3b0cab9031032c36162824dacc717031 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{editionkainhofer}
+\usepackage[instrumentalparts]{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,6 @@
 
 \scoretype{\InstrumentalPartsType}
 \scorenumber{\scoreNumber\InstrumentalPartsNumber}
-\InstrumentalPartsSettings
 
 \begin{document}
 \input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex}
diff --git a/TeX_Eybler_UnamPetii_HV43_Score_Original.tex b/TeX_Eybler_UnamPetii_HV43_Score_Original.tex
index 1a647a37fc9ab12c49a75622e9145535dd60eae3..a985b37118ea5ba9eb44369a65bd0cea831c784c 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{editionkainhofer}
+\usepackage[fullscore]{editionkainhofer}
 \input{TeX_Eybler_UnamPetii_HV43_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,6 @@
 
 \scoretype{\OriginalScoreType}
 \scorenumber{\scoreNumber\OriginalScoreNumber}
-\OriginalScoreSettings
 
 \begin{document}
 \input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex}
diff --git a/TeX_Eybler_UnamPetii_HV43_Settings.itex b/TeX_Eybler_UnamPetii_HV43_Settings.itex
index 03827cbd2fee1653b34fe9138c52277413a99bc8..40a12d644d4ae1c0a1a3000b90e8085d86fed05e 100644
--- a/TeX_Eybler_UnamPetii_HV43_Settings.itex
+++ b/TeX_Eybler_UnamPetii_HV43_Settings.itex
@@ -6,7 +6,7 @@
 % \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}}
 \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
-\year{2009}
+\yearpublished{2009}
 \scoreinfo{Urtext}
 
 \basename{Eybler_UnamPetii_HV43}
diff --git a/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf b/out/Eybler_UnamPetii_HV43_Instrument_BI.pdf
index 1397c7c0e628965a2220461bf0c4ef3566a4da11..48ff3421b72f60b5f4fe05fa44f0e20832c6c86f 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 23e915fa682d9f6765f2e3898079166d9aacf70c..78165e4e7319b99c5c821dfe74805944e650cbb1 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 777cc5cf7dc1ae6adcf592ad56604508c172ae66..1be4c45ba87fa4e2ec358ea3ef616d88e55a5a83 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 93343acfb923e347252b8e38d28ec164d73fc763..a87627b472da744097b4806cfffc90f43d66b35e 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 375c51adcb1d240b09ce2371d60e2bdc56e11356..a2b4eb307790c6c5099be4a0b075980434b92bbb 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 3c570ee324dee6398f0fd23c607f58f18dfc7f98..647da8e45139dc55a6548cc0b483526a9dc88156 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.pdf b/out/Eybler_UnamPetii_HV43_Score_Original.pdf
index 7667e760628225d691802238524b0f3a0a88c42e..c26a0bd1ca3e9390c2e9a24ef6678bc4e1b14ccf 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 a043d6b06834630a38c4ea128ca1458c9884d53d..1b4a94e02bc867ec552929a3556204257f82eb4f 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 fd1c6be93129a1f9667ef038f4cec66bc1c41d6b..e6212fbf88f72731c968dddb65afe2d5e30833ea 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 ce3d746425502f32983ad92406d948ad28dfb460..326ba135b2bf0330efbc107f43dd7a939b35c3cb 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/webshop_descriptions.def b/webshop_descriptions.def
new file mode 100644
index 0000000000000000000000000000000000000000..142738fb7a65ac9cad847b1d259c02a20df154c8
--- /dev/null
+++ b/webshop_descriptions.def
@@ -0,0 +1,21 @@
+{
+  #"title": u"Joseph Eybler: Unam petii, Graduale, HV 43",
+
+  "Short_Description_de": u"",
+  "Short_Description_en": u"",
+  
+  "Description_de": u'''<p></p>''',
+  "Description_en": u'''<p></p>''',
+  
+  "Category": u"",
+  
+  #"published": "Y",
+
+  "Child_Products": [
+    {"sku": "EK-1043-1", "ismn": "", "comment": "", "price": 0.0}, # Partitur
+    {"sku": "EK-1043-10", "ismn": "", "comment": "", "price": 0.0}, # Chorstimmen / Choral score
+    {"sku": "EK-1043-25", "ismn": "", "comment": "", "price": 0.0}, # Orchesterstimmen / Orchestra parts
+  ],
+  "Productimages": [
+  ],
+}