diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
index 35deee9f8ed70dd6196c900c6014c148aab592e9..63af9bc2107a0a4fdf4e2884cf2ab35816e212d5 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
@@ -7,8 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAdagio" #'("VI")
-\createScore #"IIMenuetto" #'("VI")
-\createScore #"IIIAdagio" #'("VI")
-\createScore #"IVThema" #'("VI")
+\createScore #"aIAdagio" #'("VI")
+\createScore #"aIIMenuetto" #'("VI")
+\createScore #"aIIIAdagio" #'("VI")
+\createScore #"aIVThema" #'("VI")
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
index 9267ea3ccabbfb33d670501fc5d93cdc9ec1d065..e0ee6e11af3873ecc8a04fff346707b35942bb9f 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
@@ -7,8 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAdagio" #'("VII")
-\createScore #"IIMenuetto" #'("VII")
-\createScore #"IIIAdagio" #'("VII")
-\createScore #"IVThema" #'("VII")
+\createScore #"aIAdagio" #'("VII")
+\createScore #"aIIMenuetto" #'("VII")
+\createScore #"aIIIAdagio" #'("VII")
+\createScore #"aIVThema" #'("VII")
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
index 95311ab7a3066c49753484640708858cb33d56f2..5ee44678ae0d723a5c3d6a499eacdee8c5936a8a 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
@@ -7,8 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAdagio" #'("Va")
-\createScore #"IIMenuetto" #'("Va")
-\createScore #"IIIAdagio" #'("Va")
-\createScore #"IVThema" #'("Va")
+\createScore #"aIAdagio" #'("Va")
+\createScore #"aIIMenuetto" #'("Va")
+\createScore #"aIIIAdagio" #'("Va")
+\createScore #"aIVThema" #'("Va")
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
index cb78dc3c98cf87864a6ddd05712ddec8789c49c4..da426fe5f1dddc9b0346975acc23cfaa0a58b700 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
@@ -7,8 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAdagio" #'("Vc")
-\createScore #"IIMenuetto" #'("Vc")
-\createScore #"IIIAdagio" #'("Vc")
-\createScore #"IVThema" #'("Vc")
+\createScore #"aIAdagio" #'("Vc")
+\createScore #"aIIMenuetto" #'("Vc")
+\createScore #"aIIIAdagio" #'("Vc")
+\createScore #"aIVThema" #'("Vc")
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily
index 9f7052242552718f2533636fa9445ba53d6c9620..5f6acef1d889e86e55a4efc0db5ab30de11b0401 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily
@@ -1,16 +1,16 @@
 \version "2.14.0"
 
-IAdagioPieceName = "1. Adagio non molto"
-IAdagioTempo = "Adagio non molto"
+aIAdagioPieceName = "1. Adagio non molto"
+aIAdagioTempo = "Adagio non molto"
 
-IAdagioKey = \key d \major
-IAdagioTimeSignature = \time 2/2
+aIAdagioKey = \key d \major
+aIAdagioTimeSignature = \time 2/2
 
