diff --git a/1123 - Eybler - Tristes erant HV123.def b/1123 - Eybler - Tristes erant HV123.def
new file mode 100644
index 0000000000000000000000000000000000000000..f2900d6423fbe084d6962d6b3c0212cda30c3226
--- /dev/null
+++ b/1123 - Eybler - Tristes erant HV123.def	
@@ -0,0 +1,42 @@
+{
+  "output_dir": "1123 - Eybler - Tristes erant HV123",
+  "version": "2.17.6",
+  "template": "EK_Full",
+  "language": "deutsch",
+  "additionalscores": [],
+  "options": ["optimal-breaking","nocolortitle"],
+
+  "defaults": {
+    "title": "Tristes erant Apostoli",
+    "subtitle": "Hymnus, HV 123",
+    "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": "2012",
+    "publisher": "Edition Kainhofer, Vienna",
+    "publisherurl": "http://www.edition-kainhofer.com/",
+    "editor": "Reinhold Kainhofer",
+    "editorurl": "http://reinhold.kainhofer.com/",
+    "editormail": "reinhold@kainhofer.com",
+    "scorenumber": "EK-1123",
+    "basename": "Eybler_TristesErant_HV123",
+
+    "instruments": ["Ch", "Continuo", "VcB" ],
+    "noscore_instruments": ["Ch"],
+    "vocalvoices": ["Ch"],
+    "scores": ["Full", "Choral"],
+  },
+
+  "scores": ["TristesErant"],
+  "latex": {},
+}
diff --git a/979-0-50217-081-3.pdf b/979-0-50217-081-3.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c2312c5686b3ddbf422e42d951f85369dec3b67b
Binary files /dev/null and b/979-0-50217-081-3.pdf differ
diff --git a/Eybler_TristesErant_HV123_Instrument_Continuo.ly b/Eybler_TristesErant_HV123_Instrument_Continuo.ly
index 34ad69b28ffd8c0c20576a184bd986cd56d4fb23..c1aba5124495dfef80318bada51a0fedaca35bba 100644
--- a/Eybler_TristesErant_HV123_Instrument_Continuo.ly
+++ b/Eybler_TristesErant_HV123_Instrument_Continuo.ly
@@ -1,15 +1,18 @@
-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_Instrument.ily"
+#(set-global-staff-size 17)
 
 \header {
-  instrument = "Organo"
-  scorenumber = \markup{\scoreNumber \ContinuoNumber}
+  instrument = \ContinuoInstrumentName
+  instrumentnr = \ContinuoNumber
+  arranger = "Generalbass-Aussetzung: R. Kainhofer"
 }
 \paper {
-  ragged-bottom = ##t
-  ragged-last-bottom = ##t
+  ragged-bottom = ##f
+  ragged-last-bottom = ##f
 }
 
-\createScore #"TristesErant" #'("Continuo")
-\noPageBreak
+\createNoCuesScore #"TristesErant" #'("RealizedContinuo")
+\createHeadline "Praeludium"
+\createNoCuesScore #"TristesErantII" #'("RealizedContinuo")
 \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"
diff --git a/Eybler_TristesErant_HV123_Instrument_VcB.ly b/Eybler_TristesErant_HV123_Instrument_VcB.ly
index fa4e6ec51499f49f370e4d4baddf27b0e79c362a..642d7bb130b4e93cbe41ea0d41eefb58f84c6721 100644
--- a/Eybler_TristesErant_HV123_Instrument_VcB.ly
+++ b/Eybler_TristesErant_HV123_Instrument_VcB.ly
@@ -1,9 +1,10 @@
-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_Instrument.ily"
 
 \header {
   instrument = "Violone"
-  scorenumber = \markup{\scoreNumber \VcBNumber}
+  instrumentnr = \VcBNumber
+  arranger = ##f
 }
 \paper {
   ragged-bottom = ##t
@@ -15,13 +16,20 @@
 %     \remove "Instrument_name_engraver"
 %   }
 %   \context {
-%     \RemoveEmptyStaffContext 
+%     \Staff \RemoveEmptyStaves 
 %     % No instrument names, they are already in the title/header! (Removing 
 %     % the engraver only from the \Staff context is not sufficient!)
 %     \remove "Instrument_name_engraver"
 %   }
 % }
 
-\createScore #"TristesErant" #'("VcB")
-\noPageBreak
+% \createScore #"TristesErant" #'("VcB")
+% \noPageBreak
+% \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"
+TristesErantVcBMusic = \TristesErantBCMusic
+TristesErantIIVcBMusic = \TristesErantIIBCMusic
+
+\createNoCuesScore #"TristesErant" #'("VcB")
+\createHeadline "Praeludium"
+\createNoCuesScore #"TristesErantII" #'("VcB")
 \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"
diff --git a/Eybler_TristesErant_HV123_Music_TristesErant.ily b/Eybler_TristesErant_HV123_Music_TristesErant.ily
index d85b54aec80ccf863cd371f4269a59076db9e4e4..fee5a232158647919765d00d2abeeebcb08d7597 100644
--- a/Eybler_TristesErant_HV123_Music_TristesErant.ily
+++ b/Eybler_TristesErant_HV123_Music_TristesErant.ily
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.17.6"
 
 TristesErantPieceName = "Tristes erant"
 TristesErantIIPieceName = "Gloria tibi"
@@ -81,12 +81,13 @@ TristesErantBCMusic = \relative c {
   c2 r \bar"|."
   \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
   \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT  
-  \tag #'cues \mark "Da Capo"
-%   TODO: Print Da capo
+%   \tag #'cues \mark "Da Capo"
 }
 TristesErantIIBCMusic=\TristesErantBCMusic
 
