diff --git a/0500 - Graupner - Ach Jesu Satans Ueberwinder - GWV1122-28.def b/0500 - Graupner - Ach Jesu Satans Ueberwinder - GWV1122-28.def
new file mode 100644
index 0000000000000000000000000000000000000000..d2ee6e6e23bb4f22e9d9a544fd753b62bfefaee0
--- /dev/null
+++ b/0500 - Graupner - Ach Jesu Satans Ueberwinder - GWV1122-28.def	
@@ -0,0 +1,51 @@
+{
+  "output_dir": "0500 - Graupner - Ach Jesu Satans Ueberwinder - GWV1122-28",
+  "version": "2.13.48",
+  "template": "EK_Full",
+  "language": "deutsch",
+  "additionalscores": [],
+  "options": ["optimal-breaking"],
+
+  "defaults": {
+    "title": u"Ach Jesu, Satans Überwinder",
+    "subtitle": "Kantate, GWV 1122/28",
+    "composer": "Christoph Graupner",
+    "composerdate": "1683-1760",
+
+    "year": "2011",
+    "publisher": "Edition Kainhofer, Vienna",
+    "shortpublisher": "Edition Kainhofer",
+    "publisherurl": "http://www.edition-kainhofer.com/",
+    "editor": "Reinhold Kainhofer",
+    "editorurl": "http://reinhold.kainhofer.com/",
+    "editormail": "reinhold@kainhofer.com",
+    "scorenumber": "EK-0500",
+    "scoreinfo": "Urtext",
+    "basename": "Grauper_AchJesuSatansUeberwinder_GWV1122",
+
+    "instruments": [
+        "VI", "VII", "Va",
+        "S", "A", "T",
+        "Continuo", "VcB",
+        "P"],
+    "vocalvoices": ["S", "A", "T"],
+    "scores": ["Full", "Vocal", "Choral"],
+  },
+
+  "scores": ["AchJesuSatansUeberwinder"],
+  "AchJesuSatansUeberwinder": {
+    "parts": [
+      {"id": "IAria",   "filename": "01_Aria", "piece": "1. Aria (Tenore)", "piecetacet": "1. Aria (Tenore) tacet"},
+      {"id": "IIRecitativo",  "filename": "02_Recitativo", "piece": "2. Recitativo (Tenore)", "piecetacet": "2. Recitativo (Tenore) tacet"},
+      {"id": "IIIAria",   "filename": "03_Aria", "piece": "3. Aria (Tenore)", "piecetacet": "3. Aria (Tenore) tacet"},
+      {"id": "IVChoral", "filename": "04_Choral", "piece": "4. Choral", "piecetacet": "4. Choral tacet"},
+      {"id": "VRecitativo",  "filename": "05_Recitativo", "piece": "5. Recitativo (Alto)", "piecetacet": "5. Recitativo (Alto) tacet"},
+      {"id": "VIAria",  "filename": "06_Aria", "piece": "6. Aria (Alto)", "piecetacet": "6. Aria (Alto) tacet"},
+      {"id": "VIIRecitativo",  "filename": "07_Recitativo", "piece": "7. Recitativo (Tenore)", "piecetacet": "7. Recitativo (Tenore) tacet"},
+      {"id": "VIIIChoral", "filename": "08_Choral", "piece": "8. Choral", "piecetacet": "8. Choral tacet"},
+    ],
+  },
+  "latex": {
+    "tex_options": ["nocolortitle"]
+  },
+}
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
index 72ea556469cdbe9c56768c6107b457e2630e7951..1db3f67b356bdcfd0ea0f04a610532515bd600ae 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
@@ -239,77 +239,82 @@ IAriaTMusic = \relative c' {
 
 IAriaTLyrics = \lyricmode {
   Ach, Je -- su, Sa -- tans Ü -- ber -- win -- der,
-  "von,(?)" "von,(?)" "von(?)" "sei(?)" -- "ner(?)," sei -- ner Grau -- sam -- keit,
-  von sei -- ner, sei -- ner Grau -- sam -- keit.
-  Dass dort is XXX
-  % TODO
+  "vom,?TODO" "vom,?TODO" "vom?TODO" Steu -- er sei -- ner sei -- ner Grau -- sam -- keit,
+  vom Steu -- er sei -- ner Grau -- sam -- keit.
+  
+  Das Joch ist schwehr,
+  
+  sein höl -- len Heer will Leib und Seel, 
+  Leib und Seel zu Scla -- ven, 
+  zu Scla -- ven ma -- chen.
+  
+  Ach, ach bin -- de, bin -- de, Herr, den al -- ten Dra -- chen,
+  er rüs -- tet sich mit Macht __, mit Macht zum Streit.
 }
 
 
 IAriaContinuoMusic = \relative c {
-  g2 g' g |
-  g, g' g |
-  g, g' f |
-  es2. d4 es c |
-  d1 r2 |
-  f1 r2 |
-  es2. d4 es c |
-  fis2 a fis |
-  g d d |
-  g,1 r2 |
-  c2\pp es c |
-  d d, g |
-  d' r fis |
-  g r fis |
-  es h g |
-  c r es |
-  f r f |
-  b, d b |
-  es2.-> d4 es c |
-  d2-> r fis |
-  g g, r |
-  g' b g |
-  g-| a-| eis-| |
-  fis r d |
-  g r r |
-  g, r r |
-  c2. d4 es2 |
-  fis, g d' |
-  g,1 f'2 |
-  eis a, g' |
-  fis d g | % TODO: Haken (Einschub?)
-  
-  a b es, |
-  d r g |
-  c, d d |
-  g,1\fermata r2 |
-  d' r r |
-  es f g |
-  d r es |
-  as1-> ais2 |
-  b b, as |
-  g his g |
-  c1 r2 |
-  
-  c f es |
-  d g f |
-  es c es |
-  his g his |
-  es2.-> d4 es d |
-  eis2 f cis |
-  d b' g |
-  a r g |
-  fis r d |
-  g r c, |
-  a' b b, |
-  es r c |
-  d-> r b |
-  f' f, g'-> |
-  a2. g4 a f |
-  b2 r r |
-  es,4 d c d es c |
-  f f a f f f |
-  b d, f2 f |
+  g2 g' g | % 2
+  g, g' g | % 3
+  g, g' f | % 4
+  es2. d4 es c | % 5
+  d1 r2 | % 6
+  f1 r2 | % 7
+  es2. d4 es c | % 8
+  fis2 a fis | % 9
+  g d d | \barNumberCheck #10
+  g,1 r2 | % 11
+  c2\pp es c | % 12
+  d d, g | % 13
+  d' r fis | % 14
+  g r fis | % 15
+  es h g | % 16
+  c r es | % 17
+  f r f | % 18
+  b, d b | % 19
+  es2.-> d4 es c | \barNumberCheck #20
+  d2-> r fis | % 21
+  g g, r | % 22
+  g' b g | % 23
+  g-| a-| eis-| | % 24
+  fis r d | % 25
+  g r r | % 26
+  g, r r | % 27
+  c2. d4 es2 | % 28
+  fis, g d' | % 29
+  g,1 f'2 | \barNumberCheck #30
+  eis a, g' | % 31
+  fis d g | % 32
+  a b es, | % 33
+  d r g | % 34
+  c, d d | % 35
+  g,1\fermata r2 | % 36
+  d' r r | % 37
+  es f g | % 38
+  d r es | % 39
+  as1-> ais2 | \barNumberCheck #40
+  b b, as | % 41
+  g his g | % 42
+  c1 r2 | % 43
+  c f es | % 44
+  d g f | % 45
+  es c es | % 46
+  his g his | % 47
+  es2.-> d4 es d | % 48
+  eis2 f cis | % 49
+  d b' g | \barNumberCheck #50
+  a r g | % 51
+  fis r d | % 52
+  g r c, | % 53
+  a' b b, | % 54
+  es r c | % 55
+  d-> r b | % 56
+  f' f, g'-> | % 57
+  a2. g4 a f | % 58
+  b2 r r | % 59
+  es,4 d c d es c | \barNumberCheck #60
+  f f a f f f | % 61
+  b d, f2 f | % 62
   b1. \bar "||"
 }
 IAriaVcBMusic = \IAriaContinuoMusic
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
index 38f994702fdd017a8f88e1a03e0f32213930bd53..30b8fefb32d2293aa29773365e699190a34ea490 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
@@ -27,9 +27,15 @@ IIRecitativoTMusic = \relative c {
 \addQuote "IIRecitativoTMusic" { \IIRecitativoTMusic }
 
 IIRecitativoTLyrics = \lyricmode {
-  Und auf der Men -- schen 
-  
-    % TODO
+  Und ach, der Men -- schen sich -- res Le -- ben will 
+  dem ver -- weg -- gnen Feind die Wa -- fen selbst 
+  in sei -- ne Hän -- de ge -- ben.
+  Wenn -- gleich ein Ret -- tungs -- licht er -- scheint, 
+  das Sa -- tans Grim ent -- deckt und däm -- pfet,
+  so kämp -- fet der Mensch wohl selbst um Sa -- tans Reich.
+  Er darf wohl gar den Sie -- ges -- für -- sten schmä -- hen.
+  Ihr blin -- den Scla -- ven schä -- met euch,
+  wolt ihr so frech zur Höl -- len ge -- hen.
 }
 
 
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
index e404e33f6ea2e64c671b06725ae2379307db6810..355398b0e704561c2c9a6f1725c3f604fe886d20 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
@@ -16,7 +16,7 @@ IVChoralSettings = \notemode {
 
 IVChoralVIMusic = \relative c'' {
   \times 2/3 { 
-    \repeat volta 2 {
+    \repeat unfold 2 {
       f8[( es) d] d[ es f] es[( d) c]  | % 2
       d[( c) b] b[ c d] c[( b) a]  | % 3
       b16[( c d es) f8] a,[ c f] b,[( a) b] | % 4
@@ -25,22 +25,22 @@ IVChoralVIMusic = \relative c'' {
       a8[ f16( g a b]) c8[ d es] d[ c b] | % 7
       g'[( f) f] g[( f) f] d16[( c d es) f8] | % 8
       d16[( c d es) f8] a,[ g f] b[ a g] | % 9
-      g'16[( f eis d) c8] c[ eis g] a[ g f] | \barNumberCheck #10
+      g'16[( f eis d) c8] c[ eis g] a[ g f] | % 10
       d16[( c d eis) f8] b,16[( a b c) d8] g,[ a b] | % 11
-      a[ f f] a[ f f] c'16[( b c d) es8] | % 12
-    }
-    d8[( c) c] d[( c) c] d16[( c d es) f8] | % 13
-    c8[ a16( b c d]) es8[ d c] f[ c f] | % 14
-    f,8[ g16( a b c]) d8[ es f] b,[( a) g] | % 15
-    c16[( d es f) g8] f,16[( g a b) c8] d[ c b] | % 16
-    f'[( eis ) f] f[( eis) f] f[( eis) f] | % 17
-    c16[( b c d) es8] d[ c b] es[ d c] | % 18
-    d16[( c d es) f8] a,[ g f] b16[( a b c) d8] | % 19
-    c8[ a16( b c d)] es8[ d c] f[( es) f] | \barNumberCheck #20
-    d[ d16( c b a]) g8[ a b] a[ c f] | % 21
-    d8[ b16( a b c]) d8[ b16( c d es]) f8[ es d] | % 22
-    g8[( f) f] g[( f) f] g[( f) f] | % 23
-    b,16[( c d es f8]) d[ c b] d8.[( es16) c8] | % 24
+      a[ f f] a[ f f] c'16[( b c d) es8] | 
+    } | \barNumberCheck #23
+    d8[( c) c] d[( c) c] d16[( c d es) f8] | % 24
+    c8[ a16( b c d]) es8[ d c] f[ c f] | % 25
+    f,8[ g16( a b c]) d8[ es f] b,[( a) g] | % 26
+    c16[( d es f) g8] f,16[( g a b) c8] d[ c b] | % 27
+    f'[( eis ) f] f[( eis) f] f[( eis) f] | % 28
+    c16[( b c d) es8] d[ c b] es[ d c] | % 29
+    d16[( c d es) f8] a,[ g f] b16[( a b c) d8] | % 30
+    c8[ a16( b c d)] es8[ d c] f[( es) f] | \barNumberCheck #31
+    d[ d16( c b a]) g8[ a b] a[ c f] | % 32
+    d8[ b16( a b c]) d8[ b16( c d es]) f8[ es d] | % 33
+    g8[( f) f] g[( f) f] g[( f) f] | % 34
+    b,16[( c d es f8]) d[ c b] d8.[( es16) c8] | % 35
   }
   b2. \bar "||"
 }
@@ -48,7 +48,7 @@ IVChoralVIMusic = \relative c'' {
 
 
 IVChoralVIIMusic = \relative c'' {
-  \repeat volta 2 {
+  \repeat unfold 2 {
     d4 r r | % 2
     \times 2/3 { f8[( es) d] d[ es f] es[( d) c] } | % 3
     d4 c b | % 4
@@ -57,29 +57,29 @@ IVChoralVIIMusic = \relative c'' {
     c2 b4 | % 7
     \times 2/3 { es8[(\p d) d] es[( d) d] b16[( a b c) d8] } | % 8
     b4\f c b | % 9
-    c4. b8 a4 | \barNumberCheck #10
+    c4. b8 a4 | % 10
     g f eis | % 11
-    f c \times 2/3 { a'16[( g a b) c8] } |  % 12
-  }
-  \times 2/3 { b8[(\p a) a] b[( a) a] b16[( a b c) d8] } | % 13
-  a4\f g f | % 14
-  b b g | % 15
-  es'4. f8 d4 | % 16
-  c2 c4 | % 17
-  \times 2/3 { a16[(\pp g a b) c8] b[( a) g] c[( b) a] | % 18
-    b16[(\f a b c) d8] } c4 b | % 19
-  a4 g f | \barNumberCheck #20
-  d'4. es8 c4 | % 21
-  b f \times 2/3 {d'8[( c) b] | % 22
-    es[(\pp d) d] es[( d) d] es[( d) d] } | % 23
-  f,4\f b a |
+    f c \times 2/3 { a'16[( g a b) c8] } |
+  } | \barNumberCheck #23
+  \times 2/3 { b8[(\p a) a] b[( a) a] b16[( a b c) d8] } | % 24
+  a4\f g f | % 25
+  b b g | % 26
+  es'4. f8 d4 | % 27
+  c2 c4 | % 28
+  \times 2/3 { a16[(\pp g a b) c8] b[( a) g] c[( b) a] | % 29
+    b16[(\f a b c) d8] } c4 b | % 30
+  a4 g f | \barNumberCheck #31
+  d'4. es8 c4 | % 32
+  b f \times 2/3 {d'8[( c) b] | % 33
+    es[(\pp d) d] es[( d) d] es[( d) d] } | % 34
+  f,4\f b a | % 35
   f2. \bar"||"
 }
 \addQuote "IVChoralVIIMusic" { \IVChoralVIIMusic }
 
 
 IVChoralVaMusic = \relative c' {
-  \repeat volta 2 {
+  \repeat unfold 2 {
     b4 r r | % 2
     R2. | % 3
     f'4 f eis | % 4
@@ -88,22 +88,22 @@ IVChoralVaMusic = \relative c' {
     f' f f | % 7
     R2. | % 8
     f4 f d | % 9
-    c g' c, | \barNumberCheck #10
+    c g' c, | % 10
     b' d, c | % 11
-    c a f | % 12
-  }
-  R2. | % 13
-  f'4 c c' | % 14
-  b f es | % 15
-  g a f | % 16
-  \times 2/3 { a8[( g) a] a[( g) a] a[( g) a] } | % 17
-  R2. | % 18
-  f4 f f | % 19
-  f c' a | \barNumberCheck #20
-  b \times 2/3 {es,8[( f) g] } f4 | % 21
-  f r r | % 22
-  R2. | % 23
-  d4 f f | % 24
+    c a f | 
+  } | \barNumberCheck #23
+  R2. | % 24
+  f'4 c c' | % 25
+  b f es | % 26
+  g a f | % 27
+  \times 2/3 { a8[( g) a] a[( g) a] a[( g) a] } | % 28
+  R2. | % 29
+  f4 f f | \barNumberCheck #30
+  f c' a | \barNumberCheck #31
+  b \times 2/3 {es,8[( f) g] } f4 | % 32
+  f r r | % 33
+  R2. | % 34
+  d4 f f | % 35
   d2. \bar"||"
 }
 \addQuote "IVChoralVaMusic" { \IVChoralVaMusic }
@@ -117,6 +117,8 @@ IVChoralSMusic = \relative c' {
 \addQuote "IVChoralSMusic" { \IVChoralSMusic }
 
 IVChoralSLyrics = \lyricmode {
+  Je -- su, hilf
+  
   % TODO
 }
 
@@ -129,24 +131,64 @@ IVChoralAMusic = \relative c' {
 \addQuote "IVChoralAMusic" { \IVChoralAMusic }
 
 IVChoralALyrics = \lyricmode {
+  Je -- su, hilf
   % TODO
 }
 
 
 IVChoralTMusic = \relative c' {
   R2.*2 | % 3
-  s8
-  % TODO
+  b4 f g | % 4
+  f f b | % 5
+  c a b | % 6
+  f'2 d4 | % 7
+  R2. | % 8
+  b4 f g | % 9
+  eis eis f | \barNumberCheck #10
+  b b c | % 11
+  a2. | % 12
+  R2.*2 | % 14
+  c4 f g | % 15
+  f f b | % 16
+  c a b | % 17
+  f'2 d4 | % 18
+  R2. | % 19
+  b4 f g | \barNumberCheck #20 
+  eis eis f | % 21
+  b b c | % 22
+  a2. | % 23
+  R2. | % 24
+  f4 c' a | % 25
+  d d es | % 26
+  c a b | % 27
+  f'2 f4 | % 28
+  R2. | % 29
+  b,4 f d' | \barNumberCheck #30
+  c c a | % 31
+  b es, f | % 32
+  f2 f4 | % 33
+  R2.*3 \bar "||"
 }
 \addQuote "IVChoralTMusic" { \IVChoralTMusic }
 
 IVChoralTLyrics = \lyricmode {
+  Je -- su, hilf TODO -- gen, du Für -- ste des Le -- bens,
+  sich von dir fin -- TODO -- TODO dTODO -- TODOet Ge -- winn.
+  
   % TODO
 }
+IVChoralTLyricsII = \lyricmode {
+  Je -- su, hilf TODO -- gen in al -- ler -- ley fäl -- len. 
+  Git mir die Wa -- fen und TODOWo -- fer zur Hand.
+  Wenn mir die höl -- li -- schen Fein -- de nach -- stel -- len,
+  dich mir zu rau -- ben, o e -- del -- stes Pfand. 
+  So hilf mir schwa -- chen mit All -- macht und Stär -- ke.
+  daß ich o Lieb -- ster dein da -- seyn TODO -- TODO -- TODO.
+}
 
 
 IVChoralContinuoMusic = \relative c' {
-  \repeat volta 2 {
+  \repeat unfold 2 {
     R2.*2 | % 3
     b4 f g | % 4
     f f b | % 5
@@ -154,22 +196,22 @@ IVChoralContinuoMusic = \relative c' {
     f2 b,4 | % 7
     R2. | % 8
     b'4 f g | % 9
-    eis eis f | \barNumberCheck #10
+    eis eis f | % 10
     b b c | % 11
     f,2. | % 12
-  }
-  R2. | % 13
-  f4 c' a | % 14
-  d d, es | % 15
-  c a' b | % 16
-  f2 f4 | % 17
-  R2. | % 18
-  b4 f d | % 19
-  f c d | \barNumberCheck #20
-  b es-> f | % 21
-  b,2. | % 22
-  R2. | % 23
-  d4 b8[ d] f4 | % 24
+  } | \barNumberCheck #23
+  R2. | % 24
+  f4 c' a | % 25
+  d d, es | % 26
+  c a' b | % 27
+  f2 f4 | % 28
+  R2. | % 29
+  b4 f d | % 30
+  f c d | \barNumberCheck #31
+  b es-> f | % 32
+  b,2. | % 33
+  R2. | % 34
+  d4 b8[ d] f4 | % 35
   b,2. \bar"||"
 }
 IVChoralVcBMusic = \IVChoralContinuoMusic
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
index a21022559f373bbf85cb519ce09801b95771e520..f2766965cfd92c88b29d5c3c96f081baa0c580a8 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
@@ -29,8 +29,19 @@ VRecitativoAMusic = \relative c'' {
 \addQuote "VRecitativoAMusic" { \VRecitativoAMusic }
 
 VRecitativoALyrics = \lyricmode {
-  TO -- DO
-  % TODO
+  Wer Je -- sum in sich wür -- ken läßt, 
+  dem wird der Feind nichts an -- ge -- win -- nen.
+  Ist sei -- ne Burg gleich noch so TODO,
+  ihr Grund kan nicht be -- stehn.
+  
+  Sein ar -- ges We -- sen muß zer -- rin -- nen
+  und will er Je -- sum gif -- tig schmä -- hen,
+  hier ist der ihn be -- schä -- men kan.
+
+  Der Herr bricht seiner TODOäster Ket -- ten, 
+  komt Sün -- der, komt und laßt euc ret -- ten.
+  Tobt gleich der Feind TODO -- ung nichts dran,
+  im Wort des Herrn kan al -- len TODO TODO -- TODO.
 }
 
 VRecitativoContinuoMusic = \relative c {
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
index c00b5dbbdda2f9d310a4bf0e5c0cb018de4a75ac..faa2f720e3441d3e34ae741798114073fa3746bc 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
@@ -38,27 +38,27 @@ VIAriaVIMusic = \relative c'' {
 
 
 VIAriaVIIMusic = \relative c'' {
-  b8[ r b r e, r d] r |
-  d[ r g r d r g] r |
-  g[ r fis r g r d] r |
-  d[ r d r g r g] r |
-  h[ r h r h r h] r |
-  h[ r a r a r g] r |
-  e[ r e r e r h'] r |
-  a[ r c r a r fis] r |
-  gis[ r gis r e r a ] r |
-  e[ r h' r a r fis] r |
-  g[ r g r a r fis] r |
-  g[ r c r h r e,] r |
-  d[\fermata r h' r c r h] r |
-  h r r4 r2 |
-  r4 e2 dis4 |
-  e8[ r e r c r c] r |
-  h[ r g r a r d] r |
-  gis,[ r gis r a r d] r |
-  d[ r h r a r h] r |
-  h[ r c r h r c] r |
-  h[ r dis] r e[ e,] r4 |
+  b8[ r b r e, r d] r | % 2
+  d[ r g r d r g] r | % 3
+  g[ r fis r g r d] r | % 4
+  d[ r d r g r g] r | % 5
+  h[ r h r h r h] r | % 6
+  h[ r a r a r g] r | % 7
+  e[ r e r e r h'] r | % 8
+  a[ r c r a r fis] r | % 9
+  gis[ r gis r e r a ] r | \barNumberCheck #10
+  e[ r h' r a r fis] r | % 11
+  g[ r g r a r fis] r | % 12
+  g[ r c r h r e,] r | % 13
+  d[\fermata r h' r c r h] r | % 14
+  h r r4 r2 | % 15
+  r4 e2 dis4 | % 16
+  e8[ r e r c r c] r | % 17
+  h[ r g r a r d] r | % 18
+  gis,[ r gis r a r d] r | % 19
+  d[ r h r a r h] r | \barNumberCheck #20
+  h[ r c r h r c] r | % 21
+  h[ r dis] r e[ e,] r4 | % 22
   R1 \bar"||"
 }
 \addQuote "VIAriaVIIMusic" { \VIAriaVIIMusic }
@@ -91,39 +91,70 @@ VIAriaVaMusic = \relative c'' {
 \addQuote "VIAriaVaMusic" { \VIAriaVaMusic }
 
 
-VIAriaAMusic = \relative c' {
-  s8
-  % TODO
+VIAriaAMusic = \relative c'' {
+  R1*2 | % 3
+  r2 g8.[( h16]) a8.[( c16]) | % 4
+  h4 a c8. g16 g8. c16 | % 5
+  h8 g r4 h8. a16 g8. fis16 | % 6
+  g8 e r4 fes4 r8 d | % 7
+  a'8. a16 gis8. a16 b4 r4 | % 8
+  c8. h16 a8. g16 fis8 d r4 | % 9
+  gis4 r a r | \barNumberCheck #10
+  h4 r8 e, c' a fis8. g16 | % 11
+  fes4 r8 e a8[( h16]) c fis,8. g16 | % 12
+  g2 r\fermata | % 13
+  r4 h8. g16 a4 h8. fis16 |
+  g4 e8 g fis8. g16 a8. fis16 |
+  dis4 r r2 |
+  r4 g8 e a8. fes16 c'8. a16 | % 
+  h8 g c8. h16 a8. gis16 a8. h16 | % 
+  gis8 e r4 c' r8 a |
+  h e,[( fis g] a[ c h]) fis |
+  g e16[ fis] g[ fis] g[ a] h4 r8 c8 |
+  g8.[ a16] fis4 e r8 cis'8 |
+  ais4. h8 h2 \bar"||"\mark "Da capo"
 }
 \addQuote "VIAriaAMusic" { \VIAriaAMusic }
 
 VIAriaALyrics = \lyricmode {
-  % TODO
+  Je -- su, Je -- su, ret -- te mei -- ne See -- le,
+  ret -- te mei -- ne See -- le,
+  brich des Sa -- tans Scla -- ve -- rey, 
+  ret -- te mei -- ne See -- le, 
+  brich, brich, brich des Sa -- tans Scla -- ve -- rey, 
+  des Sa -- tans Scla -- ve -- rey.
+  
+  Dir al -- lein, dir al -- lein soll mein Hertz ge -- hor -- sam seyn!
+  Schnau -- ben, to -- ben Sa -- tans Schaa -- ren,
+  dei -- ne Hand kan mich be -- wah -- ren.
+  
+  Ja, ich weiß, ja ich weiß, ja, ja, ich weiß,
+  du machst mich frey, du machst mich frey!
 }
 
 
 VIAriaContinuoMusic = \relative c' {
-  g8 r e r c r d r |
-  h r c r c r h r |
-  a-> r d r g, r d' r |
-  g r d r e r c r |
-  g' r e r dis r h r |
-  e r a r d,-> r g r |
-  c, r c' r gis r e r |
-  a r c, r d r c r |
-  h r e r c r a r |
-  gis' r e r a, r d r |
-  h r c r a r d r |
-  g, r g' r g, r g' r |
-  g,\fermata r g' r fis-> r h, r |
-  e[ fis g e] a[ h c a] |
-  h[ h,] e[ g] a4 h |
-  e,4 c8 r c r c r |
-  g' r e r fes r c r |
-  e r h' r a r d, r |
-  g, r g' r f-> r h,-> r |
-  e r c r g' r a r |
-  h r h, r e r e r |
+  g8 r e r c r d r | % 2
+  h r c r c r h r | % 3
+  a-> r d r g, r d' r | % 4
+  g r d r e r c r | % 5
+  g' r e r dis r h r | % 6
+  e r a r d,-> r g r | % 7
+  c, r c' r gis r e r | % 8
+  a r c, r d r c r | % 9
+  h r e r c r a r | \barNumberCheck #10
+  gis' r e r a, r d r | % 11
+  h r c r a r d r | % 12
+  g, r g' r g, r g' r | % 13
+  g,\fermata r g' r fis-> r h, r | % 14
+  e[ fis g e] a[ h c a] | % 15
+  h[ h,] e[ g] a4 h | % 16
+  e,4 c8 r c r c r | % 17
+  g' r e r fes r c r | % 18
+  e r h' r a r d, r | % 19
+  g, r g' r f-> r h,-> r | \barNumberCheck #20
+  e r c r g' r a r | % 21
+  h r h, r e r e r | % 22
   fis4 fis h,2 \bar"||" % TOOD: Da capo!!
 }
 VIAriaVcBMusic = \VIAriaContinuoMusic
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
index 035699dc4351da7084275211e2c962559301dc0e..7e81d166b3abee9efb4478860872f6222c45285d 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
@@ -11,24 +11,35 @@ VIIRecitativoSettings = \notemode {
 
 
 VIIRecitativoTMusic = \relative c' {
-  s8
-  % TODO
+  r4 g c8. g16 g8 a | % 2
+  b4. a8 a4 r16 d e f | % 3
+  e8. g16 cis,8. d16 a8 a r16 f' f f | % 4
+  f8 c d es es d r d | % 5
+  d4 a es'8. d16 d8 d | % 6
+  b4d g,8 g b8. g16 | % 7
+  a4 r16 a c a fis4. g8 |
+  d8 d r4 \bar"||"
 }
 \addQuote "VIIRecitativoTMusic" { \VIIRecitativoTMusic }
 
 VIIRecitativoTLyrics = \lyricmode {
-  % TODO
+  Be -- wah -- re mich von Si -- cher -- heit,
+  lass mich von dei -- nem Pfad nicht wei -- chen.
+  Und sucht mich Sa -- tan zu er -- schlei -- chen,
+  so gib mir Glau -- bens Si -- cher -- heit,
+  ja lass ihn mir an mir 
+  so bö -- ses Ziel er -- rei -- chen.
 }
 
 
 VIIRecitativoContinuoMusic = \relative c {
-  e1~ |
-  e2 f |
-  g2 a4 d, |
-  a2 fis~ |
-  fis~ fis |
-  g b |
-  c es |
+  e1~ | % 2
+  e2 f | % 3
+  g2 a4 d, | % 4
+  a2 fis~ | % 5
+  fis~ fis | % 6
+  g b | % 7
+  c es | % 8
   d4 g, \bar"||"
 }
 VIIRecitativoVcBMusic = \VIIRecitativoContinuoMusic
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Settings_Global.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Settings_Global.ily
index 0fc06e22c4693c5508914619206a222747b8c0e9..78018b9d5baa3fa5ee9b6479aaaf7295a86daed8 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Settings_Global.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Settings_Global.ily
@@ -2,9 +2,9 @@
 
 \include "orchestrallily/oly_settings_names.ily"
 
-scorenumber="EK-0500"
 
 \header {
+  scorenumberbase="EK-0500"
   title = "Ach Jesu, Satans Überwinder"
   titlepagetitle = "Ach Jesu, Satans Überwinder"
   subtitle = "Kantate, GWV 1122/28"
diff --git a/Makefile b/Makefile
index fd9db4df954e6b45e94cfe82f8370dd62040c1ef..2b646102919667178ef16fafec5bb10eae9fe05a 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ latex: $(pdfs) $(texpdfs)
 latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex -interaction=batchmode --output-directory=$(OUT)/ $<
 
 zipdir = $(base)_Final
 dist: $(distfiles)
@@ -62,3 +62,6 @@ dist: $(distfiles)
 	rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
 	zip -jr $(base).zip $(zipdir)
 	rm -rf $(zipdir)
+
+webshop: $(distfiles)
+	python ../../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "0500 - Graupner - Ach Jesu Satans Ueberwinder - GWV1122-28.def" $(distfiles)
diff --git a/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Settings.itex b/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Settings.itex
index 326339bd026f37156c6d89ff07334902547ba393..97dd30ab0729cb78820e8e5d6f9f5f9ff8640c0f 100644
--- a/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Settings.itex
+++ b/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Settings.itex
@@ -8,7 +8,7 @@
 \publisherurl{http://www.edition-kainhofer.com/}
 \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna, http://www.edition-kainhofer.com/}}
 \shortpublisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}}
-\year{2011}
+\yearpublished{2011}
 \scoreinfo{Urtext}
 
 \basename{Grauper_AchJesuSatansUeberwinder_GWV1122}
diff --git a/orchestrallily b/orchestrallily
index cd6dd3328aa142bf8f70ff9def8c56d1ad3094ba..b76ef9eb0f75bb102b3dc78c87ba9f3516a3e597 120000
--- a/orchestrallily
+++ b/orchestrallily
@@ -1 +1 @@
-.././orchestrallily
\ No newline at end of file
+../../orchestrallily
\ No newline at end of file
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Continuo.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Continuo.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d6be4c9487bfc4d9ed49a02d46afb2cd112b2542
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Continuo.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VI.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VI.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..43c2fe9f1349bf9659f2fe00e3966f3f497157ec
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VI.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VII.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VII.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4c578d01ac0ba0a71659ce68c69fc9d275ced69b
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VII.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Va.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Va.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3b2199539aec11a3f033342e815697e7bf85708d
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_Va.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VcB.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VcB.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..59be0ffafc20cf8f5fabc2b2b50cc9a14e107c8c
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Instrument_VcB.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-1.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-1.midi
new file mode 100644
index 0000000000000000000000000000000000000000..47e6fd2232270adb4b56717eafa405c0b64415f2
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-1.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-2.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-2.midi
new file mode 100644
index 0000000000000000000000000000000000000000..42bc88ff04b0e8f40e91001a2b5935403c2366ff
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-2.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-3.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-3.midi
new file mode 100644
index 0000000000000000000000000000000000000000..7a36acfb5abc25f15e1bb7d5c8bb6ab146a614d3
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-3.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-4.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-4.midi
new file mode 100644
index 0000000000000000000000000000000000000000..0dcff5575176914ba619e057bc8971f044f4a469
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-4.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-5.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-5.midi
new file mode 100644
index 0000000000000000000000000000000000000000..44140acbfc6e3bb2ec78a4d60d192f4b37ae2389
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-5.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-6.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-6.midi
new file mode 100644
index 0000000000000000000000000000000000000000..84ad4b722cf6de8ff94b95c3a680e0c482fdc5c5
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-6.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-7.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-7.midi
new file mode 100644
index 0000000000000000000000000000000000000000..123eb2e631b7a371a7de99ac72ebac225a99a33e
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral-7.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.midi
new file mode 100644
index 0000000000000000000000000000000000000000..22479cc942f7922af9d7ca2c488838ca9a7db37e
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6dff07cf89b6c7960f342d791f6befbe79b02de5
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.toc b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.toc
new file mode 100644
index 0000000000000000000000000000000000000000..b16b059b8df8631d2866540476a7bae25c780182
--- /dev/null
+++ b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Choral.toc
@@ -0,0 +1,8 @@
+1, section, 1, {1. Aria (Tenore)}, toc63,
+1, section, 1, {2. Recitativo (Tenore)}, toc64,
+1, section, 1, {3. Aria (Tenore)}, toc65,
+2, section, 1, {4. Choral}, toc66,
+2, section, 1, {5. Recitativo (Alto)}, toc67,
+2, section, 1, {6. Aria (Alto)}, toc68,
+2, section, 1, {7. Recitativo (Tenore)}, toc69,
+2, section, 1, {8. Choral}, toc70
\ No newline at end of file
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-1.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-1.midi
new file mode 100644
index 0000000000000000000000000000000000000000..47e6fd2232270adb4b56717eafa405c0b64415f2
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-1.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-2.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-2.midi
new file mode 100644
index 0000000000000000000000000000000000000000..c079e6f5bd1aafbe565edc80237ea4e86892d861
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-2.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-3.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-3.midi
new file mode 100644
index 0000000000000000000000000000000000000000..29410c8fa7278a539b2b41799643631d4ec1e4f1
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-3.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-4.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-4.midi
new file mode 100644
index 0000000000000000000000000000000000000000..0dcff5575176914ba619e057bc8971f044f4a469
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-4.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-5.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-5.midi
new file mode 100644
index 0000000000000000000000000000000000000000..fdf9dc15d8e6ce7c00a77a1617e4e6e7fb412290
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-5.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-6.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-6.midi
new file mode 100644
index 0000000000000000000000000000000000000000..84ad4b722cf6de8ff94b95c3a680e0c482fdc5c5
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-6.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-7.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-7.midi
new file mode 100644
index 0000000000000000000000000000000000000000..0fedbc226cc438c441776fe66a357b2da4c057cb
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full-7.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.midi b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.midi
new file mode 100644
index 0000000000000000000000000000000000000000..29071de69306aee13246139c7ca789f73e223bff
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.midi differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8ff77e4851326ece5b357d64ee1b2842a181fbeb
Binary files /dev/null and b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf differ
diff --git a/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.toc b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.toc
new file mode 100644
index 0000000000000000000000000000000000000000..076db75c4ef891a6184eca17715c9bace933b136
--- /dev/null
+++ b/out/Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.toc
@@ -0,0 +1,8 @@
+1, section, 1, {1. Aria (Tenore)}, toc63,
+2, section, 1, {2. Recitativo (Tenore)}, toc64,
+3, section, 1, {3. Aria (Tenore)}, toc65,
+5, section, 1, {4. Choral}, toc66,
+6, section, 1, {5. Recitativo (Alto)}, toc67,
+6, section, 1, {6. Aria (Alto)}, toc68,
+7, section, 1, {7. Recitativo (Tenore)}, toc69,
+7, section, 1, {8. Choral}, toc70
\ No newline at end of file
diff --git a/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf b/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5501cf901606b96460fdc43d6e67061f95552e3e
Binary files /dev/null and b/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Full.pdf differ
diff --git a/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Instruments.pdf b/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Instruments.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..423676f225bcd86b480bc12b545fffbf3dbfeb0a
Binary files /dev/null and b/out/TeX_Grauper_AchJesuSatansUeberwinder_GWV1122_Score_Instruments.pdf differ