diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
index 63af9bc2107a0a4fdf4e2884cf2ab35816e212d5..aac48d00e6dc32289ad8864ea2c3342bf884e568 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VIInstrumentName
-  scorenumber = \markup{\scoreNumber \VINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VINumber
+%   scorenumber = \markup{\scoreNumber \VINumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"aIAdagio" #'("VI")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
index e0ee6e11af3873ecc8a04fff346707b35942bb9f..fe4eda917be9cdc27272b1c5028aac73475c55b1 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
@@ -3,8 +3,7 @@
 
 \header {
   instrument = \VIIInstrumentName
-  scorenumber = \markup{\scoreNumber \VIINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VIINumber
 }
 
 \createScore #"aIAdagio" #'("VII")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
index 5ee44678ae0d723a5c3d6a499eacdee8c5936a8a..5634d06dffb330d724feb848eb9de7b411325f45 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VaInstrumentName
-  scorenumber = \markup{\scoreNumber \VaNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VaNumber
+%   scorenumber = \markup{\scoreNumber \VaNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"aIAdagio" #'("Va")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
index da426fe5f1dddc9b0346975acc23cfaa0a58b700..0dc50213cd56c93c2f1850d38f740be2fff703d4 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VcInstrumentName
-  scorenumber = \markup{\scoreNumber \VcNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VcNumber
+%   scorenumber = \markup{\scoreNumber \VcNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"aIAdagio" #'("Vc")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
index fc3bc570043792502668ce7c490e3acc3c8b7953..c36ab1429fcdeec6c1f5d804ca66370ba0f990a9 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
@@ -5,7 +5,8 @@
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
+  instrumentnr = \FullScoreNumber
+%   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
 \createNoCuesScore #"aIAdagio" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
index 7d4be8210c997e348259c5f0854e8b184575855b..203a0d9839b6fae10f506bf8275bfb64bbd8aba8 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
@@ -1,7 +1,4 @@
 \version "2.15.30"
-% #(ly:set-option 'point-and-click #f)
-
-% \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_Global.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
index 734dcc2fd29895cfb841e75d24d89997b434602e..dfada8d4170687ca3a3df2c591d979f7897e6ccd 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily
@@ -1,8 +1,5 @@
 \version "2.15.30"
 
-% \include "orchestrallily/oly_settings_names.ily"
-
-
 \header {
   scorenumberbase="EK-1190"
   title = "Streichquartett D-Dur"
@@ -13,23 +10,5 @@
   shortcomposer = "J. Eybler"
   copyright = \markup \abs-fontsize #9 \column{
       \line { 2012, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
-%       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
 }
-
-%% Possibly adjust the \orchestralScoreStructure here...
-
-%% Add custom keys here, e.g.
-%% CorKey = \key g \major
-%% CorIKey = \CorKey
-%% CorIIKey = \CorKey
-% \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_Instrument_VI.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
index 0384a112d89710e1a26b3b7f195a41fe48db07b5..579a97b3a7152bf4264e4b3c2abc5300ca7faedd 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VIInstrumentName
-  scorenumber = \markup{\scoreNumber \VINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VINumber
+%   scorenumber = \markup{\scoreNumber \VINumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"bIAllegro" #'("VI")
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
index eff489dcbfcaeb9faeb670e4c5b9256d7740e599..6b6dfa72ef52b273410ce02de808b86d7b8065e0 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VIIInstrumentName
-  scorenumber = \markup{\scoreNumber \VIINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VIINumber
+%   scorenumber = \markup{\scoreNumber \VIINumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"bIAllegro" #'("VII")
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
index c4f1cf491d2f8467a734f634b9172b30328a218c..44ddcacc16bce7a4965997ffc1a96fb6a74e61f0 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VaInstrumentName
-  scorenumber = \markup{\scoreNumber \VaNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VaNumber
+%   scorenumber = \markup{\scoreNumber \VaNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"bIAllegro" #'("Va")
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
index e21d1a95f4a9561cbee1adb558688e223c6ae400..60f94106cdabd370dc309cd7dbe52e7c16aa440c 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VcInstrumentName
-  scorenumber = \markup{\scoreNumber \VcNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VcNumber
+%   scorenumber = \markup{\scoreNumber \VcNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"bIAllegro" #'("Vc")
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
index 86bf822cd327652a78c520fd223eadf71a14618a..1aa7dc315d7b9227ef89d4d7835012e63879a059 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
@@ -5,7 +5,8 @@
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
+%   scorenumber = \markup{\scoreNumber \FullScoreNumber}
+  instrumentnr = \FullScoreNumber
 }
 
 \createNoCuesScore #"bIAllegro" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
index f45ef1b7839aff50645bccb8065a905fadde5b7f..59c0d909a7f13f7abaf5819334f87d7887d0db57 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VIInstrumentName
-  scorenumber = \markup{\scoreNumber \VINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VINumber
+%   scorenumber = \markup{\scoreNumber \VINumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"cIAllegro" #'("VI")
@@ -12,3 +13,7 @@
 \createScore #"cIIIMenuetto" #'("VI")
 \createScore #"cIVFinale" #'("VI")
 
+\paper {
+  #(define page-breaking ly:optimal-breaking)
+%   page-count = #8
+}
\ No newline at end of file
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
index dde73e75b4d8c87570a1270e650747451e85072a..96c367a2c8c86a537d57b14ac13d2ceecc0c568c 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VIIInstrumentName
-  scorenumber = \markup{\scoreNumber \VIINumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VIINumber
+%   scorenumber = \markup{\scoreNumber \VIINumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"cIAllegro" #'("VII")
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
index c04a0ffde08160cbff0504fde6f2f174a483ed2a..de3610fa93f65347705d8ad91cf0921589ca3d2a 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VaInstrumentName
-  scorenumber = \markup{\scoreNumber \VaNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VaNumber
+%   scorenumber = \markup{\scoreNumber \VaNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"cIAllegro" #'("Va")
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
index c09d4dbaba422c3472166a1a631a82b36773245d..8a37c457d0519f3604940b69de0afe0bfebce4b5 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
@@ -3,8 +3,9 @@
 
 \header {
   instrument = \VcInstrumentName
-  scorenumber = \markup{\scoreNumber \VcNumber}
-  pdftitle = \markup{\shortcomposer: \title, \instrument}
+  instrumentnr = \VcNumber
+%   scorenumber = \markup{\scoreNumber \VcNumber}
+%   pdftitle = \markup{\shortcomposer: \title, \instrument}
 }
 
 \createScore #"cIAllegro" #'("Vc")
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
index f03c3e3b69226d63537ad08ac06e0a98f3590aa2..0927e727046a6cf1eb048728cc5a70a71df4c81f 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily
@@ -8,13 +8,21 @@ cIAllegroTimeSignature = \time 2/4
 
 cIAllegroSettings = \notemode {
   \tempo \cIAllegroTempo
-  \partial 8
 }
 
+cIAllegroExtraSettings = \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) . (4))        ;rule for 1/8 beams -- whole bar
+       ((1 . 16) . (4 4))     ;rule for 1/16 beams -- end each 1/4
+     )))
+  \partial 8
+}
 
-cIAllegroVIMusic = \relative c' {
-  r8 | % 1
-  R2*3 | % 4
+cIAllegroVIMusic = \relative c'' {
+  r8 \noBreak | % 1
+  R2*3 \noBreak | % 4
   r4 r8 g'8-|\p | % 5
   h,16( c d h c8) g'8-| | % 6
   a,16( b c a b8) d8( | % 7
@@ -41,10 +49,183 @@ cIAllegroVIMusic = \relative c' {
   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
+  b16. g32 g8\trill d'16. b32 b8\trill | % 31
+  g' 16. d32 d8\trill b'4 | % 32
+  b16( a) g-. a-. g( f) e-. f-. | % 33
+  e( d) c-. d-. c( b) a-. b-. | % 34
+  a( c) f,-. c' e,( c') es-. c-. | % 35
+  f( c) a-. c-. g( c) g'-. c,-. | % 36
+  a'( c,) f,-. c'-. e,( c') e-. c-. | % 37 % TODO: es oder e vorletzte Note?
+  f( c) a-. c-. g( c) g'-. c,-. | % 38
+  a'16. f32 f8\trill c'16. f,32 f8\trill | % 39
+  d'16 c b a g f e d | \barNumberCheck #40
+  e f g e c8 c | % 41
+  c4 r | % 42
+  r16 c'(\pp h c d c h c) | % 43
+  r16 c( h c d c h c) | % 44
+  r16 c( h c d c h c) | % 45
+  r16 c( h c d c h c) | % 46
+  r16 c( h c d c h c) | % 47
+  r16 c( h c d c h c) | % 48
+  r16 c( h c d c h c) | % 49
+  r16 c( h c d c h c) | \barNumberCheck #50
+  r b( a b a b c b) | % 51
+  a8 r r4 | % 52
+  r16 g( fis g fis g a g) | % 53
+  f8 r r4 | % 54
+  R2 | % 55
+  r8 d'16( c) c( b) b( a) | % 56
+  g8 r r4 | % 57
+  r8 des'16( c) c( b) b( as) | % 58
+  a(\cresc ges) ges( f) f( es) es( des) | % 59
+  des4\f \grace { des16[ es] } f8.\sf es32 des | \barNumberCheck #60
+  c8 b r es~\sf | % 61
+  es ges,4\sf \grace { as32[ ges f ges] } as8 | % 62
+  e( f) r as~\sf | % 63
+  as as'4\sf ges16 f | % 64
+  es( d f es ges f as g | % 65
+  b8)-| b,~ b16 ges' f es | % 66
+  des8 c r as\p | % 67
+  des16( es f ges) as8 as | % 68
+  as4~ as16( ges es c) | % 69
+  des( es f ges) as8 as | \barNumberCheck #70
+  as4~  as16 ges es c | % 71
+  des(\cresc es f ges as b) ces-. ces-. | % 72
+  ces4\sf b8 as | % 73
+  ges r r b,\p | % 74
+  es16( f ges as) b8-. b-. | % 75
+  b4~ b16( as f d) | % 76
+  es( f g as) b8-. b-. | % 77
+  b4~ b16(\cresc as g f) | % 78
+  e f g f e( c d e) | % 79
+  f8-. g-. as16( g) f-. es-. | \barNumberCheck #80
+  des16( es des c b8) des | % 81
+  es16. f32 f8\trill g8 es | % 82
+  c16 des c b as8 c | % 83
+  des-. es-. f16( es) des-. c-. | % 84
+  b16 c b as g8-. b-. | % 85
+  c g'~ g16( e c b) | % 86 % TODO: g8. in g8~g16 korrigiert
+  a8-.\p a-. b-. b-. | % 87
+  \slashedGrace as8 g16( fis g) as g8 r | % 88
+  R2*2 | \barNumberCheck #90
+  r4 r8 as'8-|\f | % 91
+  f16( e f g f8) b-| | % 92
+  as-| as-| \slashedGrace as8 g16( f g as) | % 93
+  f4 r | % 94
+  R2 | % 95
+  r8 c,8(\p f as) | % 96
+  R2 | % 97
+  r8 c,( f as) | % 98
+  R2 | % 99
+  a8 r a r | \barNumberCheck #100
+  a r f r | % 101
+  a r a r | % 102
+  c, r a r | % 103
+  a r a' r | % 104
+  a r a r | % 105
+  a r a r | % 106
+  a r a r | % 107
+  g r d r | % 108
+  d r <d g,> r | % 109
+  d r f r | \barNumberCheck #110
+  d r r g | % 111
+  c16. g32 g8\trill e'16. c32 c8\trill | % 112
+  g'16. e32 e8\trill b'4~ | % 113
+  b16( a) g-. a-. g( f) e-. f-. | % 114
+  e( d) c-. d-. c( b) a-. b-. | % 115
+  a8 r a r | % 116
+  a r a r | % 117
+  a r a r | % 118
+  a r a r | % 119
+  b r f r | \barNumberCheck #120
+  f r f r | % 121
+  f r f r | % 122
+  f r f r | % 123
+  f r f r | % 124
+  es r g r | % 125
+  f r <f a,> q | % 126
+  a4 r | % 127
+  r16 f'(\pp e f g f e f ) | % 128
+  r16 f( e f g f e f ) | % 129
+  r16 f( e f g f e f ) | \barNumberCheck #130
+  r16 f( e f g f e f ) | % 131
+  r16 f( e f g f e f ) | % 132
+  r16 f( e f g f e f ) | % 133
+  r16 f( e f g f e f ) | % 134
+  r16 f( e f g f e f ) | % 135
+  r es( d es d es f es) | % 136
+  d8 r r4 | % 137
+  r16 c16( h c h c d) c | % 138
+  b8 r r4 | % 139
+  R2 | \barNumberCheck #140
+  r8 g'16( f) f( es) es( d) | % 141
+  c8 r r4 | % 142
+  r8 ges'16( f) f( es) es( des) | % 143
+  des(\cresc ces) ces( b) b( as) as( ges) | % 144
+  ges4\f \grace {ges'16[ as] } b8.\sf as32 ges | % 145
+  f8 es r as~\sf | % 146
+  as ces,,4\sf \grace { des32[ ces b ces] } des8 | % 147
+  a8( b) r des~\sf | % 148
+  des des'4\sf ces16 b | % 149
+  as g b as ces b des ces | \barNumberCheck #150
+  es8-| es,~-| es16( ces' b as) | % 151
+  ges8( f) r des | % 152
+  ges16( s b ces) des8-| des-| | % 153
+  des4~ des16 ces as f | % 154
+  ges as b ces des8-| des-| | % 155
+  des4~ des16 ces as f | % 156
+  ges( as b ces des\cresc es) fes-| fes-| | % 157
+  fes4(\sf es8) des | % 158
+  ces r r es,\p | % 159
+  as16( b ces des) es8-| es-| | \barNumberCheck #160
+  es4~  es16 des b g | % 161
+  as b c des es8 es | % 162
+  es4~  es16 des c b | % 163
+  a b c b a f g a | % 164
+  b8-| c-| des16 c b as | % 165
+  ges as ges f es8 ges | % 166
+  as b c16. as32 as8\trill | % 167
+  f16 ges f es des8 f | % 168
+  ges8 as b16 as ges f | % 169
+  es16 f es des c8 es | \barNumberCheck #170
+  f8 c'8~\f c16 a f es | % 171 % TODO: "f8 c'8. a16 f es" changed to f8 c'8~ c16 a16 f es
+  d8-|\p d-| es-| es-| | % 172
+  \slashedGrace d8 c16 h c d c8 r | % 173
+  R2*2 | % 175
+  r4 r8 d''8\f | % 176
+  b16 a b c b8 es | % 177
+  d8 d \slashedGrace d8 c16 b c d | % 178
+  b4.\fermata r8 | % 179
+  R2 | \barNumberCheck #180
+  r8 g,8(\p b des) | % 181
+  R2 | % 182
+  r8 ges,( b es) | % 183
+  R2 | % 184
+  r8 as,( ces es) | % 185
+  R2 | % 186
+  r4 r8 as,8-| | % 187
+  as' ( f) des-| ces-| | % 188
+  b( des) r ges,-| | % 189
+  g' ( es) c-| b-| | \barNumberCheck #190
+  a8( c) r f,-| | % 191
+  b(\cresc h es e) | % 192
+  f( fis g a) | % 193
+  b\f-| g-| f-| a,-| | % 194
+  b4 r8 h8-|\p | % 195
+  d( d es) a,-| | % 196
+  b16( a b c d8) f-|\f | % 197
+  g-| g-| a,16( b c a) | % 198
+  b4 r8 d,-|\pp | % 199
+  es( f g) c,-| | \barNumberCheck #200
+  d16 c d es f8 <b b'>\ff | % 201
+  <b g'>8 q a16( b c a) | % 202
+  b8\p r r d( | % 203
+  es) r r a,( | % 204
+  b) r r d, | % 205
+  es r r a,( | % 206
+  b8)\pp r d r | % 207
+  b4 r8 \barNumberCheck #207
+  \bar"|."
 }
 \addQuote "cIAllegroVIMusic" { \cIAllegroVIMusic }
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
index 73c932b1114514de8ca1ea1cf8e8192d0d5796a5..dc93dec0ac90102790a6202badea9969f4b43257 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily
@@ -3,17 +3,146 @@
 cIIAdagioPieceName = "2. Adagio"
 cIIAdagioTempo = "Adagio"
 
-cIIAdagioKey = \key c \major
-cIIAdagioTimeSignature = \time 4/4
+cIIAdagioKey = \key b \major
+cIIAdagioTimeSignature = \time 2/2
 
 cIIAdagioSettings = \notemode {
   \tempo \cIIAdagioTempo
 }
+cIIAdagioExtraSettings = \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) . (4 4))        ;rule for 1/8 beams -- whole bar
+       ((1 . 12) . (3 3 3 3))        ;rule for 1/8 triplet beams -- each 1/4
+       ((1 . 16) . (4 4 4 4))     ;rule for 1/16 beams -- end each 1/4
+     )))
+%   \partial 8
+}
+
+cIIAdagioSettingsII = \notemode {
+  \bar"||"
+  \key g \major
+  \barNumberCheck #78
+}
 
 
 cIIAdagioVIMusic = \relative c' {
-  s8
-  % TODO
+  d2 es4.\sf cis8 | % 2
+  d8 d' d2\sf c8\p r | % 3
+  b r a r g r a r | % 4
+  b4. \grace { c32[ b a b] } c8-| a4 r | % 5
+  es'4.(\sfp a,8) a4 r | % 6
+  d4. \grace { es32[\cresc d cis d] } d'8 d4. \times 2/3 { c16 b a } | % 7
+  b8 \times 2/3 { a16 g fis } g8 es-|\f d-. c-. b-. a-. | % 8
+  g4 r r d'8.[ \grace { es32[ d cis d] } b'16] | % 9
+  b2( cis,4) r | \barNumberCheck #10
+  r2 r4 d8.[ \grace { es32[ d cis d] } as'16] | % 11
+  as2( h,4) r | % 12
+  r2 r4 c8.[ \grace { d32[ c h c] } g'16] | % 13
+  g4. \grace { as 32[ g fis g] } as8 b4 cis,,4\f | % 14
+  d2 c4 b\trill | % 15
+  a r a\p a | % 16
+  a r r2 | % 17
+  b'1 | % 18
+  es4.. c16 a4 r | % 19
+  f'2 g8[( a b) r16 g16] | \barNumberCheck #20
+  f4. es8 d4 r | % 21
+  r r16 c,16( d es f g a b) c( d es c) | % 22
+  r a,( b c d f g a) b8 r r4 | % 23
+  R1 | % 24
+  r2 r16 g( a b c d es e) | % 25
+  f( e f d) b4 r2 | % 26
+  ges8( f) f-. f-. b( a) a-. a-. | % 27
+  r4 b8( as g es f d) | % 28
+  c( es a, c) b4 r | % 29
+  a8( d a d) a( d a d) | \barNumberCheck #30
+  b( d b d) b16( b' c d e fis g a) | % 31
+  b4.. g16 e4 r | % 32
+  c'4.. a16 f8 r r4 | % 33
+  r r16 gis,,( a gis a cis d cis) d8 d | % 34
+  c4 r r2 | % 35
+  \slashedGrace a'8 a'2~ a16( g a b c d b g) | % 36
+  \slashedGrace f8 << {e4.} { s4 s8\mordent} >> f16 g f8 r g16( f es d) | % 37
+  c8[ \grace { d32[ c h c] } b'16( a] g f e d) c4~ c32( h c cis e d c b) | % 38
+  \grace gis8 a2 r | % 39
+  b,8-| r \slashedGrace d'8 d'4.(\sf c16 b a g a b) | \barNumberCheck #40
+  c4~ \times 4/6 { c16(-. d-. c-. b-. a-. g-.) } f8 r c16( f a c) | % 41
+  c16.[( b32 d16)-| r32 b-|] b16.[( a32 c16)-| r32 a-|] a16( g fis g) b( as g f) | % 42
+  f( e d\trill c) c8-| c-| \grace { h32[ c d]} c4 r | % 43
+  << {<c e, g,>4\sfz s } {<b'~>2} >> \times 2/3 { b8\p g-. e-.} \times 2/3 { c-. g-. es-. } | % 44
+  \times 2/3 { des8( c) c-.} \times 2/3 {c( b) b-.} \times 2/3 {b( as) as-.} \times 2/3 {as( g) g-. } | % 45
+  << {<c' e, g,>4\sfz } {<b'~>2} >> \scaleDurations #'(2 . 3) { b8\p g-. e-.  c-. g-. es-.  | % 46
+  des8( c) c-. c( b) b-. b( as) as-. as( g) g-. } | % 47
+  << {<d'' b g,>4\sfz } {<d'~>2} >> \scaleDurations #'(2 . 3) { d8(\p c) b-| b( a) g-| } | % 48 % TODO: <d'' a g> oder <d'' b g>???
+  c4( a8)-| r \times 2/3 { r8 g fis } \times 2/3 { g( b d) } | % 49
+  \acciaccatura d8 f,4~ \scaleDurations #'(2 . 3) { f8 a c } c4~ \scaleDurations #'(2 . 3) { c8 b g | \barNumberCheck #50
+    f\p c,(-. c-. c-. c-. c-. c-. c-. c-. c-. c-. c-.) | % 51
+    c( f) c-. c(-. c-. c-. c-. c-. c-. c-. c-. c-.) | % 52
+    c( f) c-.( c-. c-. c-.) cis-.\cresc( g') cis,-.( cis-. cis-. cis-.) } | % 53
+  d2 es4.\sf cis8 | % 54
+  d8( d') d2\sf c8 r | % 55
+  b r a r g r a r | % 56
+  b4. \grace { c32[ b a b] } c8 a4 r | % 57
+  es'4.\sf a,8 a4 r4 | % 58
+  d4. \grace { es32[ d cis d] } d'8 d4.\sf \times 2/3 { c16 b a } | % 59
+  b8( \times 2/3 { a16 g fis } g8) es-|\f d-| c-| b-| a-| | \barNumberCheck #60
+  g4 r r2 | % 61
+  r2 r4 b'8._[ \grace { c32[ b a b] } cis,16] | % 62
+  cis2( d4) r | % 63
+  r2 r4 as'8.[ \grace { b32[ a g a] } h,16] | % 64
+  h2( c4) r | % 65
+  r es,8._[ \grace { f32[ es d es] } c'16] c4.. b32 as | % 66
+  g8-| r b-| r r4 b8.[ \grace { c32[ b a b] } des16] | % 67
+  des4( es,) r es8._[ \grace { f32[ es d es] } f32 g] | % 68
+  as8 r as'8.[ \grace { b32[ as g as] } c16] c4( es,) | % 69 % TODO: letzte Bogen undeutlich ab 16tel (vgl Takt 72
+  r g8.[ \grace { as32[ g fis g] } des'16] des4.. c32 b | \barNumberCheck #70
+  as8 r c r r4 f,8._[ \grace { g32[ f e f] } as16] | % 71
+  as4 h, r d8._[ \grace { es32[ d c d] } es32 f] | % 72
+  g8 r c8._[ \grace { d32[ c h c] } c16] c4( fis,) | % 73
+  r4 c8._[ \grace { d32[ c h c] } a'16] a4.. fis32 c | % 74
+  b8 r d r r4 g8._[ \grace { a32[ g fis g] } b16] | % 75
+  b4( cis,) r g8._[ \grace { a32[ g fis g] } cis,16] | % 76
+  d4 r <d a>\p q | % 77
+  q2 r 
+  \cIIAdagioSettingsII
+
+  g1 | % 79
+  c4.. a16 fis4 r | \barNumberCheck #80
+  \slashedGrace g8 d'2 e8._[ \grace { fis32[ e dis e] } fis16 g8 r16 e16] | % 81
+  d4. c8 h4 r | % 82
+  r r16 fis( g a h cis dis e fis g a fis) | % 83
+  r e,( fis g a h cis dis e4) r | % 84
+  d,8( g d g) d( g d g) | % 85
+  e( g c, e) g16-| c( d e f g a h) | % 86
+  c4.. a16 fis4 r | % 87
+  \slashedGrace d8 d'4.. h16 g4 r | % 88
+  r r16 ais,,( h ais h dis e dis) e8 e | % 89
+  d4 r r2 | \barNumberCheck #90
+  r8^\pizz h8 d g r e c a' | % 91
+  r fis a fis r h, e fis | % 92
+  r g d h r g' fis a | % 93
+  r h, d g h g d b | % 94
+  r d g c r e, c' a | % 95
+  r d, g h r d, h' g | % 96
+  fis r g r e r e r | % 97
+  d4 r r2 | % 98
+  << { <d a'>4\sfz } {<c''~>2^\colarco} >> \times 2/3 { c8-.\p a-. fis-. } \times 2/3 { d-. a-. fis-. } | % 99
+  \scaleDurations #'(2 . 3) { es( d) d-. d( c) c-. c( b) b-. b( a) a-. } | \barNumberCheck #100
+  << { <d a'>4\sfz } {<c''~>2} >> \scaleDurations #'(2 . 3) { c8-.\p a-. fis-.  d-. a-. fis-. } | % 101
+  \scaleDurations #'(2 . 3) { es( d) d-. d( c) c-. c( b) b-. b( a) a-. } | \barNumberCheck #102
+  << { a'4\sfz } {<e''~>2} >> \scaleDurations #'(2 . 3) { e8(\p d) c-.  c( h) a-. } | % 103
+  d4( b8)-| r \times 2/3 { a8(\dolce e' d) } \slashedGrace d8 \times 2/3 { c8( h a) } | % 104
+  g4 \times 2/3 { r8 h g } d4 \afterGrace c\trill { h16[ c] } | % 105
+  \grace ais4 h2\p \slashedGrace a8 g'4\cresc \slashedGrace a8 \times 2/3 { g8-. fis-. e-. } | % 106
+  a8. f16 d8 r \slashedGrace a8 c'4\f \grace d8 \times 2/3 { c-. h-. a-. } | % 107
+  \times 2/3 { d-| h-| g-| } \times 2/3 { d-| h-| g-| } \afterGrace { d4-.\sf } { e32[ d dis] } \times 2/3 { d8-.( e-. f)-. } | % 108
+  \scaleDurations #'(2 . 3) { g\p d-.( d-. d-. d-. d-.) d-.( d-. d-. d-. d-. d-.) | % 19
+    d( g) d-.( d-. d-. d-.) d(-. d-. d-. d-. d-. d-.) } | \barNumberCheck #110
+  d4 r g( f) | % 111
+  e es\sfp~ \times 2/3 { es8 d( cis } \times 2/3 { d es c) } | % 112
+  h4\pp r h r |
+  h2 r2 \bar"|."
 }
 \addQuote "cIIAdagioVIMusic" { \cIIAdagioVIMusic }
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
index 3678a05548a0a1022f6d724e78ed5ad5a83ce1f1..274b7af86f29e52e0837c6242b401f96941401dd 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily
@@ -1,19 +1,30 @@
 \version "2.15.30"
 
 cIIIMenuettoPieceName = "3. Menuetto - Trio"
-cIIIMenuettoTempo = "TODO"
+% cIIIMenuettoTempo = "TODO"
 
-cIIIMenuettoKey = \key c \major
-cIIIMenuettoTimeSignature = \time 4/4
+cIIIMenuettoKey = \key b \major
+cIIIMenuettoTimeSignature = \time 3/4
 
 cIIIMenuettoSettings = \notemode {
-  \tempo \cIIIMenuettoTempo
+%   \tempo \cIIIMenuettoTempo
+  \partial 4
+%   \grace s8 s1*0
 }
 cIIIMenuettoTrioSettings = \notemode {
   \break
-  \key c \major
+  \key b \major
   \tempo "Trio"
-%   \partial 4
+}
+cIIIMenuettoExtraSettings = \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) . (4 4))        ;rule for 1/8 beams -- whole bar
+%        ((1 . 12) . (3 3 3 3))        ;rule for 1/8 triplet beams -- each 1/4
+%        ((1 . 16) . (4 4 4 4))     ;rule for 1/16 beams -- end each 1/4
+%      )))
+%   \partial 8
 }
 
 cIIIMenuettoEndSettings = \notemode {
@@ -23,18 +34,64 @@ cIIIMenuettoEndSettings = \notemode {
 
 cIIIMenuettoVIMusic = \relative c' {
 \repeat volta 2 {
-  % TODO
+  \slashedGrace f8 b\p r | % 1
+  b2-. \slashedGrace g8 c r | % 2
+  c2-. \slashedGrace c8 es8 r | % 3
+  \grace { d32[ es f] } es4.\trill d16 es f8 es | % 4
+  d4 r \slashedGrace d8 g r | % 5
+  g4(\sf c8)-| r \slashedGrace c,8 b'8 r | % 6
+  b4(\sf a8)-| r a16(\p g) r8 | % 7
+  g16( f) r8 f16( e) r8 e16( c) r8 | % 8
+  f4 r
 } \repeat volta 2 {
-  s8
-  % TODO
+    r4 | % 9
+    a2\mf b4 | \barNumberCheck #10
+    f4 r a~ | % 11
+    a b f | % 12
+    r a2 | % 13
+    b4 f2~-. | % 14
+    f4\decresc f2~-. | % 15
+    f4 f2-.~\p | % 16
+    f4 r \slashedGrace f,8 b8\mf r | % 17
+    b2-. \slashedGrace b8 c8 r | % 18
+    c2-. \slashedGrace c8 es8 r | % 19
+    \grace { d32[ es f] } es4.\trill d16 es f8 es | \barNumberCheck #20
+    d4 r \slashedGrace g,8 g'8\f r | % 21
+    g4(\sfz es'8)-| r \slashedGrace es,,8 es'8 r | % 22
+    es4(\sfz d8)-| r d16(\p c) r8 | % 23
+    c16( b) r8 b16( a) r8 a16( f) r8 | % 24
+    b4 r
 } \cIIIMenuettoTrioSettings
 
 %%% TRIO %%%
 \repeat volta 2 {
-  % TODO
+  f'8( es16) r | % 25
+  es8( c16) r c8( a16) r g'8( f16) r | % 26
+  f8( d16) r d8( b16) r b8( c16) r | % 27
+  c8( d16) r d8( f16) r f8( es16) r | % 28
+  <c f,>2 f8( es16) r | % 29
+  es8( c16) r c8( a16) r g'8( f16) r | \barNumberCheck #30
+  f8( d16) r d8( b16) r b'8( a16) r | % 31
+  a8( g16) r \slashedGrace a8 g8( f g e) | % 32
+  f4 r 
 } \repeat volta 2 {
-  s8
-  % TODO
+  c,8( f16) r | % 33
+  f8( a16) r a8( c16) r c8( f16) r | % 34
+  f8( a16) r a8( c16) r d,,8( f16) r | % 35
+  f8( b16) r b8( d16) r d8( f16) r | % 36
+  f8( b16) r b8( d16) r f,8( f'16) r | % 37
+  f8( f,16) r f8( f'16) r f8( f,16) r | % 38
+  f8( f'16) r f8( f,16) r f8( f'16) r | % 39
+  f8( f,16) r f8( f'16) r f8( f,16) r | \barNumberCheck #40
+  r4 r\fermata f8( es16) r | % 41
+  es8( c16) r c8( a16) r g'8( f16) r | % 42
+  f8( d16) r d8( b16) r b8( c16) r | % 43
+  c8( d16) r d8( f16) r f8( es16) r | % 44
+  <c f,>2 b8(\mf d16) r | % 45
+  a8( c16) r c8( es16) r es8( g16) r | % 46
+  d8( f16) r f8( b16) r b8( g16) r | % 47
+  g8( es16) r es8( c16) r c8( a16) r | % 48
+  b4 r \barNumberCheck #48
 }\cIIIMenuettoEndSettings
 }
 \addQuote "cIIIMenuettoVIMusic" { \cIIIMenuettoVIMusic }
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
index 86f67757da28b9b3898ef5eec3d535bf56d381df..6a09f4011d5d15ef6f83175536231e9e9741cff8 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily
@@ -3,18 +3,240 @@
 cIVFinalePieceName = "4. Finale - Vivace"
 cIVFinaleTempo = "Vivace"
 
-cIVFinaleKey = \key c \major
-cIVFinaleTimeSignature = \time 4/4
+cIVFinaleKey = \key b \major
+cIVFinaleTimeSignature = \time 6/8
 
 cIVFinaleSettings = \notemode {
   \tempo \cIVFinaleTempo
 }
+cIVFinaleExtraSettings = \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) . (4 4))        ;rule for 1/8 beams -- whole bar
+%        ((1 . 12) . (3 3 3 3))        ;rule for 1/8 triplet beams -- each 1/4
+%        ((1 . 16) . (4 4 4 4))     ;rule for 1/16 beams -- end each 1/4
+%      )))
+  \partial 8
+}
 
 
-cIVFinaleVIMusic = \relative c' {
-  s8
-  % TODO
-}
+cIVFinaleVIMusic = \relative c'' {
+\repeat volta 2 {
+  b8\p | % 1
+  \grace{ b32[ ces des] } ces8( b) b-. \grace { b32[ ces des] } ces8( b) b-. | % 2
+  b( es) es-. es4 ges8 | % 3
+  \grace { f32[ ges as] } ges8( f) f-. \grace { f32[ ges as] } ges8( f) f-. | % 4
+  \slashedGrace f8 d'8( b) b-| b4 r8 | % 5
+  R2. | % 6
+  r4. r4 f8\f | % 7
+  e16( f g f) b8-. es,16( f g f) c'8-. | % 8
+  e,16( f g f) d'8-. r4. | % 9
+  fis,16(\p g as g) es'8\fermata r4\fermata g,16(\trill a) | \barNumberCheck #10
+  b a b fis g fis g d es d es h | % 11
+  c h c d es e f fis g as a b | % 12
+  f,4. \grace { a'16[ c] } es4\sf d32 c b a | % 13
+  b8 r r r4. | % 14
+  R2.*5 | % 19
+  \slashedGrace f8 f'4. e16 f es d c b | \barNumberCheck #20
+  a b c d es f c b a g f es | % 21
+  d f g a b c d c b a g f | % 22
+  e g a b c d e d c b a g | % 23
+  f a b c d e f e d c b a | % 24
+  g h c d e f e g e d c b | % 25
+  a c f, c'a c f c a c d c | % 26
+  b g e g e g e c e g d g | % 27
+  a c f, c' a c f c a c d c | % 28
+  b g e g e g e c e g b g | % 29
+  a c h c b c a c h c b c | \barNumberCheck #30
+  a c f es d c b a g f es d | % 31
+  c4. g'4.\trill | % 32
+  f8 r r r4. | % 33
+  f,8\p r r g r r | % 34
+  f r r r4. | % 35
+  c4. d | % 36
+  e8 r r r4. | % 37
+  d8 r r d r r | % 38
+  b4 c8 c r r | % 39
+  a4. b | \barNumberCheck #40
+  a8 r8 r r4. | % 41 % TODO: One eighth too much (a4 statt a8 gedruckt)
+  R2. | % 42
+  r4 a''8\dolce \grace { a16[ b] } c8. b16 a8 | % 43
+  \slashedGrace a8 g8. f16 g8 c,8. d16 e8 | % 44
+  f r r r4 f16.(\trill g32 | % 45
+  a8) r a16.(\trill\cresc b32 c8) r c16.(\trill\f d32 | % 46
+  es4) r8 r4\fermata % TODO: One eighth missing!!!!
+} \repeat volta 2 {
+  r8 | % 47
+  R2. | % 48
+  r4. r4 g,8\f | % 49
+  \grace { g32[ as b] } as8( g) g-. \grace { g32[ as b] } as8( g) g-. | \barNumberCheck #50
+  g( g') g-. g16 es c g es c | % 51
+  g c b c g c b c g c b c | % 52
+  as8 r r r4 f'8 | % 53
+  \grace { f32[ ges as] } ges8( f) f-. \grace { f32[ ges as] } ges8( f) f-. | % 54
+  f( f') f-. f16 des b g des b | % 55
+  f b a b f b as b f b as b | % 56
+  ges8 r r ges4\p r8 | % 57
+  a4 r8 a4 r8 | % 58
+  b4 r8 \slashedGrace f8 d'8( b) b-| | % 59
+  b4 r8 r4 as'8\f | \barNumberCheck #60
+  b8 as16 g as f g8 f16 e f d | % 61
+  b as g as b,8 b r r | % 62
+  r r g''8-| as16 g fis g es8-| | % 63
+  f16 es d es c8-| d16 c h c g8-| | % 64
+  g r es' g16 f e f d8-| | % 65
+  es16 d cis d h8-| c16 h a h g8-| | % 66
+  g8 r g'(\p as16 g fis g) es8-| | % 67
+  f16( es d es) c8-| d16( c h c) g8-| | % 68
+  g8 r es' g16( f e f) d8-| | % 69
+  es16( d cis d) h8-| c16( h a h) g8-| | \barNumberCheck #70
+  g r h c16( h a h) d8-| | % 71
+  d\cresc r c es16 d cis d f8 | % 72
+  f r f g16 f e f h8\f | % 73
+  c16 h ais h d8 es16 d cis d f8 | % 74
+  f8.-|\sfz es16-| d-| c-| h-| as-| g-| f-| es-| d-| | % 75
+  es4 r8 r4. | % 76
+  R2.*3 | % 79
+  c'4.\p d16 c b a g f | \barNumberCheck #80
+  e f g a b a g f es d c h | % 81
+  a8 r r r4. | % 82
+  h16 d e f g a b a g f es d | % 83
+  c8 r r r4. | % 84
+  d16 f b, f' d f b f d f g f | % 85
+  es c a c a c a f a c es c | % 86
+  d8 r d,\trill b r b\trill | % 87
+  a r a\trill c r a\trill | % 88
+  b r a( b) r a( | % 89
+  b) r r <d h>4.\sfz | \barNumberCheck #90
+  <es c>8 r g( es) r c'( | % 91
+  h) r h( d) r d,( | % 92
+  c) r g'( es) r c'( | % 93
+  h) r h( d) r d,( | % 94
+  c) r d( es) r d( | % 95
+  es) r e( f) r r | % 96
+  r es es r f f | % 97
+  es r c'16.\trill d32 es8 r c16.\p\trill d32 | % 98
+  es4\dolce es8 es8.\trill f16 es8 | % 99
+  es4( c8) as8.\trill b16 c8 | \barNumberCheck #100
+  b8. c16 b8 \slashedGrace b8 as8. g16 f8 | % 101
+  es8.( f16 g as b as g as b c) | % 102
+  des8 r des des8.\trill c16 des8 | % 103
+  \grace { des16[ es] } f8.\cresc es16 des8 c4( es8) | % 104
+  as,8.\pp b16 c8 \slashedGrace c8 b8. as16 b8 | % 105
+  as8 r c \grace { c16[ des] } es8. des16 c8 | % 106
+  b8. c16 des8 es,8. f16 g8 | % 107
+  as8 r c \grace { c16[ des] } es8. des16 c8 | % 108
+  b8. c16 des8 es,8. f16 g8 | % 109
+  as2.\cresc( | \barNumberCheck #110
+  a8)( c es) ges( f a,) | % 111
+  b r des \grace { des16[ es] } f8.\p es16 des8 | % 112
+  c8. des16 es8 f,8.\trill g16 a8 | % 113
+  b4( des8) \grace { des16[ es] } f8. es16 des8 | % 114
+  c8. des16 es8 f,8.\trill g16 a8 | % 115
+  b2.(\cresc | % 116
+  h8)( d f as g d)-| | % 117
+  es(\f g) h, c( es) fis,-. | % 118
+  g( c) d,-. es( g) c,-. | % 119
+  des4.\sfz d\sfz | \barNumberCheck #120
+  es\sfz e\sfz | % 121
+  f\sfz fis\sfz | % 122
+  g8 r r r4 es'16\f\trill f | % 123
+  g fis g d es d es h c h c fis, | % 124
+  g fis g d es h c es g c es g | % 125
+  as g as e f e f cis d cis d c | % 126
+  h d, f e f as h d f as g f | % 127
+  b a b fis g fis g dis e dis e a, | % 128
+  b a b fis g f e g c e g b | % 129
+  a gis a cis, e dis e his cis his cis gis | \barNumberCheck #130
+  a gis a e fis d cis e  a c es g | % 131
+  fis eis fis cis d cis d fis, a gis a eis | % 132
+  fis eis fis cis d gis, a d fis a d fis | % 133
+  g fis g h, d cis d ais h ais h fis | % 134
+  g fis g g, h ais h d g h d g | % 135
+  e dis e h c h c e, g fis g dis | % 136
+  e dis e h c h c e g c e g | % 137
+  f e f a, c h c gis a gis a e | % 138
+  f e f a, c b a c f a c f | % 139
+  d cis d a b a b d, f e f cis | \barNumberCheck #140
+  d cis d a b a b d f b d f | % 141
+  es d es a, b a b fis g fis g e | % 142
+  f' e f cis d cis d a b a b f | % 143
+  g' fis g d es d es a, b a b g | % 144
+  a' gis a e f e f a, c h c a | % 145
+  b' a b f d b c' h c a f c | % 146
+  d' cis d b f d e g b d c b | % 147
+  a8 r f,16.(\trill g32 a8-|) r a16.(\trill b32 | % 148
+  c8-|) r a16.(\trill b32 c8)-| r c16.(\trill d32 | % 149
+  es8)-| r c16.(\trill d32 es8)-| r es16.(\trill f32 | \barNumberCheck #150
+  ges4.~\sfp) ges8( es c) | % 151
+  b4.( a8) r r | % 152
+  \slashedGrace a8 c'4.~\sfp c8( es, c) | % 153
+  b4.( a8) r r | % 154
+  \slashedGrace es'8 es'4.~\sfp es8( c a) | \barNumberCheck #155
+  \grace { f32[ ges as] } ges8( f) f-. \grace { es32[ f ges] } f8( es) es-. | % 156
+  \grace { des32[ es f] } es8( des) des-. \grace { ces32[ des es] } des8( ces) ces-. | % 157
+  \grace { b32[ ces des] } ces8( b) b-. r b-. b-. | % 158
+  \grace { b32[ ces des] } ces8( b) b-. r b-. b-. | % 159
+  \grace { b32[ ces des] } ces8( b) b-. \grace { b32[ ces des] } ces8( b) b-. | \barNumberCheck #160
+  b( es) es-. es r ges | % 161
+  \grace { f32[ ges as] } ges8( f) f-. \grace { f32[ ges as] } ges8( f) f-. | % 162
+  \slashedGrace f8 d'8( b) b-. b4 r8 | % 163
+  R2. | % 164
+  r4. r4 f8\f | % 165
+  e16( f g f) b8-| e,16( f g f) c'8-| | % 166
+  e,16( f g f) d'8-| r4. | % 167
+  fis,16(\p g as g) es'8\fermata r4\fermata g,16\trill\f a | % 168
+  b a b fis g fis g d es d es h | \barNumberCheck #169
+  c h c d es e f fis g as a b | \barNumberCheck #170
+  f,4. \grace { a'16[ c] } es4\sf d32 c b a | % 171
+  b8 r r r4. | % 172
+  R2.*3 |  % 175
+  \slashedGrace f8 f'4.\p e16 f es d c b | % 176
+  a b c d es d c b a g f es | % 177
+  d8 r r r d, d | % 178
+  es4 c8 \slashedGrace d8 c b c | % 179
+  d r b\trill f'-| d-| b-| | \barNumberCheck #180
+  r r c\trill g'-| es-| c-| | % 181
+  r r d\trill a' f d | % 182
+  r r es b' g es | % 183
+  r r f\trill a, r c | % 184
+  b r r r4. | % 185
+  R2.| % 186
+  r8 \grace { g''32[ f e] } f8\p d r \grace { b'32[ a g] } b8 f | % 187
+  r \grace { f32[ es d] } es8 c r \grace { b32[ a g] } a8 es | % 188
+  r r d( d) r c( | % 189
+  d) r r r4. | \barNumberCheck #190
+  r8 d d r es es | % 191
+  d r r r4. | % 192
+  <d b>8\p r r <d c> r r | % 193
+  <d b> r r r4. | % 194
+  f4.\pp g | % 195
+  a8 r r r4. | % 196
+  <es c>8 r r q r r | % 197
+  <es c~>4 c8 b r r | % 198
+  d4. es4. | % 199
+  d8 r r r4. | \barNumberCheck #200
+  R2. | % 201
+  r8 r d''8-|\dolce \grace { d16[ es] } f8. es16 es8 | % 202
+  \slashedGrace es8 c8. b16 c8 f,8. g16 a8 | % 203
+  b r r r4. | % 204
+  r8 r b16.\trill c32 d8-| r d16.\trill\cresc es32 | % 205
+  f8-| r f16.(\trill g32 as16)-| f-| d-| b-| as-| f-| | % 206
+  d4 r8 r4\fermata as'8\p | % 207
+  \grace { g32[ as b] } as8( g) g-| g( es') ges,-| | % 208
+  \grace { f32[ ges as] } ges8( f) f-| f( d')-| r | % 209
+  r r f,-|\f \grace { g32[ f e] } f8-| b-| d-| | \barNumberCheck #210
+  f-| r a,,-|\p b-| r r | % 211
+  as4.(\p ges) | % 212
+  c,( d8) r b' | % 213
+  \grace { b32[ ces des] } ces8( b) b-. b( es)-| ges~ | % 214
+  ges( f a,) b( b') ges~ | % 215
+  ges( f a,) b( b') ges~ | % 216
+  ges f a, b r \grace { c32[ b a] } b8( | % 217
+  d)-|\cresc r \grace { es32[ d cis] } d8( f)-| r \grace { g32[ f e] } f8( | % 218
+  b)-|\f d-| f-| g4 \barNumberCheck #218
+}}
 \addQuote "cIVFinaleVIMusic" { \cIVFinaleVIMusic }
 
 
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
index 11d647af8cf091c275f6538139a52d2ee8d2c437..6bad8dc40a0229b5270b701440a95373cccf45c2 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
@@ -5,7 +5,8 @@
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
+  instrumentnr = \FullScoreNumber
+%   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
 \createNoCuesScore #"cIAllegro" #'("FullScore")
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_VI.ly b/Eybler_Streichquartette_HV190-192_Instrument_VI.ly
index 51d1343c038050bd19668cfac7214fb7a6af77ca..08a7d0999e14d23da5214a67d83151c241ccb261 100644
--- a/Eybler_Streichquartette_HV190-192_Instrument_VI.ly
+++ b/Eybler_Streichquartette_HV190-192_Instrument_VI.ly
@@ -1,6 +1,5 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
-\include "orchestrallily/oly_settings_names.ily"
 
 \include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 
@@ -21,15 +20,16 @@
 
 \header {
   instrument = \VIInstrumentName
+  instrumentnr = \VINumber
 }
 
 
 \bookpart {
   \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"aIAdagio" #'("VI")
   \createScore #"aIIMenuetto" #'("VI")
   \createScore #"aIIIAdagio" #'("VI")
@@ -38,10 +38,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"bIAllegro" #'("VI")
   \createScore #"bIIAdagioNonMolto" #'("VI")
   \createScore #"bIIIMenuetto" #'("VI")
@@ -50,10 +50,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"cIAllegro" #'("VI")
   \createScore #"cIIAdagio" #'("VI")
   \createScore #"cIIIMenuetto" #'("VI")
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_VII.ly b/Eybler_Streichquartette_HV190-192_Instrument_VII.ly
index c697356da81b903508599a8277881c5d8ccaf225..01108b3107efaa1839331fcf6726afe5a8edf65c 100644
--- a/Eybler_Streichquartette_HV190-192_Instrument_VII.ly
+++ b/Eybler_Streichquartette_HV190-192_Instrument_VII.ly
@@ -1,6 +1,5 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
-\include "orchestrallily/oly_settings_names.ily"
 
 \include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 
@@ -21,15 +20,16 @@
 
 \header {
   instrument = \VIIInstrumentName
+  instrumentnr = \VIINumber
 }
 
 
 \bookpart {
   \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VIINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VIINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"aIAdagio" #'("VII")
   \createScore #"aIIMenuetto" #'("VII")
   \createScore #"aIIIAdagio" #'("VII")
@@ -38,10 +38,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VIINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VIINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"bIAllegro" #'("VII")
   \createScore #"bIIAdagioNonMolto" #'("VII")
   \createScore #"bIIIMenuetto" #'("VII")
@@ -50,10 +50,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VIINumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VIINumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"cIAllegro" #'("VII")
   \createScore #"cIIAdagio" #'("VII")
   \createScore #"cIIIMenuetto" #'("VII")
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_Va.ly b/Eybler_Streichquartette_HV190-192_Instrument_Va.ly
index c715fd2daef4b024a7143c6a7493524285b3f82c..0893a1300b0636c3e9e8b1445fcc345bea969b1a 100644
--- a/Eybler_Streichquartette_HV190-192_Instrument_Va.ly
+++ b/Eybler_Streichquartette_HV190-192_Instrument_Va.ly
@@ -1,6 +1,5 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
-\include "orchestrallily/oly_settings_names.ily"
 
 \include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 
@@ -21,15 +20,16 @@
 
 \header {
   instrument = \VaInstrumentName
+  instrumentnr = \VaNumber
 }
 
 
 \bookpart {
   \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VaNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VaNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"aIAdagio" #'("Va")
   \createScore #"aIIMenuetto" #'("Va")
   \createScore #"aIIIAdagio" #'("Va")
@@ -38,10 +38,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VaNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VaNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"bIAllegro" #'("Va")
   \createScore #"bIIAdagioNonMolto" #'("Va")
   \createScore #"bIIIMenuetto" #'("Va")
@@ -50,10 +50,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VaNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VaNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"cIAllegro" #'("Va")
   \createScore #"cIIAdagio" #'("Va")
   \createScore #"cIIIMenuetto" #'("Va")
diff --git a/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly b/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly
index 3180a5b3310a4fe27eb98652eaf618bb5d66315d..4833499f0d81e2108be346fb3c5fab6ba542e5f4 100644
--- a/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly
+++ b/Eybler_Streichquartette_HV190-192_Instrument_Vc.ly
@@ -1,6 +1,5 @@
 \version "2.15.30"
 \include "orchestrallily/oly_settings_instrument.ily"
-\include "orchestrallily/oly_settings_names.ily"
 
 \include "Eybler_Streichquartette_HV190-192_Settings_Global.ily"
 
@@ -21,15 +20,16 @@
 
 \header {
   instrument = \VcInstrumentName
+  instrumentnr = \VcNumber
 }
 
 
 \bookpart {
   \include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VcNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VcNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"aIAdagio" #'("Vc")
   \createScore #"aIIMenuetto" #'("Vc")
   \createScore #"aIIIAdagio" #'("Vc")
@@ -38,10 +38,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VcNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VcNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"bIAllegro" #'("Vc")
   \createScore #"bIIAdagioNonMolto" #'("Vc")
   \createScore #"bIIIMenuetto" #'("Vc")
@@ -50,10 +50,10 @@
 
 \bookpart {
   \include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
-  \header {
-    scorenumber = \markup{\scoreNumber \VcNumber}
+%   \header {
+%     scorenumber = \markup{\scoreNumber \VcNumber}
 %     pdftitle = \markup{\shortcomposer: \title, \instrument}
-  }
+%   }
   \createScore #"cIAllegro" #'("Vc")
   \createScore #"cIIAdagio" #'("Vc")
   \createScore #"cIIIMenuetto" #'("Vc")
diff --git a/Eybler_Streichquartette_HV190-192_Settings_Global.ily b/Eybler_Streichquartette_HV190-192_Settings_Global.ily
index 3f9a9f492569f0bb9603c7a4e5fb1a50cffa97ef..8299d685e384741344984bc30cbc3a64cd4a3c02 100644
--- a/Eybler_Streichquartette_HV190-192_Settings_Global.ily
+++ b/Eybler_Streichquartette_HV190-192_Settings_Global.ily
@@ -1,6 +1,7 @@
 \version "2.15.30"
 \include "deutsch.ly"
 
+\include "orchestrallily/oly_settings_names.ily"
 \include "orchestrallily/measureCounterEngraver.ily"
 
 #(ly:set-option 'point-and-click #f)