-TristesErantBCFbMusic = \figuremode {
+TristesErantFiguredBassMusic = \figuremode {\bassFigureStaffAlignmentDown
+  \set FiguredBass.implicitBassFigures = #'(0)
+  \set FiguredBass.useBassFigureExtenders = ##t
   s1 | % 2
   <6>4 <6 4> \bassFigureExtendersOn <3>8 <3> <3> <3> | % 3
   <6>4 s <6> s | % 4
@@ -96,13 +97,26 @@ TristesErantBCFbMusic = \figuremode {
   s s s <6>8 s | % 8
   <6>8 s <6> s s2 | % 9
   \bassFigureExtendersOff
-  s <\markup{\hat \number 5}>4 <6> | \barNumberCheck #10
-  \bassFigureExtendersOn
+  s <\markup{\fontsize #-2 \hat \number 5}>4 <\markup{\pad-y #1.5 "_"}>8 <6>8 | \barNumberCheck #10
+  \bassFigureExtendersOn 
   s2 <6 4>4 <5 _!> | % 11
   s2 <6\\>8 <8>8 <5 4> <5  _!> | % 12
   s1 \bar"|."
 }
-TristesErantIIBCFbMusic = \TristesErantBCFbMusic
+TristesErantIIFiguredBassMusic = \TristesErantFiguredBassMusic
 
-TristesErantVcBMusic = \TristesErantBCMusic
-TristesErantIIVcBMusic = \TristesErantIIBCMusic
+TristesErantBCRealizationMusic = \relative c' {
+  <c es g>1 | % 2
+  <c f>4 <c es g>4 <c f as>2 | % 3
+  <h d g>2 <c es g> | % 4
+  <c es as>1 | % 5
+  <c f>4 <h d g> <as c es>2 | % 6
+  <g h d>2 <h d g> | % 7
+  <c es g> <b d f>4 <b es g> | % 8
+  <c es as> <b es g> <c f as>2 | % 9
+  <c f as>2 <d f as>4 <d g> | \barNumberCheck #10
+  <c es g>2 <c es>4 <h d> | % 11
+  <c es g>2 <d f h>8[ <es g c>8 <d g c> <d g h>] |
+  <es g c>2 r 
+}
+TristesErantIIBCRealizationMusic = \TristesErantBCRealizationMusic
\ No newline at end of file
diff --git a/Eybler_TristesErant_HV123_Score_Choral.ly b/Eybler_TristesErant_HV123_Score_Choral.ly
new file mode 100644
index 0000000000000000000000000000000000000000..cd0bec00cf5b88e77605b620048fca7ec75db9ff
--- /dev/null
+++ b/Eybler_TristesErant_HV123_Score_Choral.ly
@@ -0,0 +1,17 @@
+\version "2.17.6"
+\include "Eybler_TristesErant_HV123_Settings_ChoralScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \ChoralScoreTitle
+  instrumentnr = \ChoralScoreNumber
+}
+\paper {
+  ragged-last-bottom = ##t
+}
+
+\createScore #"TristesErant" #'("ChoralScore")
+\createHeadline "Praeludium"
+\createScore #"TristesErantII" #'("ChoralScore")
+\createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"
diff --git a/Eybler_TristesErant_HV123_Score_Full.ly b/Eybler_TristesErant_HV123_Score_Full.ly
index b0e3d9e0d49eff4ee826eec8fc3b6ab370b7b37c..c5305409331d48d67c45ae0a0f72767399ee556b 100644
--- a/Eybler_TristesErant_HV123_Score_Full.ly
+++ b/Eybler_TristesErant_HV123_Score_Full.ly
@@ -1,17 +1,25 @@
-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
+  instrumentnr = \FullScoreNumber
 }
 \paper {
 %   ragged-bottom = ##t
   system-count = #3
-  system-separator-markup = #f
+  system-separator-markup = ##f
+  page-count = 1
+%   annotate-spacing = ##t 
+
+  system-system-spacing #'padding = #2
+  system-system-spacing #'minimum-distance = #5
+  markup-markup-spacing #'basic-distance = #5
 }
+OMidiInstrument = "accoustic grand"
+RealizedContinuoMidiInstrument = "accoustic grand"
 
 \createNoCuesScore #"TristesErant" #'("FullScore")
 \createHeadline "Praeludium"
diff --git a/Eybler_TristesErant_HV123_Settings.ily b/Eybler_TristesErant_HV123_Settings.ily
index e39dd9085c78b310b8c59eabc30a0f36fccdc5ee..8269ba31070d240a08c55508fa0bf59f4f2763e0 100644
--- a/Eybler_TristesErant_HV123_Settings.ily
+++ b/Eybler_TristesErant_HV123_Settings.ily
@@ -1,4 +1,4 @@
-#(set-default-paper-size "a4")
+\version "2.17.6"
 #(ly:set-option 'point-and-click #f)
 
 \include "deutsch.ly"
diff --git a/Eybler_TristesErant_HV123_Settings_ChoralScore.ily b/Eybler_TristesErant_HV123_Settings_ChoralScore.ily
new file mode 100644
index 0000000000000000000000000000000000000000..3cb281d37de9f97c4d3a416b258d7d472dfff541
--- /dev/null
+++ b/Eybler_TristesErant_HV123_Settings_ChoralScore.ily
@@ -0,0 +1,4 @@
+\version "2.17.6"
+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_TristesErant_HV123_Settings.ily"
+#(set-global-staff-size 20)
diff --git a/Eybler_TristesErant_HV123_Settings_FullScore.ily b/Eybler_TristesErant_HV123_Settings_FullScore.ily
index 52df6c123fd2cf5d0430c9950dc83cda4a4bb581..99131d652c703421640f5f4146503c3bb40f2799 100644
--- a/Eybler_TristesErant_HV123_Settings_FullScore.ily
+++ b/Eybler_TristesErant_HV123_Settings_FullScore.ily
@@ -1,2 +1,7 @@
+\version "2.17.6"
 \include "orchestrallily/oly_settings_fullscore.ily"
 \include "Eybler_TristesErant_HV123_Settings.ily"
+#(set-global-staff-size 13)
+\header {
+    arranger = "Generalbass-Aussetzung: R. Kainhofer"
+  }
\ No newline at end of file
diff --git a/Eybler_TristesErant_HV123_Settings_Global.ily b/Eybler_TristesErant_HV123_Settings_Global.ily
index d49e076533b4759e642225c1226392236061d3e3..c7c8f54c668c74af00fe5114969c3d9fc5de079f 100644
--- a/Eybler_TristesErant_HV123_Settings_Global.ily
+++ b/Eybler_TristesErant_HV123_Settings_Global.ily
@@ -1,31 +1,55 @@
-\version "2.13.1"
+\version "2.17.6"
 