-IAdagioSettings = \notemode {
-  \tempo \IAdagioTempo
+aIAdagioSettings = \notemode {
+  \tempo \aIAdagioTempo
   \partial 4
 }
-IAdagioSettingsII = \notemode {
+aIAdagioSettingsII = \notemode {
   \bar "|." 
   \tempo "Allegro moderato"
   \time 6/8
@@ -19,7 +19,7 @@ IAdagioSettingsII = \notemode {
 }
 
 
-IAdagioVIMusic = \relative c''' {
+aIAdagioVIMusic = \relative c''' {
   \repeat volta 2 {
     r4 | % 1
     r4 d8-.\p r h-. r g-. r | % 2
@@ -36,7 +36,7 @@ IAdagioVIMusic = \relative c''' {
     e8 r f4( e8) r f4 | % 13
     e2.\fermata 
     
-    \IAdagioSettingsII
+    \aIAdagioSettingsII
     a8\p-. | % 14
     a[( ais) h]-. h4 g8-. | % 15
     g[( gis) a]-. a4 fis8-. | % 16
@@ -178,10 +178,10 @@ IAdagioVIMusic = \relative c''' {
     }
   }
 }
-\addQuote "IAdagioVIMusic" { \IAdagioVIMusic }
+\addQuote "aIAdagioVIMusic" { \aIAdagioVIMusic }
 
 
-IAdagioVIIMusic = \relative c'' {
+aIAdagioVIIMusic = \relative c'' {
   \repeat volta 2 {
     a8\p-| r | % 1
     fis-| r d-| r r4 g8-| r | % 2
@@ -197,7 +197,7 @@ IAdagioVIIMusic = \relative c'' {
     cis-| r cis,-| r d-|\p r f-| r | % 12
     cis-| r d4( cis8) r d4( | % 13
     cis2.)\fermata 
-    \IAdagioSettingsII % TODO: double bar line
+    \aIAdagioSettingsII % TODO: double bar line
     r8 | % 14
     R2.*2 | % 16
     r8 r h8(\sf cis)[-| e(\sf d])-| | % 17
@@ -327,10 +327,10 @@ IAdagioVIIMusic = \relative c'' {
     d4.~\p d4
   } \barNumberCheck #137
 }
-\addQuote "IAdagioVIIMusic" { \IAdagioVIIMusic }
+\addQuote "aIAdagioVIIMusic" { \aIAdagioVIIMusic }
 
 
-IAdagioVaMusic = \relative c'' {
+aIAdagioVaMusic = \relative c'' {
   \repeat volta 2 {
     r4 | % 1
     a8\p-| r fis-| r d-|r r4 | % 2
@@ -347,7 +347,7 @@ IAdagioVaMusic = \relative c'' {
     a' r r4 r gis( | % 13
     a2.)\fermata
 
-    \IAdagioSettingsII
+    \aIAdagioSettingsII
     r8 | % 14
     r r d-|\p d[( dis) e]-| | % 15
     d4 c8-| c[( cis) d]-| | % 16
@@ -477,10 +477,10 @@ IAdagioVaMusic = \relative c'' {
     <fis a>4.~\pp <fis a>4
   } \barNumberCheck #137
 }
-\addQuote "IAdagioVaMusic" { \IAdagioVaMusic }
+\addQuote "aIAdagioVaMusic" { \aIAdagioVaMusic }
 
 
-IAdagioVcMusic = \relative c' {
+aIAdagioVcMusic = \relative c' {
   \repeat volta 2 {
     r4 | % 1
     r2 g8\p r e r | % 2
@@ -497,7 +497,7 @@ IAdagioVcMusic = \relative c' {
     a~ | % 13
     a2.\fermata
     
-    \IAdagioSettingsII
+    \aIAdagioSettingsII
     r8 | % 14
     R2.*3 | % 17
     r8 e'[(\p g]) a4 a,8\f | % 18
@@ -623,6 +623,6 @@ IAdagioVcMusic = \relative c' {
     d4.~ \pp d4
   } \barNumberCheck #137
 }
-\addQuote "IAdagioVcMusic" { \IAdagioVcMusic }
+\addQuote "aIAdagioVcMusic" { \aIAdagioVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
index 3e63afa2413f069f079867744f76e9d440ee8cc9..5f86565b4b763c586ed32070123411cbec997773 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
@@ -1,31 +1,31 @@
 \version "2.14.0"
 
-IIMenuettoPieceName = "2. Menuetto - Trio"
-IIMenuettoTempo = "Allegretto"
+aIIMenuettoPieceName = "2. Menuetto - Trio"
+aIIMenuettoTempo = "Allegretto"
 
-IIMenuettoKey = \key d \major
-IIMenuettoTimeSignature = \time 3/8
+aIIMenuettoKey = \key d \major
+aIIMenuettoTimeSignature = \time 3/8
 
-IIMenuettoSettings = \notemode {
-  \tempo \IIMenuettoTempo
+aIIMenuettoSettings = \notemode {
+  \tempo \aIIMenuettoTempo
   \partial 8
 }
 
-IIMenuettoTrioSettings = \notemode {
+aIIMenuettoTrioSettings = \notemode {
   \break
   \key d \major
   \tempo "Trio"
 %   \partial 4
 }
 
-IIMenuettoEndSettings = \notemode {
+aIIMenuettoEndSettings = \notemode {
   \mark "Menuetto da capo"
   \barNumberCheck #68
 }
 
 
 
-IIMenuettoVIMusic = \relative c'' {
+aIIMenuettoVIMusic = \relative c'' {
   \repeat volta 2 {
     a8-. | % 1
     a[-. a-. a]-. | % 2
@@ -76,7 +76,7 @@ IIMenuettoVIMusic = \relative c'' {
   }
   
   %% TRIO
-  \IIMenuettoTrioSettings
+  \aIIMenuettoTrioSettings
   \repeat volta 2 {
     r8 | % 45
     R4.*7 | % 52
@@ -96,12 +96,12 @@ IIMenuettoVIMusic = \relative c'' {
     e8.[( fis16 e8]) | % 68
     d4
   }
-  \IIMenuettoEndSettings
+  \aIIMenuettoEndSettings
 }
-\addQuote "IIMenuettoVIMusic" { \IIMenuettoVIMusic }
+\addQuote "aIIMenuettoVIMusic" { \aIIMenuettoVIMusic }
 
 
-IIMenuettoVIIMusic = \relative c' {
+aIIMenuettoVIIMusic = \relative c' {
   \repeat volta 2 {
     r8 | % 1
     R4. | % 2
@@ -153,7 +153,7 @@ IIMenuettoVIIMusic = \relative c' {
   }
   
   %% TRIO
-  \IIMenuettoTrioSettings
+  \aIIMenuettoTrioSettings
   \repeat volta 2 {
     a8\dolce^\solo | % 45
     a4( fis8) | % 46
@@ -183,12 +183,12 @@ IIMenuettoVIIMusic = \relative c' {
     e8.[ fis16 e8] | % 68
     d4
   }
-  \IIMenuettoEndSettings
+  \aIIMenuettoEndSettings
 }
-\addQuote "IIMenuettoVIIMusic" { \IIMenuettoVIIMusic }
+\addQuote "aIIMenuettoVIIMusic" { \aIIMenuettoVIIMusic }
 
 
-IIMenuettoVaMusic = \relative c {
+aIIMenuettoVaMusic = \relative c {
   \repeat volta 2 {
     r8 | % 1
     R4. | % 2
@@ -237,7 +237,7 @@ IIMenuettoVaMusic = \relative c {
   }
   
   %% TRIO
-  \IIMenuettoTrioSettings
+  \aIIMenuettoTrioSettings
   \repeat volta 2 {
     r8 | % 45
     R4. | % 46
@@ -267,12 +267,12 @@ IIMenuettoVaMusic = \relative c {
     g4 g8 | % 68
     fis4
   }
-  \IIMenuettoEndSettings
+  \aIIMenuettoEndSettings
 }
-\addQuote "IIMenuettoVaMusic" { \IIMenuettoVaMusic }
+\addQuote "aIIMenuettoVaMusic" { \aIIMenuettoVaMusic }
 
 
-IIMenuettoVcMusic = \relative c {
+aIIMenuettoVcMusic = \relative c {
   \repeat volta 2 {
     r8 | % 1
     R4.*7 | % 8
@@ -312,7 +312,7 @@ IIMenuettoVcMusic = \relative c {
   }
   
   %% TRIO
-  \IIMenuettoTrioSettings
+  \aIIMenuettoTrioSettings
   \repeat volta 2 {
     r8 | % 45
     R4. | % 46
@@ -342,6 +342,6 @@ IIMenuettoVcMusic = \relative c {
     a4 a8 | % 68
     d4
   }
-  \IIMenuettoEndSettings
+  \aIIMenuettoEndSettings
 }
-\addQuote "IIMenuettoVcMusic" { \IIMenuettoVcMusic }
+\addQuote "aIIMenuettoVcMusic" { \aIIMenuettoVcMusic }
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily
index f2ad0df889d1b48642e9b057a032151a21327022..a02d2ccd079a05e234ce1b0b2b96558b241a6358 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily
@@ -1,19 +1,19 @@
 \version "2.14.0"
 
-IIIAdagioPieceName = "3. Adagio"
-IIIAdagioTempo = "Adagio cantabile"
+aIIIAdagioPieceName = "3. Adagio"
+aIIIAdagioTempo = "Adagio cantabile"
 
-IIIAdagioKey = \key g \major
-IIIAdagioTimeSignature = \time 2/4
+aIIIAdagioKey = \key g \major
+aIIIAdagioTimeSignature = \time 2/4
 
-IIIAdagioSettings = \notemode {
-  \tempo \IIIAdagioTempo
+aIIIAdagioSettings = \notemode {
+  \tempo \aIIIAdagioTempo
   \mark "Con Sordini"
   \partial 8
 }
 
 
-IIIAdagioVIMusic = \relative c'' {
+aIIIAdagioVIMusic = \relative c'' {
   \repeat volta 2 {
     d16.[\p c32] | % 1
     c8[ h] r g'16.[ fis32] | % 2
@@ -100,10 +100,10 @@ IIIAdagioVIMusic = \relative c'' {
   }
   \barNumberCheck #84
 }
-\addQuote "IIIAdagioVIMusic" { \IIIAdagioVIMusic }
+\addQuote "aIIIAdagioVIMusic" { \aIIIAdagioVIMusic }
 
 
-IIIAdagioVIIMusic = \relative c'' {
+aIIIAdagioVIIMusic = \relative c'' {
   \repeat volta 2 {
     h16.[\p a32] | % 1
     a8[( g]) r e'16.[ d32] | % 2
@@ -193,10 +193,10 @@ IIIAdagioVIIMusic = \relative c'' {
   }
   \barNumberCheck #84
 }
-\addQuote "IIIAdagioVIIMusic" { \IIIAdagioVIIMusic }
+\addQuote "aIIIAdagioVIIMusic" { \aIIIAdagioVIIMusic }
 
 
-IIIAdagioVaMusic = \relative c' {
+aIIIAdagioVaMusic = \relative c' {
   \repeat volta 2 {
     r8 | % 1
     r16. g32[\p h16. d32] g8 r | % 2
@@ -286,10 +286,10 @@ IIIAdagioVaMusic = \relative c' {
   }
   \barNumberCheck #84
 }
-\addQuote "IIIAdagioVaMusic" { \IIIAdagioVaMusic }
+\addQuote "aIIIAdagioVaMusic" { \aIIIAdagioVaMusic }
 
 
-IIIAdagioVcMusic = \relative c' {
+aIIIAdagioVcMusic = \relative c' {
   \repeat volta 2 {
     r8 | % 1
     r16. g32[\p d16. h32] g8 r | % 2
@@ -379,6 +379,6 @@ IIIAdagioVcMusic = \relative c' {
   }
   \barNumberCheck #84
 }
-\addQuote "IIIAdagioVcMusic" { \IIIAdagioVcMusic }
+\addQuote "aIIIAdagioVcMusic" { \aIIIAdagioVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily
index 11252636936e1b9bb7dd24e22052eef7bf969017..f2851f2c86cd2c2a7f6d02f429731c668329bb21 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily
@@ -1,43 +1,43 @@
 \version "2.14.0"
 
-IVThemaPieceName = "4. Thema con Variationi"
-IVThemaTempo = "Moderato"
+aIVThemaPieceName = "4. Thema con Variationi"
+aIVThemaTempo = "Moderato"
 
-IVThemaKey = \key d \major
-IVThemaTimeSignature = \time 2/4
+aIVThemaKey = \key d \major
+aIVThemaTimeSignature = \time 2/4
 
-IVThemaSettings = \notemode {
-  \tempo \IVThemaTempo
+aIVThemaSettings = \notemode {
+  \tempo \aIVThemaTempo
   \partial 8
 }
-IVThemaI = \notemode {
+aIVThemaI = \notemode {
   \break
   \mark "Var.I"
   \barNumberCheck #16
 }
-IVThemaII = \notemode {
+aIVThemaII = \notemode {
   \break
   \mark "Var.II"
   \barNumberCheck #32
 }
-IVThemaIII = \notemode {
+aIVThemaIII = \notemode {
   \break
   \mark "Var.III"
   \key d \minor
   \barNumberCheck #48
 }
-IVThemaIV = \notemode {
+aIVThemaIV = \notemode {
   \break
   \mark "Var.IV"
   \key d \major
   \barNumberCheck #64
 }
-IVThemaV = \notemode {
+aIVThemaV = \notemode {
   \break
   \mark "Var.V"
   \barNumberCheck #80
 }
-IVThemaVI = \notemode {
+aIVThemaVI = \notemode {
   \break
   \bar "|."
   \tempo "Allegro"
@@ -47,7 +47,7 @@ IVThemaVI = \notemode {
 }
 
 
-IVThemaVIMusic = \relative c' {
+aIVThemaVIMusic = \relative c' {
   \repeat volta 2 {
     a8(\p | % 1
     d16-|) r fis8( a16)-| r a,8( | % 2
@@ -71,7 +71,7 @@ IVThemaVIMusic = \relative c' {
   } \barNumberCheck #16
   
   \repeat volta 2 {
-    \IVThemaI
+    \aIVThemaI
     r8 | % 17
     R2*2 | % 19
     r4 r8 g8 | \barNumberCheck #20
@@ -93,7 +93,7 @@ IVThemaVIMusic = \relative c' {
   } \barNumberCheck #32
   
   \repeat volta 2 {
-    \IVThemaII
+    \aIVThemaII
     d32[( fis d fis] | % 33
     a8)-| d32[( fis d fis] a8)-| fis32[( d fis d] | % 34
     g8)-| e32[( cis e cis] g8)-| e32[( g e g]) | % 35
@@ -116,7 +116,7 @@ IVThemaVIMusic = \relative c' {
   } \barNumberCheck #48
   
   \repeat volta 2 {
-    \IVThemaIII
+    \aIVThemaIII
     r8 | % 49
     r d,,8[(\pp cis d]) | \barNumberCheck #50
     e8.[ fis32 g] fis8[ a] | % 51
@@ -139,7 +139,7 @@ IVThemaVIMusic = \relative c' {
   } \barNumberCheck #64
   
   \repeat volta 2 {
-    \IVThemaIV
+    \aIVThemaIV
     r8 | % 65
     r8 fis[(\p a fis]) | % 66
     r e[( g e]) | % 67
@@ -160,7 +160,7 @@ IVThemaVIMusic = \relative c' {
   } \barNumberCheck #80
   
   \repeat volta 2 {
-    \IVThemaV
+    \aIVThemaV
     a8( | % 81
     d[)-| fis( a)-| a,]( | % 82
     cis)-| e[( a])-| a,( | % 83
@@ -197,7 +197,7 @@ IVThemaVIMusic = \relative c' {
   \grace { dis32[ e fis] } e4.
 
   \barNumberCheck #107
-  \IVThemaVI
+  \aIVThemaVI
   fis8\p | % 108
   fis4( g8) g4-| e8 | % 109
   e4( fis8) fis4-| d8 | \barNumberCheck #110
@@ -223,10 +223,10 @@ IVThemaVIMusic = \relative c' {
   d4 r8 d4
   \bar "|."  \barNumberCheck #129
 }
-\addQuote "IVThemaVIMusic" { \IVThemaVIMusic }
+\addQuote "aIVThemaVIMusic" { \aIVThemaVIMusic }
 
 
-IVThemaVIIMusic = \relative c' {
+aIVThemaVIIMusic = \relative c' {
   \repeat volta 2 {
     r8 | % 1
     a8\p r r4 | % 2
@@ -250,7 +250,7 @@ IVThemaVIIMusic = \relative c' {
   } \barNumberCheck #16
   
   \repeat volta 2 {
-    \IVThemaI
+    \aIVThemaI
     a'8 | % 17
     fis16[( a d fis]) a[( fis h a]) | % 18
     g[( fis e d] cis[ h a g]) | % 19
@@ -273,7 +273,7 @@ IVThemaVIIMusic = \relative c' {
   } \barNumberCheck #32
   
   \repeat volta 2 {
-    \IVThemaII
+    \aIVThemaII
     r8 | % 33
     r a' r d, | % 34
     r cis r e | % 35
@@ -296,7 +296,7 @@ IVThemaVIIMusic = \relative c' {
   } \barNumberCheck #48
   
   \repeat volta 2 {
-    \IVThemaIII
+    \aIVThemaIII
     r8 | % 49
     r a,4\pp a8 | % 50
     a4 r | \barNumberCheck #51
@@ -319,7 +319,7 @@ IVThemaVIIMusic = \relative c' {
   } \barNumberCheck #64
   
   \repeat volta 2 {
-    \IVThemaIV
+    \aIVThemaIV
     r8 | % 65
     r d[(\p fis d]) | % 66
     r cis[( e cis]) | % 67
@@ -342,7 +342,7 @@ IVThemaVIIMusic = \relative c' {
   } \barNumberCheck #80
   
   \repeat volta 2 {
-    \IVThemaV
+    \aIVThemaV
     r8 | % 81
     fis2\mf | % 82
     g2 | % 83
@@ -379,7 +379,7 @@ IVThemaVIIMusic = \relative c' {
   \grace { his16[ cis d] } cis4.\fermata 
 
   \barNumberCheck #107
-  \IVThemaVI
+  \aIVThemaVI
   a8\p | % 108
   a8[( ais) h]-| h4 g8-| | % 109
   g[( gis) a] a4 fis8-| | \barNumberCheck #110
@@ -405,10 +405,10 @@ IVThemaVIIMusic = \relative c' {
   d4 r8 d4
   \bar "|." \barNumberCheck #129
 }
-\addQuote "IVThemaVIIMusic" { \IVThemaVIIMusic }
+\addQuote "aIVThemaVIIMusic" { \aIVThemaVIIMusic }
 
 
-IVThemaVaMusic = \relative c' {
+aIVThemaVaMusic = \relative c' {
   \repeat volta 2 {
     r8 | % 1
     fis,8\p r r4 | % 2
@@ -432,7 +432,7 @@ IVThemaVaMusic = \relative c' {
   } \barNumberCheck #16
   
   \repeat volta 2 {
-    \IVThemaI
+    \aIVThemaI
     r8 | % 17
     r fis[-. d-. fis]-. | % 18
     g[-. h-. cis-. e]-. | % 19
@@ -455,7 +455,7 @@ IVThemaVaMusic = \relative c' {
   } \barNumberCheck #32
   
   \repeat volta 2 {
-    \IVThemaII
+    \aIVThemaII
     r8 | % 33
     fis[ fis' fis, a] | % 34
     e[ a e a] | % 35
@@ -478,7 +478,7 @@ IVThemaVaMusic = \relative c' {
   } \barNumberCheck #48
   
   \repeat volta 2 {
-    \IVThemaIII
+    \aIVThemaIII
     r8 | % 49
     r a,[(\pp g f]) | \barNumberCheck #50
     e[ a a e] | % 51
@@ -501,7 +501,7 @@ IVThemaVaMusic = \relative c' {
   } \barNumberCheck #64
   
   \repeat volta 2 {
-    \IVThemaIV
+    \aIVThemaIV
     a8 | % 65
     d16[( fis) a16.-| a32]-| a8-| r16 a, | % 66
     e'[( g) a16.-| a32]-| a8 r16 g | % 67
@@ -524,7 +524,7 @@ IVThemaVaMusic = \relative c' {
   } \barNumberCheck #80
   
   \repeat volta 2 {
-    \IVThemaV
+    \aIVThemaV
     r8 | % 81
     d2 | % 82
     e | % 83
@@ -560,7 +560,7 @@ IVThemaVaMusic = \relative c' {
   a4.\fermata % TODO: a4 instead of a4. printed
 
   \barNumberCheck #107
-  \IVThemaVI
+  \aIVThemaVI
   r8 | % 108
   d,8[\p d' d] d,[ d' d] | % 109
   d,[ d' d] d,[ d' d] | \barNumberCheck #110
@@ -586,10 +586,10 @@ IVThemaVaMusic = \relative c' {
   <d d,>4 r8 <d d,>4
   \bar "|." \barNumberCheck #129
 }
-\addQuote "IVThemaVaMusic" { \IVThemaVaMusic }
+\addQuote "aIVThemaVaMusic" { \aIVThemaVaMusic }
 
 
-IVThemaVcMusic = \relative c {
+aIVThemaVcMusic = \relative c {
   \repeat volta 2 {
     r8 | % 1
     d\p r r4 | % 2
@@ -613,7 +613,7 @@ IVThemaVcMusic = \relative c {
   } \barNumberCheck #16
   
   \repeat volta 2 {
-    \IVThemaI
+    \aIVThemaI
     r8 | % 17
     r d'[\p-| fis-| d]-| | % 18
     e[ g a cis] | % 19
@@ -636,7 +636,7 @@ IVThemaVcMusic = \relative c {
   } \barNumberCheck #32
   
   \repeat volta 2 {
-    \IVThemaII
+    \aIVThemaII
     r8 | % 33
     d' r d r | % 34
     cis r cis r | % 35
@@ -659,7 +659,7 @@ IVThemaVcMusic = \relative c {
   } \barNumberCheck #48
   
   \repeat volta 2 {
-    \IVThemaIII
+    \aIVThemaIII
     a'8(\p | % 49
     d)-|[ fis( e d]) | \barNumberCheck #50
     cis[ a d c] | % 51
@@ -682,7 +682,7 @@ IVThemaVcMusic = \relative c {
   } \barNumberCheck #64
   
   \repeat volta 2 {
-    \IVThemaIV
+    \aIVThemaIV
     r8 | % 65
     r d'[ d, d'] | % 66
     r a'[ a, a'] | % 67
@@ -705,7 +705,7 @@ IVThemaVcMusic = \relative c {
   } \barNumberCheck #80
   
   \repeat volta 2 {
-    \IVThemaV
+    \aIVThemaV
     r8 | % 81
     r16_"Staccato" d''16[-| a-| fis]-| d[-| a'-| fis-| d]-| | % 82
     a[-| a'-| e-| cis]-| a[-| e'-| cis-| a]-| | % 83
@@ -740,7 +740,7 @@ IVThemaVcMusic = \relative c {
   a4.\fermata
 
   \barNumberCheck #107
-  \IVThemaVI
+  \aIVThemaVI
   r8 | % 108
   R2.*3 | \barNumberCheck #111
   r4 r8 a16[\f h a g fis e] | % 112
@@ -764,6 +764,6 @@ IVThemaVcMusic = \relative c {
   d,4 r8 d4
   \bar "|." \barNumberCheck #129
 }
-\addQuote "IVThemaVcMusic" { \IVThemaVcMusic }
+\addQuote "aIVThemaVcMusic" { \aIVThemaVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
index 08bb9e63bd1f14577719e5a62a998c550ed7ad6d..fc3bc570043792502668ce7c490e3acc3c8b7953 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
@@ -8,7 +8,7 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createNoCuesScore #"IAdagio" #'("FullScore")
-\createNoCuesScore #"IIMenuetto" #'("FullScore")
-\createNoCuesScore #"IIIAdagio" #'("FullScore")
-\createNoCuesScore #"IVThema" #'("FullScore")
+\createNoCuesScore #"aIAdagio" #'("FullScore")
+\createNoCuesScore #"aIIMenuetto" #'("FullScore")
+\createNoCuesScore #"aIIIAdagio" #'("FullScore")
+\createNoCuesScore #"aIVThema" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
index e015581736244ce3c6c13488dc476c52ea814c1f..7d4be8210c997e348259c5f0854e8b184575855b 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
@@ -1,7 +1,7 @@
 \version "2.15.30"
-#(ly:set-option 'point-and-click #f)
+% #(ly:set-option 'point-and-click #f)
 
-\include "deutsch.ly"
+% \include "deutsch.ly"
 
 \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
index 2993fa99bd5bd7379e965c772b9121e0361cff98..b67ab02004634bc9ff5e1493b4aac08da5568d1e 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
@@ -1,3 +1,4 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_fullscore.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV190_D-Dur_Settings.ily"
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
index b8467b7d994ece13067430b8b52d9b4af09d1831..734dcc2fd29895cfb841e75d24d89997b434602e 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
@@ -1,10 +1,10 @@
 \version "2.15.30"
 
-\include "orchestrallily/oly_settings_names.ily"
+% \include "orchestrallily/oly_settings_names.ily"
 
-scorenumber="EK-1190"
 
 \header {
+  scorenumberbase="EK-1190"
   title = "Streichquartett D-Dur"
   titlepagetitle = "Streichquartett D-Dur"
   subtitle = "Op.I/1, HV 190"
@@ -23,8 +23,13 @@ scorenumber="EK-1190"
 %% CorKey = \key g \major
 %% CorIKey = \CorKey
 %% CorIIKey = \CorKey
-\orchestralScoreStructure #oly:StringEnsembleScoreStructure
-VIShortInstrumentName = ##f
-VIIShortInstrumentName = ##f
-VaShortInstrumentName = ##f
-VcShortInstrumentName = ##f
+% \orchestralScoreStructure #oly:StringEnsembleScoreStructure
+% VIShortInstrumentName = ##f
+% VIIShortInstrumentName = ##f
+% VaShortInstrumentName = ##f
+% VcShortInstrumentName = ##f
+
+% \paper {
+% %   #(define page-breaking ly:optimal-breaking)
+%   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
+% }
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
index 21166797f5ad2a9a5e058eb64d2e5a94dd96eac0..c54207ea315334f8fd814df31a0f7eb2a7446ee7 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
@@ -1,8 +1,5 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV190_D-Dur_Settings.ily"
 
-\paper {
-%   #(define page-breaking ly:optimal-breaking)
-  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
index b3dfa3729dd7dcdde8fd4d3aadd8b8ede64df453..0384a112d89710e1a26b3b7f195a41fe48db07b5 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("VI")
-\createScore #"IIAdagioNonMolto" #'("VI")
-\createScore #"IIIMenuetto" #'("VI")
-% \createScore #"IVTrio" #'("VI")
-\createScore #"IVFinale" #'("VI")
+\createScore #"bIAllegro" #'("VI")
+\createScore #"bIIAdagioNonMolto" #'("VI")
+\createScore #"bIIIMenuetto" #'("VI")
+\createScore #"bIVFinale" #'("VI")
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
index 581ecb38c65b38bd52dc08d78dc33616b554964f..eff489dcbfcaeb9faeb670e4c5b9256d7740e599 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("VII")
-\createScore #"IIAdagioNonMolto" #'("VII")
-\createScore #"IIIMenuetto" #'("VII")
-% \createScore #"IVTrio" #'("VII")
-\createScore #"IVFinale" #'("VII")
+\createScore #"bIAllegro" #'("VII")
+\createScore #"bIIAdagioNonMolto" #'("VII")
+\createScore #"bIIIMenuetto" #'("VII")
+\createScore #"bIVFinale" #'("VII")
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
index 61df467f9d9816ab19911baa9f7b47256e397c08..c4f1cf491d2f8467a734f634b9172b30328a218c 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("Va")
-\createScore #"IIAdagioNonMolto" #'("Va")
-\createScore #"IIIMenuetto" #'("Va")
-% \createScore #"IVTrio" #'("Va")
-\createScore #"IVFinale" #'("Va")
+\createScore #"bIAllegro" #'("Va")
+\createScore #"bIIAdagioNonMolto" #'("Va")
+\createScore #"bIIIMenuetto" #'("Va")
+\createScore #"bIVFinale" #'("Va")
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
index 93cbdada315cf3cc2399933fbea2a0ece9e76950..e21d1a95f4a9561cbee1adb558688e223c6ae400 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("Vc")
-\createScore #"IIAdagioNonMolto" #'("Vc")
-\createScore #"IIIMenuetto" #'("Vc")
-% \createScore #"IVTrio" #'("Vc")
-\createScore #"IVFinale" #'("Vc")
+\createScore #"bIAllegro" #'("Vc")
+\createScore #"bIIAdagioNonMolto" #'("Vc")
+\createScore #"bIIIMenuetto" #'("Vc")
+\createScore #"bIVFinale" #'("Vc")
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily b/Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily
index 3ebfd6f274ff181b7e53a8b76fd24d4763cc31e1..98acd7ef2d6aede5f5ba5eadea4f8ef6bdb8904f 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily
@@ -1,18 +1,27 @@
 \version "2.15.30"
 
-IAllegroPieceName = "1. Allegro"
-IAllegroTempo = "Allegro"
+bIAllegroPieceName = "1. Allegro"
+bIAllegroTempo = "Allegro"
 
-IAllegroKey = \key c \minor
-IAllegroTimeSignature = \time 3/4
+bIAllegroKey = \key c \minor
+bIAllegroTimeSignature = \time 3/4
 
-IAllegroSettings = \notemode {
-  \tempo \IAllegroTempo
-  \grace s8 <>
+bIAllegroSettings = \notemode {
+  \tempo \bIAllegroTempo
+}
+
+bIAllegroExtraSettings = \notemode {
+  % beamExceptions must be AFTER the time signature, so we can't set it in ...Settings!
+  \set Timing.beamExceptions = #'(
+     (end . (                 ;entry for end of beams
+       ((1 . 8) . (6))        ;rule for 1/8 beams -- whole bar
+       ((1 . 16) . (4 4 4))   ;rule for 1/32 beams -- end each 1/16
+     )))
+%   \grace s8 s1*0
 }
 
 
-IAllegroVIMusic = \relative c' {
+bIAllegroVIMusic = \relative c' {
 \repeat volta 2 {
   \slashedGrace g8 es'4.\p d16[ c] h4 | % 2
   \slashedGrace g8 f'4. es16[ d] c4 | % 3
@@ -44,21 +53,21 @@ IAllegroVIMusic = \relative c' {
   \addArticulation "staccatissimo" { d8 as' g es c f | % 29
     d as' g es c f | \barNumberCheck #30
     d4 b'} r | % 31
-  g,2\pp f4 |
-  \grace f16 es8( d es f) es4 |
-  d( g) g-| |
-  g2( es4) |
-  as2( g4 |
-  f2 es4) |
-  d( b') b-| |
-  b2( g4) |
+  g,2\pp f4 | % 32
+  \grace f16 es8( d es f) es4 | % 33
+  d( g) g-| | % 34
+  g2( es4) | % 35
+  as2( g4 | % 36
+  f2 es4) | % 37
+  d( b') b-| | % 38
+  b2( g4) | % 39
   r4 r \grace { a16[ b c] } b8 r | \barNumberCheck #40
-  \grace { fis'16[ g as] } g8 r \grace { d16[ es f] } es8 r8 \grace { fis16[ g as] } g8 r | % 41
+  \grace { fis'16[ g as] } g8 r \grace { d16[ es fis] } es8 r8 \grace { fis16[ g as] } g8 r | % 41
   \grace { a16[ b c] } b8 r r4 \grace { as,16[ b c] } b8 r | % 42
-  \grace { fis'16[ g as] } g8 r \grace { d16[ es f] } es8 r \grace { a16[ b c] } b8 r | % 43
+  \grace { fis'16[ g as] } g8 r \grace { d16[ es fis] } es8 r \grace { a16[ b c] } b8 r | % 43
   \grace { h,16[ c d] } c8 r \grace { e16[ f g] } f8 r \grace { g16[ as b] } as8 r |  % 44
   \grace { a,16[ b c] } b8 r \grace { d16[ es f] } es8 r \grace { fis16[ g a] } g8 r | % 45
-  \grace { g,16[ as b] } as8 r \grace { es'16[ f g] } f8 r \grace { g,16[ as b] } as8 r | % 46
+  \grace { g,16[ as b] } as8 r \grace { e'16[ f g] } f8 r \grace { g,16[ as b] } as8 r | % 46
   g8 r e' r f r | % 47
   as2\sf g4 | % 48
   g8( f16) r f8( es16) r es8( d16) r | % 49
@@ -66,21 +75,21 @@ IAllegroVIMusic = \relative c' {
     d es f g as g f es d c b as | % 51
   } g4 r r | % 52
   R2. | % 53
-  g16 es' g b es d c b as g f es | % 54
+  es16 es' g b es d c b as g f es | % 54
   d es f g as g f es d c b as | % 55
   g4 r r | % 56
   R2. | % 57
   b4 g as\trill | % 58
   b g as\trill | % 59
   b r r | \barNumberCheck #60
-  r r8 b( d es) | % 61
+  r r8 b(\sf d es) | % 61
   \afterGrace d2.\trill { c16[ d] } | % 62
   es4.\f f16 g as4 | % 63
-  f4. g16 s b4 | % 64
+  f4. g16 as b4 | % 64
   g4. f16 es d4 | % 65
   as'4. g16 f es4 | % 66
   g,8 r r4 as'4~\sf | % 67
-  as8 b16 c b8 s g4 | % 68
+  as8 b16 c b8 as g4 | % 68
   f8.\trill g16 as8 f d b | % 69
   es4 r es\p | \barNumberCheck #70
   \grace { a16[ b c] } b4 \grace { a16[ b c] } b4 \grace { a16[ b c] } b4 | % 71
@@ -88,12 +97,12 @@ IAllegroVIMusic = \relative c' {
   \grace { a16[ b c] } b4 \grace { a16[ b c] } b4 \grace { a16[ b c] } b4 | % 73
   g4 r b'\p | % 74
   \grace { fis16[ g as] } g4 r b, | % 75
-  \grace { fis16[ g as] } g4 es es | % 76
+  \grace { fis16[ g as] } g4\pp es es | % 76
   es2. 
 } \repeat volta 2 { \barNumberCheck #77
   b'4.\ff as16 ges f4 | % 78
   ces'4. b16 as ges4 | % 79
-  des'4\trill \grace { ces16[ d] } es4 ges, | \barNumberCheck #80
+  des'4\trill \grace { ces16[ des] } es4 ges, | \barNumberCheck #80
   f ges r | % 81
   ces4.\p b16 as g4 | % 82
   des'4. ces16 b as4 | % 83
@@ -108,7 +117,7 @@ IAllegroVIMusic = \relative c' {
   f4 r r | % 92
   r as'4..\sf ges16 | % 93
   f4-| des-| r | % 94
-  r ces'4..\sf b16 | % 95
+  r c'4..\sf b16 | % 95
   as4-| f-| r | % 96
   r \grace es16 es'4..\sf des16 | % 97
   c4-. as-. r | % 98
@@ -119,69 +128,69 @@ IAllegroVIMusic = \relative c' {
   e8 r r4 r | % 103
   r8 \addArticulation "staccatissimo" { c'8 as f d g | % 104
     e4 c' } r\fermata | % 105
-  a,2\ppdolce g4 |
-  \grace g16 f8( e f) g f4 |
-  e4( a) a-| |
-  a2 f4 |
+  a,2\ppdolce g4 | % 106
+  \grace g16 f8( e f) g f4 | % 107
+  e4( a) a-| | % 108
+  a2 f4 | % 109
   b2( a4 | \barNumberCheck #110
-  g2 f4) |
-  e( c') c-| |
-  c2 a4 |
-  b8( a b c d b) |
-  c( h c d es c) |
-  d( c d es f d) |
-  es( d es f g es) |
-  c( h c d es e) |
-  \grace g16 f8( e f g as f) |
+  g2 f4) | % 111
+  e( c') c-| | % 112
+  c2 a4 | % 113
+  b8( a b c d b) | % 114
+  c( h c d es c) | % 115
+  d( c d es f d) | % 116
+  es( d es f g es) | % 117
+  c( h c d es e) | % 118
+  \grace g16 f8( e f g as f) | % 119
   b4 r r | \barNumberCheck #120
-  \grace f16 es8( d es f g es) |
-  as4 r r |
-  \grace es16 d8( c d es f d) |
-  g4 r r |
-  R2. |
-  r4 r \grace { fis,16[ g as] } g8 r |
-  \grace { d'16[ es f] } es8 r \grace { h16[ c d] } c8 r \grace { d16[ es f] } es8 r |
-  \grace { fis16[ g as] } g8 r r4 \grace { fis,16[ g as] } g8 r |
-  \grace { d'16[ es f] } es8 r \grace { h16[ c d] } c8 r \grace { f16[ g as] } g8 r |
+  \grace f16 es8( d es f g es) | % 121
+  as4 r r | % 122
+  \grace es16 d8( c d es f d) | % 123
+  g4 r r | % 124
+  R2. | % 125
+  r4 r \grace { fis,16[ g as] } g8 r | % 126
+  \grace { d'16[ es f] } es8 r \grace { h16[ c d] } c8 r \grace { d16[ es f] } es8 r | % 127
+  \grace { fis16[ g as] } g8 r r4 \grace { fis,16[ g as] } g8 r | % 128
+  \grace { d'16[ es f] } es8 r \grace { h16[ c d] } c8 r \grace { f16[ g as] } g8 r | % 129
   \grace { g,16[ as b] } as8 r \grace { cis16[ d es] } d8 r \grace { e16[ f g] } f8 r | \barNumberCheck #130
-  \grace { f,16[ g as] } g8 r \grace { h16[ c d] } c8 r \grace { d16[ es f] } es8 r |
-  \grace { e,16[ f g] } f8 r \grace { c'16[ d es] } d8 r \grace { e,16[ f g] } f8 r |
-  es8\p r c' r h r |
-  f'2\sf es4 |
+  \grace { fis,16[ g as] } g8 r \grace { h16[ c d] } c8 r \grace { d16[ es f] } es8 r | % 131
+  \grace { e,16[ f g] } f8 r \grace { cis'16[ d es] } d8 r \grace { e,16[ f g] } f8 r | % 132
+  es8\p r c' r h r | % 133
+  f'2\sf es4 | % 134
   es8( d16) r d8( c16) r c8( h16) r | % 135
-  c16( c') c-| c-| c g a h c d es c |
-  h f'f f f d h c d h g f |
-  es4 r r |
-  R2. |
-  c,16 c' d es f g a h c g es' c |
-  h d f f f d h c d h g f | 
-  es4 r r |
-  R2. |
-  g,4 es f |
-  g es f |
-  g r r |
-  r r8 g'8(\mf f es) |
-  \afterGrace d2.\trill { c16[ d] } |
-  c4.\f d16 es f4 |
+  c16( c') c-| c-| c g a h c d es c | % 136
+  h f'f f f d h c d h g f | % 137
+  es4 r r | % 138
+  R2. | % 139
+  c,16 c' d es f g a h c g es' c | \barNumberCheck #140
+  h d f f f d h c d h g f |  % 141
+  es4 r r | % 142
+  R2. | % 143
+  g,4 es f | % 144
+  g es f | % 145
+  g r r | % 146
+  r r8 g'8(\mf f es) | % 147
+  \afterGrace d2.\trill { c16[ d] } | % 148
+  c4.\f d16 es f4 | % 149
   d4. es16 f g4 | \barNumberCheck #150
-  es4. d16 c h4 |
-  f'4. es16 d c4 |
-  c, r f'\f~ |
-  f8 g16 as g8 f es4 |
-  d8.\trill es16 g8( f d h) |
-  c4 r c |
-  \grace { f16\p[ g as] } g4 \grace{f16[ g as] } g4 \grace { f16[ g as] } g4 |
-  es4 r c, |
-  \grace { fis16[ g as] } g4 \grace { fis16[\cresc g as] } g4 \grace { fis16[ g as] } g4 |
+  es4. d16 c h4 | % 151
+  f'4. es16 d c4 | % 152
+  c, r f'\f~ | % 153
+  f8 g16 as g8 f es4 | % 154
+  d8.\trill es16 g8( f d h) | % 155
+  c4 r c | % 156
+  \grace { fis16[ g as] } g4\p \grace{f16[ g as] } g4 \grace { f16[ g as] } g4 | % 157
+  es4 r c, | % 158
+  \grace { fis16[ g as] } g4 \grace { fis16[\cresc g as] } g4 \grace { fis16[ g as] } g4 | % 159
   es4 r g | \barNumberCheck #160
-  \grace { h16[ c d] } c4 r g, |
-  \grace { h16[ c d] } c4\pp c c |
+  \grace { h16[ c d] } c4\p r g, | % 161
+  \grace { h16[ c d] } c4\pp c c | % 162
   c2. \barNumberCheck #163
 }}
-\addQuote "IAllegroVIMusic" { \IAllegroVIMusic }
+% \addQuote "bIAllegroVIMusic" { \bIAllegroVIMusic }
 
 
-IAllegroVIIMusic = \relative c' {
+bIAllegroVIIMusic = \relative c' {
 \repeat volta 2 {
   g2.\p | % 2
   g2. | % 3
@@ -345,12 +354,12 @@ IAllegroVIIMusic = \relative c' {
   c es d c h d | \barNumberCheck #160
   c es d c h d | % 161
   c4 g g | % 162
-  g2. \barNumberCheck #162 % TODO: Im Druck nur g2 statt g2.
+  g2. \barNumberCheck #163 % TODO: Im Druck nur g2 statt g2.
 }}
-\addQuote "IAllegroVIIMusic" { \IAllegroVIIMusic }
+% \addQuote "bIAllegroVIIMusic" { \bIAllegroVIIMusic }
 
 
-IAllegroVaMusic = \relative c {
+bIAllegroVaMusic = \relative c {
 \repeat volta 2 {
   r4 es(\p f) | % 2
   r f( g) | % 3
@@ -516,11 +525,11 @@ IAllegroVaMusic = \relative c {
   g4\pp es es | % 162
   es2.\barNumberCheck #163
 }}
-\addQuote "IAllegroVaMusic" { \IAllegroVaMusic }
+% \addQuote "bIAllegroVaMusic" { \bIAllegroVaMusic }
 
 
 
-IAllegroVcMusic = \relative c {
+bIAllegroVcMusic = \relative c {
 \repeat volta 2 {
   \grace s8
   r4 c\p d | % 2
@@ -675,10 +684,10 @@ IAllegroVcMusic = \relative c {
   \grace {h16[ c d] } c4\p \grace {h16[ c d] } c4 \grace {h16[ c d] } c4 |
   g4 r r |
   r c, \grace { fis16[ g as]} g4 | \barNumberCheck #160
-  r c, \grace { fis16[ g as]} g4 |
+  r c, \grace { fis16[ g as]} g4 | % 162
   es4\pp g es |
   c2.
 }}
-\addQuote "IAllegroVcMusic" { \IAllegroVcMusic }
+% \addQuote "bIAllegroVcMusic" { \bIAllegroVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily b/Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily
index e777379d21f62211ad703039d4aad5c61296c69a..e9a63789355b9d133e9e17a5a78332b4de1acb55 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily
@@ -1,21 +1,27 @@
 \version "2.15.30"
 
-IIAdagioNonMoltoPieceName = "2. Adagio non molto"
-IIAdagioNonMoltoTempo = "Adagio non molto"
+bIIAdagioNonMoltoPieceName = "2. Adagio non molto"
+bIIAdagioNonMoltoTempo = "Adagio non molto"
 
-IIAdagioNonMoltoKey = \key c \minor
-IIAdagioNonMoltoTimeSignature = \time 2/2
+bIIAdagioNonMoltoKey = \key c \minor
+bIIAdagioNonMoltoTimeSignature = \time 2/2
 
-IIAdagioNonMoltoSettings = \notemode {
+bIIAdagioNonMoltoSettings = \notemode {
   \partial 2
-  \tempo \IIAdagioNonMoltoTempo
-  \set Timing.baseMoment = #(ly:make-moment 1 8)
-  \set Timing.beatStructure = #'(2 2 2 2)
+  \tempo \bIIAdagioNonMoltoTempo
+}
+
+bIIAdagioNonMoltoExtraSettings = \notemode {
+  % beamExceptions must be AFTER the time signature, so we can't set it in ...Settings!
+  \set Timing.beamExceptions = #'(
+     (end . (
+       ((1 . 16) . (4 4 4 4))
+     )))
   <>_\conSordini
 }
 
 
-IIAdagioNonMoltoVIMusic = \relative c'' \repeat volta 2 {
+bIIAdagioNonMoltoVIMusic = \relative c'' \repeat volta 2 {
   g8 r g r | % 1
   g4(\sf b8)-| r f8\p r f r | % 2
   f4(\sf as8)-| r es4 \grace g16 f16( es f as) | % 3
@@ -31,9 +37,9 @@ IIAdagioNonMoltoVIMusic = \relative c'' \repeat volta 2 {
   r2 g8\f r g r | % 13
   g4( b8)-| r f r f r | % 14
   f4( as8)-| r g4 as4\mordent | % 15
-  b4 b16( c d es) es,4 \grace g16 f( es f g) | % 16
+  b4 h16( c d es) es,4 \grace g16 f( es f g) | % 16
   \grace f4 es2 r | % 17
-  \grace b16 b'4\dolce d,16( es f d) es8 b b r | % 18
+  \grace b16 b'4\dolce d,16( es f d) es8[ b] b r | % 18
   b16(\trill c32 d es f g as b16 as f d) es4 r | % 19
   r16 g\trill es' d c( b a g) f4 r | \barNumberCheck #20
   r16 f(\trill d' c b a g f) es4~ es16 c' a es | % 21
@@ -42,14 +48,14 @@ IIAdagioNonMoltoVIMusic = \relative c'' \repeat volta 2 {
   \grace d16 c h c es a,4 b8-. c-. d-. \grace f16 es8 | % 24
   d4( c8) r f16\p ges es f des4 | % 25
   es16( f des es) c4 des8-| es-| f8.(\sf es32 des) | % 26
-  c4 f8 r r4 \grace a16 g16\f f g b | % 27
-  es8 es \grace d16 a16 g a c f,4 \grace c'16 b a b d | % 28
+  c4 f8 r r4 \grace as16 g16\f f g b | % 27
+  es,8 es \grace d'16 a16 g a c f,4 \grace c'16 b a b d | % 28
   g,8 g \grace d'16 c h c es a,4 r | % 29
   \grace g16 f e f es d cis d h c8 c16 c f8 f16 f | \barNumberCheck #30
   f4.. b16 g8 f16 f es8 d16 d | % 31
-  c16 c \grace d16 c32 b c d b8 r \grace { g,16[ b']} g'4\sf f16 es d c | % 32
+  c16 c \grace d16 c32 b c d b8 r \grace { es,16[ b']} g'4\sf f16 es d c | % 32
   f8..(\sf g64 a) b8-| r d,,4\pp f16( es d a) | % 33 % TODO: 8. und g32 ODER 8.. und g64???
-  d8 r f'8-. f-. d-. r f,-.\pp f-. | % 34
+  b8 r f''8-. f-. d-. r f,-.\pp f-. | % 34
   d r b r \grace c16 b( a b d) f( e f d) | % 35
   b8 r r4 d'16(\cresc cis d f b a b d,) | % 36
   es4 r es16( d es g b a b g) | % 37
@@ -62,27 +68,27 @@ IIAdagioNonMoltoVIMusic = \relative c'' \repeat volta 2 {
   r2 \grace b16 b'4\dolce d,16( es f d) | % 44
   es8 b b4 b'8.g16 b16 as f d | % 45
   es8 r es r es8( c'16 b as g f es) | % 46
-  des( c b\cresc as g f es des) \grace es16 d4\trill c4 | % 47
+  des( c b\cresc as g f es des) \grace es16 des4\trill c4 | % 47
   c'4~ c16( f g as) b,4~ b16( es f g) | % 48
-  f32( d g f) as( g b as) c16 as f es es32( d c b) b16-. b-. b8-. r | % 49
+  f32( e g f) as( g b as) c16 as f es es32( d c b) b16-. b-. b8-. r | % 49
   \grace as'16 g f g b es,4 \grace g16 f16 e f as d,4 | \barNumberCheck #50
   es8-. f-. g-. \grace b16 as8 g4( f8) r | % 51
   b,16\p ces as b ges4 as16 b ges as f4 | % 52
-  ges8 as b8.\sf as32 g f4( b8) r |
-  r4 \grace d16 c\f h c es as,8 as \grace es'16 d c d f |
-  b,4 \grace f'16 es( d es g) c,8 c \grace g'16 f( e f as) |
-  d,4 r \grace c'16 b16( a b as) g fis g es |
-  d cis d f es d es g b4.. es16 |
-  c8 b16 b as8 g16 g f f \grace g16 f32 es f g es8 r |
-  \grace { as,16[ es'] } c'4\sf b16( as) g( f) b8.\sf( c32 d es8)-| r |
-  g,4\pp b16( as f d) es8 r b-| b-| | \barNumberCheck #60
+  ges8 as b8.\sf as32 ges f4( b8) r | % 53
+  r4 \grace d16 c\f h c es as,8 as \grace es'16 d c d f | % 54
+  b,4 \grace f'16 es( d es g) c,8 c \grace g'16 f( e f as) | % 55
+  d,4 r \grace c'16 b16( a b as) g fis g es | % 56
+  d cis d f es d es g b4.. es16 | % 57
+  c8 b16 b as8 g16 g f f \grace g16 f32 es f g es8 r | % 58
+  \grace { as,16[ es'] } c'4\sf b16( as) g( f) b8.\sf( c32 d es8)-| r | % 59
+  g,,4\pp b16( as f d) es8 r b'-| b-| | \barNumberCheck #60
   g8-| r b,-| b-| g-| r <g es'>-| r | % 61
   q2
 }
-\addQuote "IIAdagioNonMoltoVIMusic" { \IIAdagioNonMoltoVIMusic }
+\addQuote "bIIAdagioNonMoltoVIMusic" { \bIIAdagioNonMoltoVIMusic }
 
 
-IIAdagioNonMoltoVIIMusic = \relative c' \repeat volta 2 {
+bIIAdagioNonMoltoVIIMusic = \relative c' \repeat volta 2 {
   es8 r es r | % 1
   es4\f g8 r d r d r | % 2
   d4\sf f8 r r2 | % 3
@@ -146,10 +152,10 @@ IIAdagioNonMoltoVIIMusic = \relative c' \repeat volta 2 {
   es4 \slashedGrace g8 f16( es f d) es8 r es r | % 61
   es2 \barNumberCheck #61
 }
-\addQuote "IIAdagioNonMoltoVIIMusic" { \IIAdagioNonMoltoVIIMusic }
+\addQuote "bIIAdagioNonMoltoVIIMusic" { \bIIAdagioNonMoltoVIIMusic }
 
 
-IIAdagioNonMoltoVaMusic = \relative c' \repeat volta 2 {
+bIIAdagioNonMoltoVaMusic = \relative c' \repeat volta 2 {
   r2 | % 1
   b4.\sf r8 b\p r b r | % 2
   b4.\sf r8 g4( b) | % 3
@@ -213,10 +219,10 @@ IIAdagioNonMoltoVaMusic = \relative c' \repeat volta 2 {
   g4 \slashedGrace b8 as16( g as f) g8 r g r | % 61
   g2 \barNumberCheck #61
 }
-\addQuote "IIAdagioNonMoltoVaMusic" { \IIAdagioNonMoltoVaMusic }
+\addQuote "bIIAdagioNonMoltoVaMusic" { \bIIAdagioNonMoltoVaMusic }
 
 
-IIAdagioNonMoltoVcMusic = \relative c, \repeat volta 2 {
+bIIAdagioNonMoltoVcMusic = \relative c, \repeat volta 2 {
   \set Timing.baseMoment = #(ly:make-moment 1 8)
   \set Timing.beatStructure = #'(2 2 2 2)
   r2 | % 1
@@ -282,6 +288,6 @@ IIAdagioNonMoltoVcMusic = \relative c, \repeat volta 2 {
   \slashedGrace f'8 es16( d es g) b,4 \slashedGrace f8 es16( d es g) b( a b g) | % 61
   es2
 }
-\addQuote "IIAdagioNonMoltoVcMusic" { \IIAdagioNonMoltoVcMusic }
+\addQuote "bIIAdagioNonMoltoVcMusic" { \bIIAdagioNonMoltoVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily b/Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily
index 23f5ce0c42a2f4ea633b83a1b7283978d0f88bb1..916742368b243d9485cec0805d8e9f85cd49e805 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily
@@ -1,17 +1,17 @@
 \version "2.15.30"
 
-IIIMenuettoPieceName = "3. Menuetto - Trio"
-IIIMenuettoTempo = "Allegretto"
+bIIIMenuettoPieceName = "3. Menuetto - Trio"
+bIIIMenuettoTempo = "Allegretto"
 
-IIIMenuettoKey = \key c \minor
-IIIMenuettoTimeSignature = \time 3/4
+bIIIMenuettoKey = \key c \minor
+bIIIMenuettoTimeSignature = \time 3/4
 
-IIIMenuettoSettings = \notemode {
-  \tempo \IIIMenuettoTempo
+bIIIMenuettoSettings = \notemode {
+  \tempo \bIIIMenuettoTempo
   \partial 4
 }
 
-IIIMenuettoTrioSettings = \notemode {
+bIIIMenuettoTrioSettings = \notemode {
   \break
   \key c \major
   \tempo "Trio"
@@ -19,13 +19,13 @@ IIIMenuettoTrioSettings = \notemode {
 %   \partial 4
 }
 
-IIIMenuettoEndSettings = \notemode {
+bIIIMenuettoEndSettings = \notemode {
   \mark "Menuetto da capo"
   \barNumberCheck #48
 }
 
 
-IIIMenuettoVIMusic = \relative c'' {
+bIIIMenuettoVIMusic = \relative c'' {
 \repeat volta 2 {
   g4-|\f | % 1
   c2.-. | % 2
@@ -50,11 +50,11 @@ IIIMenuettoVIMusic = \relative c'' {
   c h8[( as! g f]) | % 19
   es[( d c d es f]) | \barNumberCheck #20
   g4-| r f-| | % 21
-  a2-. h,4 | % 22
+  as2-. h,4 | % 22
   c( es) g-| | % 23
   g8[( f) f( d) d( h)] | % 24
   c2
-} \IIIMenuettoTrioSettings
+} \bIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -74,7 +74,7 @@ IIIMenuettoVIMusic = \relative c'' {
   f4-. d-. r | % 36
   r r \times 2/3 { g8-. a-. g-. } | % 37
   f4-. d-. \times 2/3 { f8 g f } | % 38
-  e4( c' h)~ | % 39
+  e4( c') h~ | % 39
   h8 a a g fis a | \barNumberCheck #40
   g4. f8( e f) | % 41
   g4-. g-. g-. | % 42
@@ -86,12 +86,12 @@ IIIMenuettoVIMusic = \relative c'' {
   e d d c h d | \barNumberCheck #48
   c4 r
 }
-\IIIMenuettoEndSettings
+\bIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVIMusic" { \IIIMenuettoVIMusic }
+\addQuote "bIIIMenuettoVIMusic" { \bIIIMenuettoVIMusic }
 
 
-IIIMenuettoVIIMusic = \relative c' {
+bIIIMenuettoVIIMusic = \relative c' {
 \repeat volta 2 {
   g4-|\f | % 1
   c2.-. | % 2
@@ -120,7 +120,7 @@ IIIMenuettoVIIMusic = \relative c' {
   c4( es) g-. | % 23
   as2 f4 | % 24
   es2
-} \IIIMenuettoTrioSettings
+} \bIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -152,12 +152,12 @@ IIIMenuettoVIIMusic = \relative c' {
   a, d a d a d | % 47
   d f d f d f | % 48
   e4 r
-}\IIIMenuettoEndSettings
+}\bIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVIIMusic" { \IIIMenuettoVIIMusic }
+\addQuote "bIIIMenuettoVIIMusic" { \bIIIMenuettoVIIMusic }
 
 
-IIIMenuettoVaMusic = \relative c' {
+bIIIMenuettoVaMusic = \relative c' {
 \repeat volta 2 {
   r4 | % 1
   r g-|\f c~\sf | % 2
@@ -186,7 +186,7 @@ IIIMenuettoVaMusic = \relative c' {
   as8( g f es d c) | % 23
   f2 g4 | % 24
   c,4 c'
-} \IIIMenuettoTrioSettings
+} \bIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -217,12 +217,12 @@ IIIMenuettoVaMusic = \relative c' {
   f, f f | % 47
   g g g | % 48
   c c,
-}\IIIMenuettoEndSettings
+}\bIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVaMusic" { \IIIMenuettoVaMusic }
+\addQuote "bIIIMenuettoVaMusic" { \bIIIMenuettoVaMusic }
 
 
-IIIMenuettoVcMusic = \relative c {
+bIIIMenuettoVcMusic = \relative c {
 \repeat volta 2 {
   r4 | % 1
   r g4\f-| c~\sf | % 2
@@ -250,7 +250,7 @@ IIIMenuettoVcMusic = \relative c {
   as8[ g f es d c] | % 23
   f2 g4 | % 24
   c, c'
-} \IIIMenuettoTrioSettings
+} \bIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -269,6 +269,6 @@ IIIMenuettoVcMusic = \relative c {
   g, g' r | % 41
   R2.*7 | % 48
   r4 r4 \barNumberCheck #48
-}\IIIMenuettoEndSettings
+}\bIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVcMusic" { \IIIMenuettoVcMusic }
+\addQuote "bIIIMenuettoVcMusic" { \bIIIMenuettoVcMusic }
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily b/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
index 0388b6f13047e1fb7409bc71107518033c718c20..a9ca0606f74a7c1ff654adff6cf8dfad9b900600 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
@@ -1,18 +1,29 @@
 \version "2.15.30"
 
-IVFinalePieceName = "4. Finale"
-IVFinaleTempo = "Allegro"
+bIVFinalePieceName = "4. Finale"
+bIVFinaleTempo = "Allegro"
 
-IVFinaleKey = \key c \minor
-IVFinaleTimeSignature = \time 2/4
+bIVFinaleKey = \key c \minor
+bIVFinaleTimeSignature = \time 2/4
 
-IVFinaleSettings = \notemode {
-  \tempo \IVFinaleTempo
+bIVFinaleSettings = \notemode {
+  \tempo \bIVFinaleTempo
   \partial 8
 }
 
+bIVFinaleExtraSettings = \notemode {
+  % beamExceptions must be AFTER the time signature, so we can't set it in ...Settings!
+  \set Timing.beamExceptions = #'(
+     (end . (
+       ((1 . 8) . (4))
+       ((1 . 12) . (3 3))
+       
+     )))
+  <>_\conSordini
+}
+
 
-IVFinaleVIMusic = \relative c' {
+bIVFinaleVIMusic = \relative c' {
 \repeat volta 2 {
   h16[( c]) | % 1
   es4 r8 h16[( c]) | % 2
@@ -187,10 +198,10 @@ IVFinaleVIMusic = \relative c' {
     es4 <c es, g,>4 | % 169
     q } r8 \barNumberCheck #169
 }}
-\addQuote "IVFinaleVIMusic" { \IVFinaleVIMusic }
+\addQuote "bIVFinaleVIMusic" { \bIVFinaleVIMusic }
 
 
-IVFinaleVIIMusic = \relative c' {
+bIVFinaleVIIMusic = \relative c' {
 \repeat volta 2 {
   r8 | % 1
   r <es g,>8\p q r | % 2
@@ -365,10 +376,10 @@ IVFinaleVIIMusic = \relative c' {
   es4 <c' es, g,> | % 169
   q r8 \barNumberCheck #169
 }}
-\addQuote "IVFinaleVIIMusic" { \IVFinaleVIIMusic }
+\addQuote "bIVFinaleVIIMusic" { \bIVFinaleVIIMusic }
 
 
-IVFinaleVaMusic = \relative c' {
+bIVFinaleVaMusic = \relative c' {
 \repeat volta 2 {
   r8 | % 1
   r c\p c r | % 2
@@ -543,10 +554,10 @@ IVFinaleVaMusic = \relative c' {
   es4 <c' es, g, c,> | % 1169
   q r8 \barNumberCheck #169
 }}
-\addQuote "IVFinaleVaMusic" { \IVFinaleVaMusic }
+\addQuote "bIVFinaleVaMusic" { \bIVFinaleVaMusic }
 
 
-IVFinaleVcMusic = \relative c {
+bIVFinaleVcMusic = \relative c {
 \repeat volta 2 {
   r8 | % 1
   r c[\p c] r | % 2
@@ -719,4 +730,4 @@ IVFinaleVcMusic = \relative c {
   c4 c, | % 169
   c4 r8 \barNumberCheck #169
 }}
-\addQuote "IVFinaleVcMusic" { \IVFinaleVcMusic }
+\addQuote "bIVFinaleVcMusic" { \bIVFinaleVcMusic }
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
index 78ce793c628eeec08bfadf363ca38a45205132b3..86bf822cd327652a78c520fd223eadf71a14618a 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
@@ -8,7 +8,7 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createNoCuesScore #"IAllegro" #'("FullScore")
-\createNoCuesScore #"IIAdagioNonMolto" #'("FullScore")
-\createNoCuesScore #"IIIMenuetto" #'("FullScore")
-\createNoCuesScore #"IVFinale" #'("FullScore")
+\createNoCuesScore #"bIAllegro" #'("FullScore")
+\createNoCuesScore #"bIIAdagioNonMolto" #'("FullScore")
+\createNoCuesScore #"bIIIMenuetto" #'("FullScore")
+\createNoCuesScore #"bIVFinale" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
index e76dd7f7a644d716087ccd6727b3ddf9b73ccccb..3b526af41e2a24b7dae6107d00691b1854753db5 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
@@ -1,7 +1,7 @@
 \version "2.15.30"
 #(ly:set-option 'point-and-click #f)
 
-\include "deutsch.ly"
+% \include "deutsch.ly"
 
 \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
index b0c0120b14b892d3ca6d700b0798bb301564b957..53649a126ed678baf6cfa0df30735618bb90d132 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
@@ -1,3 +1,4 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_fullscore.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV191_c-Moll_Settings.ily"
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily
index d0a37aed7d7e6178845f2263ae88ee242867d314..c1379a497895c1b7fdf4c0d7630856478f182bc5 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily
@@ -1,11 +1,11 @@
 \version "2.15.30"
 
-\include "orchestrallily/oly_settings_names.ily"
-\include "orchestrallily/measureCounterEngraver.ily"
+% \include "orchestrallily/oly_settings_names.ily"
+% \include "orchestrallily/measureCounterEngraver.ily"
 
-scorenumber="EK-1191"
 
 \header {
+  scorenumberbase="EK-1191"
   title = "Streichquartett c-Moll"
   titlepagetitle = "Streichquartett c-Moll"
   subtitle = "Op.I/2, HV 191"
@@ -25,16 +25,22 @@ scorenumber="EK-1191"
 %% CorIKey = \CorKey
 %% CorIIKey = \CorKey
 
-conSordini = \markup \italic {Con sordini.}
+% conSordini = \markup \italic {Con sordini.}
 
-\layout {
-  \context {
-    \Score
-    autoBeaming = ##t
-  }
-}
-\orchestralScoreStructure #oly:StringEnsembleScoreStructure
-VIShortInstrumentName = ##f
-VIIShortInstrumentName = ##f
-VaShortInstrumentName = ##f
-VcShortInstrumentName = ##f
+% \layout {
+%   \context {
+%     \Score
+%     autoBeaming = ##t
+%   }
+% }
+% \orchestralScoreStructure #oly:StringEnsembleScoreStructure
+% VIShortInstrumentName = ##f
+% VIIShortInstrumentName = ##f
+% VaShortInstrumentName = ##f
+% VcShortInstrumentName = ##f
+% 
+% 
+% \paper {
+%   #(define page-breaking ly:optimal-breaking)
+%   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
+% }
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
index 23442f8442af83ae3dfd14a6a8c2e106aefff8a2..439e00f6bebb72507a6486eb4c105c4e67546e5f 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
@@ -1,8 +1,5 @@
 \version "2.15.30"
+
 \include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV191_c-Moll_Settings.ily"
-
-\paper {
-  #(define page-breaking ly:optimal-breaking)
-  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
index d2944e00bd93f0fe3255999386503be0b750bbd0..f45ef1b7839aff50645bccb8065a905fadde5b7f 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("VI")
-\createScore #"IIAdagio" #'("VI")
-\createScore #"IIIMenuetto" #'("VI")
-\createScore #"IVTrio" #'("VI")
-\createScore #"VFinale" #'("VI")
+\createScore #"cIAllegro" #'("VI")
+\createScore #"cIIAdagio" #'("VI")
+\createScore #"cIIIMenuetto" #'("VI")
+\createScore #"cIVFinale" #'("VI")
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
index c295f5239717d59c5551e466404cd0d72544432c..dde73e75b4d8c87570a1270e650747451e85072a 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("VII")
-\createScore #"IIAdagio" #'("VII")
-\createScore #"IIIMenuetto" #'("VII")
-\createScore #"IVTrio" #'("VII")
-\createScore #"VFinale" #'("VII")
+\createScore #"cIAllegro" #'("VII")
+\createScore #"cIIAdagio" #'("VII")
+\createScore #"cIIIMenuetto" #'("VII")
+\createScore #"cIVFinale" #'("VII")
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
index 79c6ffc87f6f44ff5c77a4f74fe93ae7ddea0fcf..c04a0ffde08160cbff0504fde6f2f174a483ed2a 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("Va")
-\createScore #"IIAdagio" #'("Va")
-\createScore #"IIIMenuetto" #'("Va")
-\createScore #"IVTrio" #'("Va")
-\createScore #"VFinale" #'("Va")
+\createScore #"cIAllegro" #'("Va")
+\createScore #"cIIAdagio" #'("Va")
+\createScore #"cIIIMenuetto" #'("Va")
+\createScore #"cIVFinale" #'("Va")
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
index 3fc85e7d4dcbe7f3e1c115f943758d70cdfe7a82..c09d4dbaba422c3472166a1a631a82b36773245d 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
@@ -7,9 +7,8 @@
   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
-\createScore #"IAllegro" #'("Vc")
-\createScore #"IIAdagio" #'("Vc")
-\createScore #"IIIMenuetto" #'("Vc")
-\createScore #"IVTrio" #'("Vc")
-\createScore #"VFinale" #'("Vc")
+\createScore #"cIAllegro" #'("Vc")
+\createScore #"cIIAdagio" #'("Vc")
+\createScore #"cIIIMenuetto" #'("Vc")
+\createScore #"cIVFinale" #'("Vc")
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
index 2f0b803afce13f77d810f02582102cc268fe8c7c..f03c3e3b69226d63537ad08ac06e0a98f3590aa2 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
@@ -1,41 +1,72 @@
 \version "2.15.30"
 
-IAllegroPieceName = "1. Allegro"
-IAllegroTempo = "Allegro"
+cIAllegroPieceName = "1. Allegro"
+cIAllegroTempo = "Allegro"
 
-IAllegroKey = \key c \major
-IAllegroTimeSignature = \time 4/4
+cIAllegroKey = \key b \major
+cIAllegroTimeSignature = \time 2/4
 
-IAllegroSettings = \notemode {
-  \tempo \IAllegroTempo
+cIAllegroSettings = \notemode {
+  \tempo \cIAllegroTempo
+  \partial 8
 }
 
 
-IAllegroVIMusic = \relative c' {
+cIAllegroVIMusic = \relative c' {
+  r8 | % 1
+  R2*3 | % 4
+  r4 r8 g'8-|\p | % 5
+  h,16( c d h c8) g'8-| | % 6
+  a,16( b c a b8) d8( | % 7
+  c8)-| h-| a-| b-| | % 8
+  f4 r8 f'8-|\f | % 9
+  d-| d-| es-| es-| | \barNumberCheck #10
+  c16( h c d c8) f-| | % 11
+  d-| d-| es-| es-| | % 12
+  c4-| r8 f | % 13
+  d16( c d es) d8 b'-| | % 14
+  g16( fis g a g8) g-| | % 15
+  f-| f-| a,-| a-| | % 16
+  b4-| r | % 17
+  r r8 f8(\p | % 18
+  g f d b) | % 19
+  a( c) r f( | \barNumberCheck #20
+  g f d b) | % 21
+  a( c) r f\f | % 22
+  d'16. b32 b8\trill f'16. d32 d8\trill | % 23
+  b'16. f32 f8\trill d'4~ | % 24
+  d16( c) b-. a-. b( a) g-. f-. | % 25
+  g( f) es-. d-. es( d) c-. b-. | % 26
+  c16. f,32 f8\trill f' 16. c32 c8\trill | % 27
+  a'16. f32 f8\trill c'4~ | % 28 % TODO: ~ missing before line break in Stimme
+  c16( b) a-. g-. a( g) f-. e-. | % 29
+  f( e) d-. c-. d( c) b-. a-. | \barNumberCheck #30
+  
+  
   s8
   % TODO
 }
-\addQuote "IAllegroVIMusic" { \IAllegroVIMusic }
+\addQuote "cIAllegroVIMusic" { \cIAllegroVIMusic }
 
 
-IAllegroVIIMusic = \relative c' {
+cIAllegroVIIMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IAllegroVIIMusic" { \IAllegroVIIMusic }
+\addQuote "cIAllegroVIIMusic" { \cIAllegroVIIMusic }
 
 
-IAllegroVaMusic = \relative c' {
+cIAllegroVaMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IAllegroVaMusic" { \IAllegroVaMusic }
+\addQuote "cIAllegroVaMusic" { \cIAllegroVaMusic }
 
 
-IAllegroVcMusic = \relative c' {
+cIAllegroVcMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IAllegroVcMusic" { \IAllegroVcMusic }
+\addQuote "cIAllegroVcMusic" { \cIAllegroVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
index 5998ce4606d52a34a8e54447a19bf45e8248662c..73c932b1114514de8ca1ea1cf8e8192d0d5796a5 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
@@ -1,41 +1,41 @@
 \version "2.15.30"
 
-IIAdagioPieceName = "2.Adagio"
-IIAdagioTempo = "Adagio"
+cIIAdagioPieceName = "2. Adagio"
+cIIAdagioTempo = "Adagio"
 
-IIAdagioKey = \key c \major
-IIAdagioTimeSignature = \time 4/4
+cIIAdagioKey = \key c \major
+cIIAdagioTimeSignature = \time 4/4
 
-IIAdagioSettings = \notemode {
-  \tempo \IIAdagioTempo
+cIIAdagioSettings = \notemode {
+  \tempo \cIIAdagioTempo
 }
 
 
-IIAdagioVIMusic = \relative c' {
+cIIAdagioVIMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IIAdagioVIMusic" { \IIAdagioVIMusic }
+\addQuote "cIIAdagioVIMusic" { \cIIAdagioVIMusic }
 
 
-IIAdagioVIIMusic = \relative c' {
+cIIAdagioVIIMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IIAdagioVIIMusic" { \IIAdagioVIIMusic }
+\addQuote "cIIAdagioVIIMusic" { \cIIAdagioVIIMusic }
 
 
-IIAdagioVaMusic = \relative c' {
+cIIAdagioVaMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IIAdagioVaMusic" { \IIAdagioVaMusic }
+\addQuote "cIIAdagioVaMusic" { \cIIAdagioVaMusic }
 
 
-IIAdagioVcMusic = \relative c' {
+cIIAdagioVcMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IIAdagioVcMusic" { \IIAdagioVcMusic }
+\addQuote "cIIAdagioVcMusic" { \cIIAdagioVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
index add96f3f4b0f1d5cbcc9a1f57708f0a2ea6a567a..3678a05548a0a1022f6d724e78ed5ad5a83ce1f1 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
@@ -1,33 +1,33 @@
 \version "2.15.30"
 
-IIIMenuettoPieceName = "3. Menuetto - Trio"
-IIIMenuettoTempo = "TODO"
+cIIIMenuettoPieceName = "3. Menuetto - Trio"
+cIIIMenuettoTempo = "TODO"
 
-IIIMenuettoKey = \key c \major
-IIIMenuettoTimeSignature = \time 4/4
+cIIIMenuettoKey = \key c \major
+cIIIMenuettoTimeSignature = \time 4/4
 
-IIIMenuettoSettings = \notemode {
-  \tempo \IIIMenuettoTempo
+cIIIMenuettoSettings = \notemode {
+  \tempo \cIIIMenuettoTempo
 }
-IIIMenuettoTrioSettings = \notemode {
+cIIIMenuettoTrioSettings = \notemode {
   \break
   \key c \major
   \tempo "Trio"
 %   \partial 4
 }
 
-IIIMenuettoEndSettings = \notemode {
+cIIIMenuettoEndSettings = \notemode {
   \mark "Menuetto da capo"
 }
 
 
-IIIMenuettoVIMusic = \relative c' {
+cIIIMenuettoVIMusic = \relative c' {
 \repeat volta 2 {
   % TODO
 } \repeat volta 2 {
   s8
   % TODO
-} \IIIMenuettoTrioSettings
+} \cIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -35,17 +35,17 @@ IIIMenuettoVIMusic = \relative c' {
 } \repeat volta 2 {
   s8
   % TODO
-}\IIIMenuettoEndSettings
+}\cIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVIMusic" { \IIIMenuettoVIMusic }
+\addQuote "cIIIMenuettoVIMusic" { \cIIIMenuettoVIMusic }
 
-IIIMenuettoVIIMusic = \relative c' {
+cIIIMenuettoVIIMusic = \relative c' {
 \repeat volta 2 {
   % TODO
 } \repeat volta 2 {
   s8
   % TODO
-} \IIIMenuettoTrioSettings
+} \cIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -53,18 +53,18 @@ IIIMenuettoVIIMusic = \relative c' {
 } \repeat volta 2 {
   s8
   % TODO
-}\IIIMenuettoEndSettings
+}\cIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVIIMusic" { \IIIMenuettoVIIMusic }
+\addQuote "cIIIMenuettoVIIMusic" { \cIIIMenuettoVIIMusic }
 
 
-IIIMenuettoVaMusic = \relative c' {
+cIIIMenuettoVaMusic = \relative c' {
 \repeat volta 2 {
   % TODO
 } \repeat volta 2 {
   s8
   % TODO
-} \IIIMenuettoTrioSettings
+} \cIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -72,17 +72,17 @@ IIIMenuettoVaMusic = \relative c' {
 } \repeat volta 2 {
   s8
   % TODO
-}\IIIMenuettoEndSettings
+}\cIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVaMusic" { \IIIMenuettoVaMusic }
+\addQuote "cIIIMenuettoVaMusic" { \cIIIMenuettoVaMusic }
 
-IIIMenuettoVcMusic = \relative c' {
+cIIIMenuettoVcMusic = \relative c' {
 \repeat volta 2 {
   % TODO
 } \repeat volta 2 {
   s8
   % TODO
-} \IIIMenuettoTrioSettings
+} \cIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
@@ -90,7 +90,7 @@ IIIMenuettoVcMusic = \relative c' {
 } \repeat volta 2 {
   s8
   % TODO
-}\IIIMenuettoEndSettings
+}\cIIIMenuettoEndSettings
 }
-\addQuote "IIIMenuettoVcMusic" { \IIIMenuettoVcMusic }
+\addQuote "cIIIMenuettoVcMusic" { \cIIIMenuettoVcMusic }
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
index 627742e52c6c46b6bde0112f9ed46c279a1e1241..86f67757da28b9b3898ef5eec3d535bf56d381df 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
@@ -1,41 +1,41 @@
 \version "2.15.30"
 
-IVFinalePieceName = "4. Finale - Vivace"
-IVFinaleTempo = "Vivace"
+cIVFinalePieceName = "4. Finale - Vivace"
+cIVFinaleTempo = "Vivace"
 
-IVFinaleKey = \key c \major
-IVFinaleTimeSignature = \time 4/4
+cIVFinaleKey = \key c \major
+cIVFinaleTimeSignature = \time 4/4
 
-IVFinaleSettings = \notemode {
-  \tempo \IVFinaleTempo
+cIVFinaleSettings = \notemode {
+  \tempo \cIVFinaleTempo
 }
 
 
-IVFinaleVIMusic = \relative c' {
+cIVFinaleVIMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IVFinaleVIMusic" { \IVFinaleVIMusic }
+\addQuote "cIVFinaleVIMusic" { \cIVFinaleVIMusic }
 
 
-IVFinaleVIIMusic = \relative c' {
+cIVFinaleVIIMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IVFinaleVIIMusic" { \IVFinaleVIIMusic }
+\addQuote "cIVFinaleVIIMusic" { \cIVFinaleVIIMusic }
 
 
-IVFinaleVaMusic = \relative c' {
+cIVFinaleVaMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IVFinaleVaMusic" { \IVFinaleVaMusic }
+\addQuote "cIVFinaleVaMusic" { \cIVFinaleVaMusic }
 
 
-IVFinaleVcMusic = \relative c' {
+cIVFinaleVcMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "IVFinaleVcMusic" { \IVFinaleVcMusic }
+\addQuote "cIVFinaleVcMusic" { \cIVFinaleVcMusic }
 
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
index ea245d576e4eaf7a227a933029f8422421d05ba2..11d647af8cf091c275f6538139a52d2ee8d2c437 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
@@ -8,7 +8,7 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createNoCuesScore #"IAllegro" #'("FullScore")
-\createNoCuesScore #"IIAdagio" #'("FullScore")
-\createNoCuesScore #"IIIMenuetto" #'("FullScore")
-\createNoCuesScore #"IVFinale" #'("FullScore")
+\createNoCuesScore #"cIAllegro" #'("FullScore")
+\createNoCuesScore #"cIIAdagio" #'("FullScore")
+\createNoCuesScore #"cIIIMenuetto" #'("FullScore")
+\createNoCuesScore #"cIVFinale" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
index 5b40e97ab20199c60e61657f222ecb43eb149279..cd58d96065bf81cff21a2c480290fdf819a69597 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
@@ -1,7 +1,7 @@
 \version "2.15.30"
 #(ly:set-option 'point-and-click #f)
 
-\include "deutsch.ly"
+% \include "deutsch.ly"
 
 \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
index 577cd61e40ed6e7bb531d54decc37c29c16d37c2..0e055b635d42b44b7b0cc14d958f71e875ceb6cf 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
@@ -1,3 +1,4 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_fullscore.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV192_B-Dur_Settings.ily"
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily
index 5367fb349c4cfe36ff508cee3e1bc9cdb5e00734..aca5ab50ffb38c33e3db31bff95f2aff5d72dd1b 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily
@@ -1,10 +1,10 @@
 \version "2.15.30"
 
-\include "orchestrallily/oly_settings_names.ily"
+% \include "orchestrallily/oly_settings_names.ily"
 
-scorenumber="EK-1192"
 
 \header {
+  scorenumberbase="EK-1192"
   title = "Streichquartett B-Dur"
   titlepagetitle = "Streichquartett B-Dur"
   subtitle = "Op.I/3, HV 192"
@@ -23,14 +23,14 @@ scorenumber="EK-1192"
 %% CorKey = \key g \major
 %% CorIKey = \CorKey
 %% CorIIKey = \CorKey
-\layout {
-  \context {
-    \Score
-    autoBeaming = ##t
-  }
-}
-\orchestralScoreStructure #oly:StringEnsembleScoreStructure
-VIShortInstrumentName = ##f
-VIIShortInstrumentName = ##f
-VaShortInstrumentName = ##f
-VcShortInstrumentName = ##f
+% \layout {
+%   \context {
+%     \Score
+%     autoBeaming = ##t
+%   }
+% }
+% \orchestralScoreStructure #oly:StringEnsembleScoreStructure
+% VIShortInstrumentName = ##f
+% VIIShortInstrumentName = ##f
+% VaShortInstrumentName = ##f
+% VcShortInstrumentName = ##f
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
index 319fb8f7352c3392bbf6eb64feb626e84c641577..96a3a34e59f30136c162e081ba01915cbbe64be5 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
@@ -1,8 +1,4 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 \include "Eybler_Streichquartett_HV192_B-Dur_Settings.ily"
-
-\paper {
-%   #(define page-breaking ly:optimal-breaking)
-  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_VI.ly b/Eybler_Streichquartette_HV190-192_Instrument_VI.ly
new file mode 100644
index 0000000000000000000000000000000000000000..51d1343c038050bd19668cfac7214fb7a6af77ca
--- /dev/null
+++ b/Eybler_Streichquartette_HV190-192_Instrument_VI.ly
@@ -0,0 +1,62 @@
+\version "2.15.30"
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "orchestrallily/oly_settings_names.ily"
+
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
+
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily"
+
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily"
+
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily"
+
+\header {
+  instrument = \VIInstrumentName
+}
+
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"aIAdagio" #'("VI")
+  \createScore #"aIIMenuetto" #'("VI")
+  \createScore #"aIIIAdagio" #'("VI")
+  \createScore #"aIVThema" #'("VI")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"bIAllegro" #'("VI")
+  \createScore #"bIIAdagioNonMolto" #'("VI")
+  \createScore #"bIIIMenuetto" #'("VI")
+  \createScore #"bIVFinale" #'("VI")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"cIAllegro" #'("VI")
+  \createScore #"cIIAdagio" #'("VI")
+  \createScore #"cIIIMenuetto" #'("VI")
+  \createScore #"cIVFinale" #'("VI")
+}
+
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_VII.ly b/Eybler_Streichquartette_HV190-192_Instrument_VII.ly
new file mode 100644
index 0000000000000000000000000000000000000000..c697356da81b903508599a8277881c5d8ccaf225
--- /dev/null
+++ b/Eybler_Streichquartette_HV190-192_Instrument_VII.ly
@@ -0,0 +1,62 @@
+\version "2.15.30"
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "orchestrallily/oly_settings_names.ily"
+
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
+
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily"
+
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily"
+
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily"
+
+\header {
+  instrument = \VIIInstrumentName
+}
+
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VIINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"aIAdagio" #'("VII")
+  \createScore #"aIIMenuetto" #'("VII")
+  \createScore #"aIIIAdagio" #'("VII")
+  \createScore #"aIVThema" #'("VII")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VIINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"bIAllegro" #'("VII")
+  \createScore #"bIIAdagioNonMolto" #'("VII")
+  \createScore #"bIIIMenuetto" #'("VII")
+  \createScore #"bIVFinale" #'("VII")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VIINumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"cIAllegro" #'("VII")
+  \createScore #"cIIAdagio" #'("VII")
+  \createScore #"cIIIMenuetto" #'("VII")
+  \createScore #"cIVFinale" #'("VII")
+}
+
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_Va.ly b/Eybler_Streichquartette_HV190-192_Instrument_Va.ly
new file mode 100644
index 0000000000000000000000000000000000000000..c715fd2daef4b024a7143c6a7493524285b3f82c
--- /dev/null
+++ b/Eybler_Streichquartette_HV190-192_Instrument_Va.ly
@@ -0,0 +1,62 @@
+\version "2.15.30"
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "orchestrallily/oly_settings_names.ily"
+
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
+
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily"
+
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily"
+
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily"
+
+\header {
+  instrument = \VaInstrumentName
+}
+
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VaNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"aIAdagio" #'("Va")
+  \createScore #"aIIMenuetto" #'("Va")
+  \createScore #"aIIIAdagio" #'("Va")
+  \createScore #"aIVThema" #'("Va")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VaNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"bIAllegro" #'("Va")
+  \createScore #"bIIAdagioNonMolto" #'("Va")
+  \createScore #"bIIIMenuetto" #'("Va")
+  \createScore #"bIVFinale" #'("Va")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VaNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"cIAllegro" #'("Va")
+  \createScore #"cIIAdagio" #'("Va")
+  \createScore #"cIIIMenuetto" #'("Va")
+  \createScore #"cIVFinale" #'("Va")
+}
+
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly b/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly
new file mode 100644
index 0000000000000000000000000000000000000000..3180a5b3310a4fe27eb98652eaf618bb5d66315d
--- /dev/null
+++ b/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly
@@ -0,0 +1,62 @@
+\version "2.15.30"
+\include "orchestrallily/oly_settings_instrument.ily"
+\include "orchestrallily/oly_settings_names.ily"
+
+\include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
+
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily"
+
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily"
+
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily"
+
+\header {
+  instrument = \VcInstrumentName
+}
+
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VcNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"aIAdagio" #'("Vc")
+  \createScore #"aIIMenuetto" #'("Vc")
+  \createScore #"aIIIAdagio" #'("Vc")
+  \createScore #"aIVThema" #'("Vc")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VcNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"bIAllegro" #'("Vc")
+  \createScore #"bIIAdagioNonMolto" #'("Vc")
+  \createScore #"bIIIMenuetto" #'("Vc")
+  \createScore #"bIVFinale" #'("Vc")
+}
+
+\bookpart {
+  \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
+  \header {
+    scorenumber = \markup{\scoreNumber \VcNumber}
+%     pdftitle = \markup{\shortcomposer: \title, \instrument}
+  }
+  \createScore #"cIAllegro" #'("Vc")
+  \createScore #"cIIAdagio" #'("Vc")
+  \createScore #"cIIIMenuetto" #'("Vc")
+  \createScore #"cIVFinale" #'("Vc")
+}
+
diff --git a/Eybler_Streichquartette_HV190-192_Settings_Global.ily b/Eybler_Streichquartette_HV190-192_Settings_Global.ily
new file mode 100644
index 0000000000000000000000000000000000000000..3f9a9f492569f0bb9603c7a4e5fb1a50cffa97ef
--- /dev/null
+++ b/Eybler_Streichquartette_HV190-192_Settings_Global.ily
@@ -0,0 +1,23 @@
+\version "2.15.30"
+\include "deutsch.ly"
+
+\include "orchestrallily/measureCounterEngraver.ily"
+
+#(ly:set-option 'point-and-click #f)
+
+\orchestralScoreStructure #oly:StringEnsembleScoreStructure
+VIShortInstrumentName = ##f
+VIIShortInstrumentName = ##f
+VaShortInstrumentName = ##f
+VcShortInstrumentName = ##f
+
+\layout {
+  \context { \Score
+    autoBeaming = ##t
+  }
+}
+conSordini = \markup \italic {Con sordini.}
+\paper {
+%   #(define page-breaking ly:optimal-breaking)
+  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
+}
diff --git a/Makefile b/Makefile
index aaac8a6ce5c7c80e2ccdae995cba66f991e18dbe..9544622729513867fecb176aaaca5030f17c9c65 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,12 @@ OUT=out
 instruments = VI VII Va Vc
 scores = Full
 
-base = Eybler_Streichquartett_HV190_D-Dur
-SRCS = $(base)_Music_01_Adagio.ily $(base)_Music_02_Menuetto.ily $(base)_Music_03_Trio.ily $(base)_Music_04_Adagio.ily $(base)_Music_05_Thema.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_Instrument.ily $(base)_Settings_FullScore.ily
-pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
-     $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+base = Eybler_Streichquartette_HV190-192
+
+base1 = Eybler_Streichquartett_HV190_D-Dur
+SRCS = $(base1)_Music_01_Adagio.ily $(base1)_Music_02_Menuetto.ily $(base1)_Music_03_Trio.ily $(base1)_Music_04_Adagio.ily $(base1)_Music_05_Thema.ily $(base1)_Settings_Global.ily $(base1)_Settings.ily $(base1)_Settings_Instrument.ily $(base1)_Settings_FullScore.ily
+pdfs = $(instruments:%=$(OUT)/$(base1)_Instrument_%.pdf) \
+     $(scores:%=$(OUT)/$(base1)_Score_%.pdf)
 
 base2 = Eybler_Streichquartett_HV191_c-Moll
 SRCS2 = $(base2)_Music_01_Allegro.ily $(base2)_Music_02_Adagio.ily $(base2)_Music_03_Menuetto.ily $(base2)_Music_04_Trio.ily $(base2)_Music_05_Finale.ily $(base2)_Settings_Global.ily $(base2)_Settings.ily $(base2)_Settings_Instrument.ily $(base2)_Settings_FullScore.ily
@@ -23,23 +25,23 @@ texscores = Full VI VII Va Vc
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf)
 
-distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs)
+distfiles = $(instruments:%=$(OUT)/$(base1)_Instrument_%.pdf) $(texpdfs)
 
 additionalscores =
 
 .PHONY: all clean
 all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
-instruments: $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf)
-scores: $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+instruments1: $(instruments:%=$(OUT)/$(base1)_Instrument_%.pdf)
+scores1: $(scores:%=$(OUT)/$(base1)_Score_%.pdf)
 instruments2: $(instruments:%=$(OUT)/$(base2)_Instrument_%.pdf)
 scores2: $(scores:%=$(OUT)/$(base2)_Score_%.pdf)
 instruments3: $(instruments:%=$(OUT)/$(base3)_Instrument_%.pdf)
 scores3: $(scores:%=$(OUT)/$(base3)_Score_%.pdf)
 
-VI1: $(OUT)/$(base)_Instrument_VI.pdf
-VII1: $(OUT)/$(base)_Instrument_VII.pdf
-Va1: $(OUT)/$(base)_Instrument_Va.pdf
-Vc1: $(OUT)/$(base)_Instrument_Vc.pdf
+VI1: $(OUT)/$(base1)_Instrument_VI.pdf
+VII1: $(OUT)/$(base1)_Instrument_VII.pdf
+Va1: $(OUT)/$(base1)_Instrument_Va.pdf
+Vc1: $(OUT)/$(base1)_Instrument_Vc.pdf
 VI2: $(OUT)/$(base2)_Instrument_VI.pdf
 VII2: $(OUT)/$(base2)_Instrument_VII.pdf
 Va2: $(OUT)/$(base2)_Instrument_Va.pdf
@@ -49,11 +51,16 @@ VII3: $(OUT)/$(base3)_Instrument_VII.pdf
 Va3: $(OUT)/$(base3)_Instrument_Va.pdf
 Vc3: $(OUT)/$(base3)_Instrument_Vc.pdf
 
-VI: VI1 VI2 VI3
-VII:VII1 VII2 VII3
-Va: Va1 Va2 Va3
-Vc: Vc1 Vc2 Vc3
-Full: scores scores2 scores3
+VIall: VI1 VI2 VI3
+VIIall:VII1 VII2 VII3
+Vaall: Va1 Va2 Va3
+Vcall: Vc1 Vc2 Vc3
+Full: scores1 scores2 scores3
+
+VI: $(OUT)/$(base)_Instrument_VI.pdf
+VII: $(OUT)/$(base)_Instrument_VII.pdf
+Va: $(OUT)/$(base)_Instrument_Va.pdf
+Vc: $(OUT)/$(base)_Instrument_Vc.pdf
 
 
 clean:
@@ -64,8 +71,8 @@ lily: $(pdfs) $(pdfs2) $(pdfs3) $(additionalscores)
 $(OUT) :
 	mkdir -p $(OUT)
 
-# $(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
-# $(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
+# $(instruments): % : $(OUT)/$(base1)_Instrument_%.pdf $(SRCS)
+# $(scores): % : $(OUT)/$(base1)_Score_%.pdf $(SRCS)
 # $(instruments): % : $(OUT)/$(base2)_Instrument_%.pdf $(SRCS2)
 # $(scores): % : $(OUT)/$(base2)_Score_%.pdf $(SRCS2)
 # $(instruments): % : $(OUT)/$(base3)_Instrument_%.pdf $(SRCS3)
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Include_Todo.itex b/TeX_Eybler_Streichquartette_HV190-192_Include_Todo.itex
index 21a48eb0bcfe57c9bc523596a2dc3144a4bc08c5..77e2f53f9ccce01e4ba8b5f2121655ef9162993d 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Include_Todo.itex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Include_Todo.itex
@@ -1,8 +1,17 @@
-% \todos{
-% \chapter*{Offene Fragen}
-%
-% \begin{itemize}
-% \item
-%
-% \end{itemize}
-% }
+\todos{
+  
+\chapter*{Offene Aufgaben}
+\begin{itemize}
+\item Q2M1 V1 T40-45/125-131: Vorzeichen der Vorschläge
+\item Q2M3 V1/V2/Va/Vc T8/24/33: Taktzahlen bei break nicht an Taktstrich
+
+\end{itemize}
+
+
+\chapter*{Offene Fragen}
+
+\begin{itemize}
+\item
+
+\end{itemize}
+}