-\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_names.ily"
 
-scorenumber="EK-1123"
 
-\header { 
+\header {
+  LicenseCCBY = \markup {Lizenz: / License: Creative Commons BY \with-url #"http://creativecommons.org/licenses/by/3.0/at/" {\translate #'(0 . -0.7) \epsfile #Y #2.75 #"orchestrallily/cc-by.eps" }}
+
+  scorenumberbase = "EK-1123"
   title = "Tristes erant Apostoli"
+  titlepagetitle = "Tristes erant Apostoli"
   subtitle = "Hymnus, HV 123"
+  titlepagesubtitle = "Hymnus, HV 123"
   composer = "Joseph Eybler (1765-1846)"
-  copyright = \markup \abs-fontsize #9 \column{
-      \line { "2009, Edition Kainhofer, Vienna. 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."}
+  shortcomposer = "J. Eybler"
+
+  ismn = "979-0-50217-081-3"
+  copyright = \markup \abs-fontsize #8 \column{
+    \line {© 2012, \concat{\with-url #"http://www.edition-kainhofer.com/" {"Edition Kainhofer, Vienna, Austria"}.} \concat{\fromproperty #'header:scorenumber ,} ISMN \concat{\fromproperty #'header:ismn .} \LicenseCCBY }
+    \LicenseNoRestrictions
   }
 }
 
-% Possibly adjust the \orchestralScoreStructure here...
+%% Possibly adjust the \orchestralScoreStructure here...
 
 % Add custom keys here, e.g.
 % CorKey = \key g \major
 % CorIKey = \CorKey
 % CorIIKey = \CorKey
-#(oly:remove_from_score_structure "Ch")
-ContinuoInstrumentName = \markup\column{"Organo" "e Bassi"}
-ChShortInstrumentName = #f
-ContinuoShortInstrumentName = #f
+\orchestralScoreStructure #'(
+  ;  ("BCFb" "FiguredBass" ())
+  ;  ("FiguredBass" "FiguredBass" ())
+  ;("Organ" "SimultaneousMusic" ("BCFb" "O"))
+  ("Continuo" "ParallelVoicesStaff" ("BCFb" "BC" "FiguredBass"))
+  ("RealizedContinuo" "PianoStaff" ("BCRealization" "Continuo"))
+  ("ChoralScore" "SimultaneousMusic" ("Ch"))
+; Full Scores
+  ("FullScore" "SimultaneousMusic" ("Ch" "RealizedContinuo"))
+)
+
+% #(oly:remove_from_score_structure "Ch")
+% #(oly:remove_from_score_structure "VcB")
+% ContinuoInstrumentName = \markup\column{"Organo" "e Bassi"}
+ChInstrumentName = "Chor"
+ContinuoInstrumentName = "Continuo"
+RealizedContinuoInstrumentName = "Organo"
+ChShortInstrumentName = ##f
+ContinuoShortInstrumentName = ##f
 
 \paper {
   #(define (page-post-process layout pages) #f)
-}
\ No newline at end of file
+}
+SClef = \clef "soprano/treble"
+AClef = \clef "alto/treble"
+TClef = \clef "tenor/treble_8"
diff --git a/Eybler_TristesErant_HV123_Settings_Instrument.ily b/Eybler_TristesErant_HV123_Settings_Instrument.ily
index 5d792e30fb178806a8ec797d2c656dc71b826bb1..50835961aaa5fc875e91ef7e4fd9d9bbe6f9568f 100644
--- a/Eybler_TristesErant_HV123_Settings_Instrument.ily
+++ b/Eybler_TristesErant_HV123_Settings_Instrument.ily
@@ -1,6 +1,7 @@
-\include "Eybler_TristesErant_HV123_Settings.ily"
+\version "2.17.6"
 \include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_TristesErant_HV123_Settings.ily"
 
 \paper {
   #(define page-breaking ly:optimal-breaking)
-}
\ No newline at end of file
+}
diff --git a/Eybler_TristesErant_HV123_Settings_Vocal.ily b/Eybler_TristesErant_HV123_Settings_Vocal.ily
index ba6ae1ec8f790a3a93f972dcb853182c7080050a..582dc342c82a80e3dcd7e5efff18f7cc9f24c671 100644
--- a/Eybler_TristesErant_HV123_Settings_Vocal.ily
+++ b/Eybler_TristesErant_HV123_Settings_Vocal.ily
@@ -1,2 +1,4 @@
+\version "2.17.6"
+\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_vocalvoice.ily"
 \include "Eybler_TristesErant_HV123_Settings.ily"
diff --git a/Makefile b/Makefile
index c7d919b4e4228e28b47e9f2eba9e04cb3155e6a8..f1c8d79c752737df3d350a69d85d710ba416930a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,67 @@
-SRCS = Eybler_TristesErant_HV123_Music_TristesErant.ily Eybler_TristesErant_HV123_Settings.ily
 OUT=out
 
+base = Eybler_TristesErant_HV123
+SRCS = $(base)_Music_TristesErant.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_Instrument.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_FullScore.ily
 instruments = Continuo VcB
-scores = Full
+scores = Full Choral
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
-pdfs = $(instruments:%=$(OUT)/Eybler_TristesErant_HV123_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_TristesErant_HV123_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_TristesErant_HV123_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_Eybler_TristesErant_HV123_Score_%.pdf)
 
+texbase = Eybler_TristesErant_HV123
+texscores = Full
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf)  $(OUT)/$(base)_Score_Choral.pdf
+#      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
+
+distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs)
+
+additionalscores =
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
-clean: 
+
+clean:
 	rm -rf $(OUT)
 
-$(OUT) : 
+lily: $(pdfs) $(additionalscores)
+
+$(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_TristesErant_HV123_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_TristesErant_HV123_Score_%.pdf $(SRCS)
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
+
 
-$(OUT)/%.pdf : %.ly $(SRCS)
+$(OUT)/%.pdf : %.ly
 	lilypond -o $(basename $@) $<
 
 $(OUT)/%.mp3 : %.midi
 	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
-tex: latex
-latex: $(texpdfs)
+$(additionalscores): $(OUT)/%.pdf: %.ly
+	lilypond -dbackend=eps -o $(basename $@) $<
+
+tex: $(additionalscores) latex
+latex: $(pdfs) $(texpdfs)
+latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: xelatex --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 "1123 - Eybler - Tristes erant HV123.def" $(distfiles)
diff --git a/Materialien b/Materialien
new file mode 120000
index 0000000000000000000000000000000000000000..22c400887e3411eee1c01c690893efeea8ee41e1
--- /dev/null
+++ b/Materialien
@@ -0,0 +1 @@
+../../Komponisten/Eybler/Werke/HV123 Tristes erant/
\ No newline at end of file
diff --git a/TeX_Eybler_TristesErant_HV123_Include_About.itex b/TeX_Eybler_TristesErant_HV123_Include_About.itex
index 11bcda945ff7eb318bbee0eea1d0d79420b54ab6..71995fd37fc2a1b281b96caf6a35b13e08352405 100644
--- a/TeX_Eybler_TristesErant_HV123_Include_About.itex
+++ b/TeX_Eybler_TristesErant_HV123_Include_About.itex
@@ -6,4 +6,4 @@ TODO
 \columnbreak
 TODO
 \end{multicols}
-\vfill
+% \vfill
diff --git a/TeX_Eybler_TristesErant_HV123_Include_Copyrightbox.itex b/TeX_Eybler_TristesErant_HV123_Include_Copyrightbox.itex
new file mode 100644
index 0000000000000000000000000000000000000000..39526f3f884c3efb9ea4353817b2b24343c4717f
--- /dev/null
+++ b/TeX_Eybler_TristesErant_HV123_Include_Copyrightbox.itex
@@ -0,0 +1,8 @@
+\makeatletter
+\copyrightbox{© \@yearpublished, \@publisher\ifx\@publisherurl\@empty\else, \href{\@publisherurl}{\@publisherurl}\fi\newline
+1. Auflage / 1st Printing \@yearpublished\newline
+\ifx\@scorenumber\@empty\else\@scorenumber\ifx\@ismn\@empty\else, \fi\fi\ifx\@ismn\@empty\else%
+ISMN \@ismn\fi\newline
+Computersatz mit \@software\newline
+Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
+\makeatother
diff --git a/TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex b/TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex
index f4d90654d3137b75be2a64d85b286b8ada809a10..d3558a58393729b09df4b044aa570df7413e2243 100644
--- a/TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex
+++ b/TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex
@@ -8,8 +8,34 @@
 \begin{thebibliography}{AA}
 
 \bibitem[A]{Aut}
-Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
-\newblock TODO
+Autographe Partitur, im Besitz des Archiv des Schottenstiftes, Wien. Archivkodex: A-Ws Kodex 707(673)/4 (Einlage).
+
+
+\newblock 1 fol. (Querformat). Seite 1v: Entwurf eines Teiles eines Gloria.
+Aufbewahrt in einem Kartonumschlag mit zahlreichen weiteren Hymnen und kurzen sakralen Kompositionen von Eybler.
+
+Wasserzeichen: Halbmond.
+
+Titel: \q{Hymnus de Apostolis tempore pascali}
+
+Zwei Akkoladen auf der Seite, durch zwei kurze Striche getrennt, Anordnung der Stimmen (nur auf der ersten Akkolade bezeichnet):
+\begin{sourcetitle}
+Soprano (im Sopranschlüssel)\sbreak
+Alto (im Altschlüssel)\sbreak
+Tenore (im Tenorschlüssel)\sbreak
+Basso\sbreak
+{}[leere Notenzeile]\sbreak
+Organo con Bassi
+\end{sourcetitle}
+
+Der Text der Vokalstimmen enthält praktisch keine Trennstriche. Nur die erste Strophe vorhanden.
+
+Signiert am Ende des Stückes (rechts unten):
+\begin{sourcetitle}
+Eybler mp
+\end{sourcetitle}
+
+
 
 \bibitem[B]{HS1}
 Handschriftlicher Stimmensatz der Wr. Hofmusikkapelle, Österreichische Nationalbibliothek, A-Whk HK.2481 Mus.
@@ -28,25 +54,27 @@ Compos: 1830\sbreak
 Part.24.
 \end{sourcetitle}
 
-Der Stimmensatz, der nach der Beschaffenheit und hohen Qualität des Papieres 
-urteilend erst sehr spät geschrieben wurde, enthält für jede der Vokalstimmen 
-die Noten im entsprechenden alten Schlüssel (Sopran-, Alt-, Tenor- und 
+Der Stimmensatz, der nach der Beschaffenheit und hohen Qualität des Papieres
+urteilend erst sehr spät geschrieben wurde, enthält für jede der Vokalstimmen
+die Noten im entsprechenden alten Schlüssel (Sopran-, Alt-, Tenor- und
 Bassschlüssel) gesetzt und entsprechend oktaviert.
 \end{thebibliography}
 
 
 \subsubsection*{Bemerkungen}
-\begin{enumerate}
-\item Der Stimmensatz \cite{HS1} notiert jede der Chorstimmen trotz des unisono-Gesangs
-eigenständig im entsprechenden Schlüssel. Die vorliegende Ausgabe benutzt für 
-die Gesangsstimme nur den Violinschlüssel, die Männerstimmen oktavieren 
+\begin{vergleich}
+Der Stimmensatz \cite{HS1} notiert jede der Chorstimmen trotz des unisono-Gesangs
+eigenständig im entsprechenden Schlüssel. Die vorliegende Ausgabe benutzt für
+die Gesangsstimme nur den Violinschlüssel, die Männerstimmen oktavieren
 selbstverständlich.
-\end{enumerate}
 
-\begin{vergleich}
-4: Text \q{Christi} in \cite{HS1} abgekürzt als \q{Xsti}
+In der Violoncello-Stimme in \cite{HS1} sind etliche Warnakzidentien mehr angegeben als in den anderen Ausgaben und Stimmen.
+
+T4: Text \q{Christi} in \cite{HS1} abgekürzt als \q{Xsti}
+
+T5: Text \q{munere} statt \q{funere} in \cite{HS1}
 
-5: Text \q{munere} statt \q{funere} in \cite{HS1}
+T9: Bezifferung \lilyText[scale=1.3]{6} im Autograph \cite{Aut} falsch auf der vorletzten Achtelnote, in den anderen Quellen eine Verlängerungslinie auf der vorletzten und \lilyText[scale=1.3]{6} erst auf der letzten Achtelnote.
 
 \end{vergleich}
 
diff --git a/TeX_Eybler_TristesErant_HV123_Include_Material.itex b/TeX_Eybler_TristesErant_HV123_Include_Material.itex
new file mode 100644
index 0000000000000000000000000000000000000000..4bbcc396289f2ca79bc76af8d7d941c072576acc
--- /dev/null
+++ b/TeX_Eybler_TristesErant_HV123_Include_Material.itex
@@ -0,0 +1,14 @@
+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\FullScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+
+\ChName{} (-\ChNumber),
+\ContinuoName{} (-\ContinuoNumber),
+\VcBName{} (-\VcBNumber).
+
+}
+\end{center}
diff --git a/TeX_Eybler_TristesErant_HV123_Include_Text.itex b/TeX_Eybler_TristesErant_HV123_Include_Text.itex
index 5e688c383c111200e98e2dd7eb3ceed050ab8adc..facf36b402dfe60371607c37ad2bc3725487cd01 100644
--- a/TeX_Eybler_TristesErant_HV123_Include_Text.itex
+++ b/TeX_Eybler_TristesErant_HV123_Include_Text.itex
@@ -1,7 +1,7 @@
 \subsection*{Text des \q{Tristes erant Apostoli}: TODO}
 
-\begin{small}
-\nopagebreak
+\begin{lyricstext}
+
 \begin{lyricstable}
 Tristes erant Apostoli   & Trauernd der Apostel Schar   & While the disciples weep the loss \\
 De Christi acerbo funere,& ob Christi herbem Tode war:  & Of Jesus murder'd on the cross \\
@@ -15,5 +15,5 @@ in sempiterna saecula       & in Ewigkeit.                         & \\[0.3em]
 {\footnotesize\em ???}   & {\footnotesize\em (Reinhold Kainhofer)} & {\footnotesize\em(TODO)}
 \end{lyricstable}
 
-\end{small}
+\end{lyricstext}
 
diff --git a/TeX_Eybler_TristesErant_HV123_Include_Todo.itex b/TeX_Eybler_TristesErant_HV123_Include_Todo.itex
index b00da8ecdd107b8ed8b03b7953e393d9160a9d28..bf2f8c9661509bdec29e9f770aa2f31c9a6ec4da 100644
--- a/TeX_Eybler_TristesErant_HV123_Include_Todo.itex
+++ b/TeX_Eybler_TristesErant_HV123_Include_Todo.itex
@@ -1,14 +1,9 @@
-\todos{
-\chapter*{Open issues}
-
-% \section*{Literaturvergleich mit dem Autograph:}
-\begin{itemize}
-\item 2 Textstrophen zu einer Melodie!
-\item {R: Vos elegit Deus inhaereditatem sibi. Alleluja} mit besserem Abstand.
-\item Praeludium (Interludium?) zw. 1. und 2. Strophe
-\item unterschiedliche Textaufteilung
-
-
-\end{itemize}
-
-}
+% \todos{
+% \chapter*{Open issues}
+% 
+% % \section*{Literaturvergleich mit dem Autograph:}
+% \begin{itemize}
+% \item ...
+% \end{itemize}
+% 
+% }
diff --git a/TeX_Eybler_TristesErant_HV123_Score_Full.tex b/TeX_Eybler_TristesErant_HV123_Score_Full.tex
index f954ae432a494d9a4b4aa2598144994a9c4dcf36..bb953d22eddaaccd92c01d9927982a0d9e804ff1 100644
--- a/TeX_Eybler_TristesErant_HV123_Score_Full.tex
+++ b/TeX_Eybler_TristesErant_HV123_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[fullscore,nocolortitle]{editionkainhofer}
 \input{TeX_Eybler_TristesErant_HV123_Settings.itex}
 
 \hypersetup{
@@ -7,26 +7,67 @@
 }
 
 \scoretype{\FullScoreType}
-\scorenumber{\scoreNumber\FullScoreNumber}
-\FullScoreSettings
+\scorenumber{\scoreNumber{}}
+\ismn{979-0-50217-081-3}
 
+\pagestyle{empty}
 \begin{document}
-\phantomsection
-\addcontentsline{toc}{chapter}{\FullScoreType}
-\includescore{Score_Full}
-\clearpage
+\frontmatter
+\maketitle
 \input{TeX_Eybler_TristesErant_HV123_Include_About.itex}
 \input{TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex}
-\input{TeX_Eybler_TristesErant_HV123_Include_Todo.itex}
+\vfill
 \input{TeX_Eybler_TristesErant_HV123_Include_Text.itex}
+\input{TeX_Eybler_TristesErant_HV123_Include_Material.itex}
+
+
+% 
+% 
+% 
+% \cleardoublepage
+% \begin{preface}
+% \pagebreak
+% \input{TeX_Eybler_TristesErant_HV123_Include_Bio.itex}
+% \end{preface}
+
+\mainmatter
+\cleardoublepage
+
+
+
+% \input{TeX_Eybler_TristesErant_HV123_Include_Coverpage.itex}
+% \input{TeX_Eybler_TristesErant_HV123_Include_Preface_Long.itex}
+
 
-\clearpage
 \phantomsection
-\addcontentsline{toc}{chapter}{\ContinuoName}
-\includescore{Instrument_Continuo}
+\addcontentsline{toc}{section}{\FullScoreType}
+\includescore{Score_Full}
 \clearpage
-\phantomsection
-\addcontentsline{toc}{chapter}{\VcBName}
-\includescore{Instrument_VcB}
+% \input{TeX_Eybler_TristesErant_HV123_Include_About.itex}
+% \input{TeX_Eybler_TristesErant_HV123_Include_Todo.itex}
+% \input{TeX_Eybler_TristesErant_HV123_Include_Text.itex}
+
+% \clearpage
+% \phantomsection
+% \addcontentsline{toc}{chapter}{\ChoralScoreName}
+% \includescore{Score_Choral}
+% \clearpage
+% \phantomsection
+% \addcontentsline{toc}{chapter}{\ContinuoName}
+% \includescore{Instrument_Continuo}
+% \clearpage
+% \phantomsection
+% \addcontentsline{toc}{chapter}{\VcBName}
+% \includescore{Instrument_VcB}
+
+\clearpage
+${}$
+% \vfill
+% \input{TeX_Eybler_TristesErant_HV123_Include_Sources.itex}
+\vfill
+% \input{TeX_Eybler_TristesErant_HV123_Include_Material.itex}
+% \vfill
+\input{TeX_Eybler_TristesErant_HV123_Include_Copyrightbox.itex}
 
+\backpage
 \end{document}
diff --git a/TeX_Eybler_TristesErant_HV123_Settings.itex b/TeX_Eybler_TristesErant_HV123_Settings.itex
index e95f23cd4a14a9a453a47b556c0daf70ea655cb2..85bfd36f4da8f67395aff104ddbc5792413c09f3 100644
--- a/TeX_Eybler_TristesErant_HV123_Settings.itex
+++ b/TeX_Eybler_TristesErant_HV123_Settings.itex
@@ -1,17 +1,19 @@
-\composer{Joseph Eybler}
-\composerdate{(1765-1846)}
 \title{Tristes erant Apostoli}
 \subtitle{Hymnus, HV 123}
+\composer{Joseph Eybler}
+\composerdate{(1765-1846)}
 \description{Per Canto e Basso Continuo (Organo e Bassi)}
-% \instrumentation{2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
+% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)}
 \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
-\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna}
-\year{2009}
+\publisherurl{http://www.edition-kainhofer.com/}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+\shortpublisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}}
+\yearpublished{2012}
 \scoreinfo{Urtext \& Erstdruck}
 
 \basename{Eybler_TristesErant_HV123}
 
-\newcommand{\scoreNumber}[1]{EK-1123-#1}
+\newcommand{\scoreNumber}[1]{EK-1123\ifx{#1}\@empty{-#1}\else\fi}
 \newcommand{\scoreTitle}{Joseph Eybler (1765-1846): Tristes erant Apostoli}
 
 \geometry{left=1.5cm,right=1.5cm,top=1.5cm,bottom=1.5cm}
diff --git a/out/Eybler_TristesErant_HV123_Instrument_Continuo.pdf b/out/Eybler_TristesErant_HV123_Instrument_Continuo.pdf
index 83a80c44025008eb4d0a711d8c1d0fcc2904bad7..85363962acf20bc727f12db737a979cd59ef3530 100644
Binary files a/out/Eybler_TristesErant_HV123_Instrument_Continuo.pdf and b/out/Eybler_TristesErant_HV123_Instrument_Continuo.pdf differ
diff --git a/out/Eybler_TristesErant_HV123_Instrument_VcB.pdf b/out/Eybler_TristesErant_HV123_Instrument_VcB.pdf
index 14537fc2a9ba6b5808cbc2b07cdf6031d37dba27..38742d4ab1cd6b8f23196c6db9268b62ed69dccf 100644
Binary files a/out/Eybler_TristesErant_HV123_Instrument_VcB.pdf and b/out/Eybler_TristesErant_HV123_Instrument_VcB.pdf differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Choral-1.midi b/out/Eybler_TristesErant_HV123_Score_Choral-1.midi
new file mode 100644
index 0000000000000000000000000000000000000000..6574b7ab333552f20b82d5b791c6b0a3faadfeb2
Binary files /dev/null and b/out/Eybler_TristesErant_HV123_Score_Choral-1.midi differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Choral.midi b/out/Eybler_TristesErant_HV123_Score_Choral.midi
new file mode 100644
index 0000000000000000000000000000000000000000..7cedc7649e6104b3c1a6f85e0aeb9593f57a1ed8
Binary files /dev/null and b/out/Eybler_TristesErant_HV123_Score_Choral.midi differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Choral.pdf b/out/Eybler_TristesErant_HV123_Score_Choral.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cd6f6d4338d20b1336a98e9d4caf41de47d203dd
Binary files /dev/null and b/out/Eybler_TristesErant_HV123_Score_Choral.pdf differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Full-1.midi b/out/Eybler_TristesErant_HV123_Score_Full-1.midi
index b8cd585767d4a7d73806b014e20d767a7afed3d9..d7d5aecded0b4ff653391cf53a41c02e54f6db68 100644
Binary files a/out/Eybler_TristesErant_HV123_Score_Full-1.midi and b/out/Eybler_TristesErant_HV123_Score_Full-1.midi differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Full.midi b/out/Eybler_TristesErant_HV123_Score_Full.midi
index feec32f2c63c07af46e9db28c6c311571885469a..d2e9668ea7a7a2467785fd1afd50c6adcda4b3f6 100644
Binary files a/out/Eybler_TristesErant_HV123_Score_Full.midi and b/out/Eybler_TristesErant_HV123_Score_Full.midi differ
diff --git a/out/Eybler_TristesErant_HV123_Score_Full.pdf b/out/Eybler_TristesErant_HV123_Score_Full.pdf
index 1aa0f1bdcbea58cb754456c253d96758c4fc91fa..6d59babeead065af8f57d3742ef27b5c8addab22 100644
Binary files a/out/Eybler_TristesErant_HV123_Score_Full.pdf and b/out/Eybler_TristesErant_HV123_Score_Full.pdf differ
diff --git a/out/TeX_Eybler_TristesErant_HV123_Score_Full.pdf b/out/TeX_Eybler_TristesErant_HV123_Score_Full.pdf
index 363d088f7357e43f5378ee1696bc8abd655c6533..9543db0fc74c44035088d8a891baf2d9bb86f048 100644
Binary files a/out/TeX_Eybler_TristesErant_HV123_Score_Full.pdf and b/out/TeX_Eybler_TristesErant_HV123_Score_Full.pdf differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..41adec11a3a3b49348adee527d0e810676ef83ff
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..e70939dd7a603481886a4358523397cd99f41ce8
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-00.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4d41ad10838ee20eced76f318f273e67e58b9e9
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-00.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-01.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ba29aba8411b2a6b8808abdb9e5c44dc3cee86c
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-01.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-02.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb8bf5253e61abbb413d924fb864fb08d1e5c08
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-02.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-03.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-03.png
new file mode 100644
index 0000000000000000000000000000000000000000..063c0affd4031edc68355489eb10dd85961f1131
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-03.png differ
diff --git a/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..59430b4f430c525b0813fac9da090341fb0866bd
Binary files /dev/null and b/webshop/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png differ
diff --git a/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_Continuo.pdf b/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_Continuo.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..85363962acf20bc727f12db737a979cd59ef3530
Binary files /dev/null and b/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_Continuo.pdf differ
diff --git a/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_VcB.pdf b/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_VcB.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..38742d4ab1cd6b8f23196c6db9268b62ed69dccf
Binary files /dev/null and b/webshop/EK-1123/Eybler_TristesErant_HV123_Instrument_VcB.pdf differ
diff --git a/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Choral.pdf b/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Choral.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cd6f6d4338d20b1336a98e9d4caf41de47d203dd
Binary files /dev/null and b/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Choral.pdf differ
diff --git a/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Full.pdf b/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Full.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9543db0fc74c44035088d8a891baf2d9bb86f048
Binary files /dev/null and b/webshop/EK-1123/Eybler_TristesErant_HV123_Score_Full.pdf differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..1817d94a7e30e5856daf804d54eda12118b536f6
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eb752d49f2c73528ba078e3c27789521a28127a
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-00.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..43715e9ef38a0cf2406800aa7086fda862c68ea1
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-00.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-01.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d04f164922995c28c3638a739b2166c4864adda
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-01.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-02.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6721374f0327cf9b27632b04c27587de87c697dd
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-02.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-03.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9c34f4245b875a953f4f0c7de40c5ffd1290436
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-03.png differ
diff --git a/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png
new file mode 100644
index 0000000000000000000000000000000000000000..f30e03251a8b8ddf8261ddac7a2d687684defe0b
Binary files /dev/null and b/webshop/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png differ
diff --git a/webshop/EditionKainhofer_CSVI_01_Products.csv b/webshop/EditionKainhofer_CSVI_01_Products.csv
new file mode 100644
index 0000000000000000000000000000000000000000..7c4b2f24fd67cb128c9a0c8183d477fefa0525ef
--- /dev/null
+++ b/webshop/EditionKainhofer_CSVI_01_Products.csv
@@ -0,0 +1,8 @@
+product_sku,product_parent_sku,slug,product_name,product_s_desc,product_desc,product_price,product_currency,category_path,custom_title,custom_value,min_order_level,max_order_level,published
+"EK-1123",,joseph-eybler-tristes-erant-apostoli,"Joseph Eybler: Tristes erant Apostoli, Hymnus, HV 123","","<p></p>",,,"","Composer|Title|Subtitle|Catalogue number|Arranger|Poet|Scoring|Key|Editor|Publisher|Textsprache|Duration|Year of Composition|Score Information|Genre|Available Editions","Joseph Eybler (1765-1846)|Tristes erant Apostoli|Hymnus, HV 123||||C., Org., Vc. e B.||Reinhold Kainhofer|Edition Kainhofer, Vienna|Latin|||||",,,"N"
+"EK-1123-1","EK-1123","joseph-eybler-tristes-erant-apostoli-partitur","Joseph Eybler: Tristes erant Apostoli, Partitur + Krit.Bericht","Partitur + Krit.Bericht","",0.6,"EUR",,"Score Type|Comment|Pages|ISMN","Partitur + Krit.Bericht||4|979-0-50217-081-3",,,"Y"
+"EK-1123-10","EK-1123","joseph-eybler-tristes-erant-apostoli-chorstimmen","Joseph Eybler: Tristes erant Apostoli, Chorstimmen","Chorstimmen","",0.2,"EUR",,"Score Type|Comment|Pages|ISMN","Chorstimmen||1|",,,"Y"
+"EK-1123-21","EK-1123","joseph-eybler-tristes-erant-apostoli-organo","Joseph Eybler: Tristes erant Apostoli, Organo","Organo","",0.2,"EUR",,"Score Type|Comment|Pages|ISMN","Organo||1|",,,"Y"
+"EK-1123-33","EK-1123","joseph-eybler-tristes-erant-apostoli-violoncello-e-contrabbasso","Joseph Eybler: Tristes erant Apostoli, Violoncello e Contrabbasso","Violoncello e Contrabbasso","",0.2,"EUR",,"Score Type|Comment|Pages|ISMN","Violoncello e Contrabbasso||1|",,,"Y"
+
+
diff --git a/webshop/EditionKainhofer_CSVI_02_Products_en.csv b/webshop/EditionKainhofer_CSVI_02_Products_en.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ba2d9938dfebeeb6ef8d69e7ddb64cf6cc40c952
--- /dev/null
+++ b/webshop/EditionKainhofer_CSVI_02_Products_en.csv
@@ -0,0 +1,8 @@
+product_sku,slug,product_name,product_s_desc,product_desc,published
+"EK-1123",joseph-eybler-tristes-erant-apostoli,"Joseph Eybler: Tristes erant Apostoli, Hymnus, HV 123","","<p></p>","N"
+"EK-1123-1","joseph-eybler-tristes-erant-apostoli-full-score","Joseph Eybler: Tristes erant Apostoli, Full score and critical report","Full score and critical report","","Y"
+"EK-1123-10","joseph-eybler-tristes-erant-apostoli-choral-score","Joseph Eybler: Tristes erant Apostoli, Choral score","Choral score","","Y"
+"EK-1123-21","joseph-eybler-tristes-erant-apostoli-organo","Joseph Eybler: Tristes erant Apostoli, Organo","Organo","","Y"
+"EK-1123-33","joseph-eybler-tristes-erant-apostoli-violoncello-e-contrabbasso","Joseph Eybler: Tristes erant Apostoli, Violoncello e Contrabbasso","Violoncello e Contrabbasso","","Y"
+
+
diff --git a/webshop/EditionKainhofer_CSVI_03_Productimages.csv b/webshop/EditionKainhofer_CSVI_03_Productimages.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b8b25f044ecda962e23435f5f05a64c1d615248d
--- /dev/null
+++ b/webshop/EditionKainhofer_CSVI_03_Productimages.csv
@@ -0,0 +1,14 @@
+product_sku,file_url,file_url_thumb,file_description,published,file_mimetype,file_title,file_type,file_is_product_image, file_is_downloadable,file_is_forsale
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-00.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-00.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-01.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-01.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-02.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-02.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score-03.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score-03.png","",1,"image/png","",product,0,0,0
+"EK-1123","images/stories/virtuemart/product/EK-1123/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png","images/stories/virtuemart/product/EK-1123/thumb/EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png","",1,"image/png","",product,0,0,0
+
+"EK-1123","images/stories/virtuemart/product/EK-1123//Eybler_TristesErant_HV123_Score_Full.pdf","","",1,"","Eybler: Tristes Erant, Partitur+Krit.Bericht",product,0,1,1
+"EK-1123","images/stories/virtuemart/product/EK-1123//Eybler_TristesErant_HV123_Score_Choral.pdf","","",1,"","Eybler: Tristes Erant, Partitur+Krit.Bericht",product,0,1,1
+"EK-1123","images/stories/virtuemart/product/EK-1123//Eybler_TristesErant_HV123_Instrument_Continuo.pdf","","",1,"","Eybler: Tristes Erant, Organo",product,0,1,1
+"EK-1123","images/stories/virtuemart/product/EK-1123//Eybler_TristesErant_HV123_Instrument_VcB.pdf","","",1,"","Eybler: Tristes Erant, Vc./Cb.",product,0,1,1
+
diff --git a/webshop_descriptions.def b/webshop_descriptions.def
new file mode 100644
index 0000000000000000000000000000000000000000..63971707f27f3009a96a13e69d07c592a55b013e
--- /dev/null
+++ b/webshop_descriptions.def
@@ -0,0 +1,64 @@
+{
+  #"title": u"Tristes erant Apostoli",
+  #"title_en": u"Tristes erant Apostoli",
+  #"subtitle": u"Hymnus, HV 123 >>",
+  #"subtitle_en": u"Hymnus, HV 123",
+
+  "language": "Latin",
+  "Short_Description_de": u"",
+  "Short_Description_en": u"",
+  
+  "Description_de": u'''<p></p>''',
+  "Description_en": u'''<p></p>''',
+  
+  #"instrumentation": u"",
+
+  "Category": u"",
+
+  #"composer": u"Joseph Eybler",
+  #"composerdate": u"1765-1846",
+  #"opus": u"",
+  #"arranger": u"",
+  #"arrangerdate": u"",
+  #"poet": u"",
+  #"poetdate": u"",
+  #"instrumentation": u"",
+  #"key": u"",
+  #"editor": u"Reinhold Kainhofer",
+  #"publisher": u"Edition Kainhofer, Vienna",
+  #"language": u"deutsch",
+  #"duration": u"",
+  #"composition_year": u"",
+  #"score_information": u"",
+  #"genre": u"",
+  
+  #"published": "Y",
+
+  #"price": 100.00,
+  #"currency": "EUR",
+  "ismn": "979-0-50217-081-3",
+ 
+  "Child_Products": [
+    # {"sku": "...", "ismn": "...", "type": "Overrides SCORETYPE", "type_en": "English TYPE", "comment": "COMMENT to be displayed", "price": "..."},
+    {"sku": u"EK-1123-1", "ismn": u"979-0-50217-081-3", "type": u"Partitur + Krit.Bericht", "type_en": "Full score and critical report", "comment": u"", "price": 0.60}, # Partitur / Full score
+    {"sku": u"EK-1123-10", "ismn": u"", "comment": u"", "price": 0.20}, # Chorstimmen / Choral score
+    {"sku": u"EK-1123-21", "ismn": u"", "comment": u"", "price": 0.20}, # Organo
+    {"sku": u"EK-1123-33", "ismn": u"", "comment": u"", "price": 0.20}, # Violoncello e Contrabbasso
+  ],
+  "Productimages": [
+    # "FILENAME.png",
+    "EK-1123_Eybler_TristesErant_HV123_Score-02.png",
+    "EK-1123_Eybler_TristesErant_HV123_Score-01.png",
+    "EK-1123_Eybler_TristesErant_HV123_Score_Choral-00.png",
+    "EK-1123_Eybler_TristesErant_HV123_Instrument_Continuo-00.png",
+    "EK-1123_Eybler_TristesErant_HV123_Instrument_VcB-00.png",
+  ],
+  "Downloadfiles": [
+    # {"filename": u"out/INFILENAME.pdf", "outname": u"OUTFILENAME.pdf", "title": u"COMPOSER: WORK, DISPLAYED DOWNLOADTITLE", "desc": u"..."}, 
+    # "out/FILENAME.pdf",
+    {"filename": u"out/TeX_Eybler_TristesErant_HV123_Score_Full.pdf", "outname": u"Eybler_TristesErant_HV123_Score_Full.pdf", "title": u"Eybler: Tristes Erant, Partitur+Krit.Bericht", "desc": u""}, 
+    {"filename": u"out/Eybler_TristesErant_HV123_Score_Choral.pdf", "outname": u"Eybler_TristesErant_HV123_Score_Choral.pdf", "title": u"Eybler: Tristes Erant, Partitur+Krit.Bericht", "desc": u""}, 
+    {"filename": u"out/Eybler_TristesErant_HV123_Instrument_Continuo.pdf", "title": u"Eybler: Tristes Erant, Organo", "desc": u""}, 
+    {"filename": u"out/Eybler_TristesErant_HV123_Instrument_VcB.pdf", "title": u"Eybler: Tristes Erant, Vc./Cb.", "desc": u""}, 
+  ]
+}