diff --git a/Eybler_SiConsistant_HV86_Instrument_A.ly b/Eybler_SiConsistant_HV86_Instrument_A.ly
index 9b57c838cfcaa994627f1d6121f2b4d005c11755..319f132991b0d49f432d878896e5d7346ddef3e0 100644
--- a/Eybler_SiConsistant_HV86_Instrument_A.ly
+++ b/Eybler_SiConsistant_HV86_Instrument_A.ly
@@ -1,6 +1,8 @@
 \version "2.13.1"
 \include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
 
+#(undefine SiConsistantAStaff)
+
 \header {
   instrument = \AInstrumentName
   scorenumber = \markup{\scoreNumber \ANumber}
diff --git a/Eybler_SiConsistant_HV86_Instrument_A.pdf b/Eybler_SiConsistant_HV86_Instrument_A.pdf
index 02e7fc6f7322109368745de989436baf38228f42..18450276a34677fec6af429bf7aa2c7293f820ec 100644
Binary files a/Eybler_SiConsistant_HV86_Instrument_A.pdf and b/Eybler_SiConsistant_HV86_Instrument_A.pdf differ
diff --git a/Eybler_SiConsistant_HV86_Instrument_B.pdf b/Eybler_SiConsistant_HV86_Instrument_B.pdf
index a1bd9ff119da390a890d76e7cd2f86bc1747833e..c88edb4f4d6c005a45a7ba128a6170dc2f35eacd 100644
Binary files a/Eybler_SiConsistant_HV86_Instrument_B.pdf and b/Eybler_SiConsistant_HV86_Instrument_B.pdf differ
diff --git a/Eybler_SiConsistant_HV86_Instrument_S.ly b/Eybler_SiConsistant_HV86_Instrument_S.ly
index 69c3c76e056545cff67cc0a334423448aac65860..fcdc10cb768d1269ae957371e093b934167ec1eb 100644
--- a/Eybler_SiConsistant_HV86_Instrument_S.ly
+++ b/Eybler_SiConsistant_HV86_Instrument_S.ly
@@ -1,6 +1,8 @@
 \version "2.13.1"
 \include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
 
+#(undefine SiConsistantSStaff)
+
 \header {
   instrument = \SInstrumentName
   scorenumber = \markup{\scoreNumber \SNumber}
diff --git a/Eybler_SiConsistant_HV86_Instrument_S.pdf b/Eybler_SiConsistant_HV86_Instrument_S.pdf
index b8278333a17202746c82f845fc80188fee528922..b2050a8e272f87d04ded09987b2de20d5d13e52f 100644
Binary files a/Eybler_SiConsistant_HV86_Instrument_S.pdf and b/Eybler_SiConsistant_HV86_Instrument_S.pdf differ
diff --git a/Eybler_SiConsistant_HV86_Instrument_T.ly b/Eybler_SiConsistant_HV86_Instrument_T.ly
index a51edc7faf9846be4fe3fe5de9655a8ca155c804..a64bc51147567d3302bc0ea2bcd91adea82a58b5 100644
--- a/Eybler_SiConsistant_HV86_Instrument_T.ly
+++ b/Eybler_SiConsistant_HV86_Instrument_T.ly
@@ -1,10 +1,94 @@
 \version "2.13.1"
 \include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
 
+#(undefine SiConsistantTStaff)
+
 \header {
   instrument = \TInstrumentName
   scorenumber = \markup{\scoreNumber \TNumber}
 }
+\layout {
+  \context {
+    \Staff
+    quotedEventTypes = #'(StreamEvent)
+  }
+}
+
+SiConsistantTStaff = <<
+\new Staff = "SiConsistantT1Staff" \with {
+    instrumentName = "T.1"
+    shortInstrumentName = "T.1"
+    quotedEventTypes = #'(StreamEvent)
+} 
+
+\new Lyrics = "SiConsistantT1Lyrics" { s1*44 s2 s4 
+  s4 s2.*31 
+  s1*43 }
+
+\new Staff = "SiConsistantTStaff" \with {
+         instrumentName = \TInstrumentName
+         shortInstrumentName = \TShortInstrumentName
+         quotedEventTypes = #'(StreamEvent)
+} <<
+  \new Voice = "SiConsistantTVoice" {
+      \dynamicUp
+      \SiConsistantSettings 
+      \TClef
+      \SiConsistantKey 
+      \SiConsistantTimeSignature 
+      \cueText "Tutti"
+      \quoteDuring #"SiConsistantTMusic" {s1*44 s2 s4 }
+      \bar"||" \break
+      \SiConsistantSettingsII
+      s4 | s2.*31 \bar"||" \break
+      \set Staff.instrumentName = \TShortInstrumentName
+      \set Staff.shortInstrumentName = \TShortInstrumentName
+      \SiConsistantSettingsIII
+      s4 s s 
+      \cueText "Tenore Tutti" \TClef
+      \quoteDuring #"SiConsistantTMusic" {s4 | s1*42 }
+      \bar"|."
+  }
+  \new Voice = "SiConsistantT2SoloInTStaffVoice" {
+      \dynamicUp
+      s1*44 | s2 s4 \bar"||" 
+      << {
+          \TClef
+          \SiConsistantSettingsII 
+          \cueText "Tenore 2 Solo" 
+          \set Staff.instrumentName = "T.2"
+          \set Staff.shortInstrumentName = "T.2"
+          \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} 
+        } 
+        \context Staff = "SiConsistantT1Staff" {
+          \new Voice = "SiConsistantT1Voice" {
+            \startStaff
+            \dynamicUp
+            \TClef
+            \cueText "Tenore 1 Solo" 
+            \set Staff.instrumentName = "T.1"
+            \set Staff.shortInstrumentName = "T.1"
+            \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 } 
+            \SiConsistantSettingsIII
+            \stopStaff 
+%             \quoteDuring #"SiConsistantTSoloIMusic" {s4 s s} 
+          }
+        }
+      >>
+      s4 s1*42
+  }
+>>
+  \context Lyrics = "SiConsistantT1Lyrics" \lyricsto "SiConsistantT1Voice" \SiConsistantTSoloILyrics
+  \context Lyrics = "SiConsistantTLyrics" \lyricsto "SiConsistantTVoice" \SiConsistantTLyrics
+  \context Lyrics = "SiConsistantTLyrics" \lyricsto "SiConsistantT2SoloInTStaffVoice" \SiConsistantTSoloIILyrics
+>>
+
+\layout {
+  \context {
+    \RemoveEmptyStaffContext
+    \override VerticalAxisGroup #'remove-first = ##t
+  }
+}
 
 \createScore #"SiConsistant" #'("T")
 
diff --git a/Eybler_SiConsistant_HV86_Instrument_T.pdf b/Eybler_SiConsistant_HV86_Instrument_T.pdf
index 884404e56ecab2b2a05240456ab9ae205d99373e..43e9c69047cc631a913a8e5c52a5a587dd27508d 100644
Binary files a/Eybler_SiConsistant_HV86_Instrument_T.pdf and b/Eybler_SiConsistant_HV86_Instrument_T.pdf differ
diff --git a/Eybler_SiConsistant_HV86_Music_SiConsistant.ily b/Eybler_SiConsistant_HV86_Music_SiConsistant.ily
index 9c2787701dd34438758ef7b045feae5eb333a41b..df86d2c57f5aa5bdadba954d7aa8e8ad98aad3a1 100644
--- a/Eybler_SiConsistant_HV86_Music_SiConsistant.ily
+++ b/Eybler_SiConsistant_HV86_Music_SiConsistant.ily
@@ -1533,7 +1533,7 @@ SiConsistantTLyrics = \SiConsistantSLyrics
 
 
 SiConsistantTSoloIMusic = \relative c' {
-  R1*45 | \barNumberCheck #45
+  R1*44 | \barNumberCheck #45
   r2 r4\fermata \bar"||"  \TClef \SiConsistantSettingsII \SiConsistantKeyII r4 | % 46
   R2.*7 | % 53
   r4 r \cueText "Tenore 1 Solo" g8 c | % 54
@@ -1543,15 +1543,15 @@ SiConsistantTSoloIMusic = \relative c' {
   d8. e32[ f] e8 r c16[\(\p h] d[ c]\) | % 58
   e4 d8 r d16[\cresc c] e[ d] | % 59
   f4 e8 r e\f g | \barNumberCheck #60
-  c4. d16 e \acciaccatura g8 f8 e | % 61
+  c,4. d16 e \slashedGrace g8 f8 e | % 61
   d4 r r | % 62
   r r d8 d | % 63
   d8. c16 h8 g' fis e | % 64
-  \acciaccatura e8 d8. c16 h8 d\cresc e fis | % 65
+  \slashedGrace e8 d8. c16 h8 d\cresc e fis | % 65
   g4.\f fis16 e e[( d]) d[( cis]) | % 66
   e8.[ d16] d8 r r4 | % 67
-  r r g16[\( fis] e[ d]) | % 68
-  d4. e16 d c[\( h] a[ g]) | % 69
+  r r g16[\( fis] e[ d]\) | % 68
+  d4. e16 d c[\( h] a[ g]\) | % 69
   h4( a8) r g'16[\( fis] e[ d]\) | \barNumberCheck #70
   d4. e16[ d] c[ h] a[ gis] | % 71
   a[(\melisma gis h a]) c[( h d c] fis[ e])\melismaEnd c[ a] | % 72
@@ -1559,7 +1559,7 @@ SiConsistantTSoloIMusic = \relative c' {
   g4 r a8\p a | % 74
   c8.[ h16] h8 r fis'8\f fis | % 75
   fis8.[ g16] g8 r g8\ff g | % 76
-  g16[ es] c a g4. \acciaccatura h8 a \bar"||" % 77
+  g16[ es] c a g4. \slashedGrace h8 a \bar"||" % 77
   \SiConsistantSettingsIII \SiConsistantKeyIII 
   g4 r r r | % 78
   R1*42 \bar"|."
@@ -1582,7 +1582,7 @@ SiConsistantTSoloILyrics = \lyricmode {
 }
 
 SiConsistantTSoloIIMusic = \relative c' {
-  R1*45 | \barNumberCheck #45
+  R1*44 | \barNumberCheck #45
   r2 r4\fermata \bar"||"  \TClef \SiConsistantSettingsII \SiConsistantKeyII r4 | % 46
   R2.*7 | % 53
   r4 r \cueText "Tenore 2 Solo" g8 g | % 54
@@ -1604,7 +1604,7 @@ SiConsistantTSoloIIMusic = \relative c' {
   g4 fis8 r r4 | \barNumberCheck #70
   r8 c' h g r d' | % 71
   e,4.( a8) c[( e]) | % 72
-  d,8[\f\melisma e16 fis] g[ a h c] d8.\melismaEnd c16 | % 73
+  d,8[\f( e16 fis] g[ a h c] d8.) c16 | % 73
   h4 r fis8\p fis | % 74
   a8.[( g16]) g8 r c\f c | % 75
   c8.( h16]) h8 r d\ff d | % 76
@@ -1710,7 +1710,7 @@ SiConsistantBLyrics = \SiConsistantALyrics
 
 
 SiConsistantBSoloIMusic = \relative c {
-  R1*45 | \barNumberCheck #45
+  R1*44 | \barNumberCheck #45
   r2 r4\fermata \bar"||"  \BClef \SiConsistantSettingsII \SiConsistantKeyII r4 | % 46
   R2.*7 | % 53
   r4 r \cueText "Basso 1 Solo" e8 e | % 54
@@ -1727,7 +1727,7 @@ SiConsistantBSoloIMusic = \relative c {
   g8. g16 g8 g\cresc h a | % 65
   g8.\f a16 h8 r a8\p a | % 66
   g8.[ fis16] fis8 r r4 | % 67
-  R1 | % 68
+  R2. | % 68
   r8 fis8[( g]) h[( g]) e |
   d4 d8 r r4 |
   r8 fis g[( h,]) c d |
@@ -1735,7 +1735,7 @@ SiConsistantBSoloIMusic = \relative c {
   g4 r d8\p a' |
   fis8.[ g16] g8 r a8\f a |
   a8.[( g16]) g8 r g8\ff g |
-  g e16 e d8( g'4) fis8 \bar"||" % 77
+  g e16 e d8( h'4) fis8 \bar"||" % 77
   \SiConsistantSettingsIII \SiConsistantKeyIII 
   g4 r r r | % 78
   R1*42 \bar"|."
@@ -1758,8 +1758,8 @@ SiConsistantBSoloILyrics = \lyricmode {
   hanc re -- qui -- ram a Do -- mi -- no.
 }
 
-SiConsistantBSoloIIMusic = \relative c' {
-  R1*45 | \barNumberCheck #45
+SiConsistantBSoloIIMusic = \relative c {
+  R1*44 | \barNumberCheck #45
   r2 r4\fermata \bar"||"  \BClef \SiConsistantSettingsII \SiConsistantKeyII r4 | % 46
   R2.*7 | % 53
   r4 r \cueText "Basso 2 Solo" c8 c | % 54
@@ -1770,13 +1770,13 @@ SiConsistantBSoloIIMusic = \relative c' {
   g'4 g,8 r g'\cresc g | % 59
   h,4 c8 r c'8\f g | \barNumberCheck #60
   e4. d16 c h8 c | % 61
-  g4 r r | % 62
+  g'4 r r | % 62
   r r fis8 fis | % 63
   g8. g16 g8 c,8 c e | % 64
   g8. g,16 g8 g'8\cresc g fis |
   e8.\f fis16 g8 g,[(\p a]) a |
   a8.[( d16]) d8 r r4 |
-  R1 |
+  R2. |
   r4 r8 g,8[( e']) cis |
   d4 d8 r r4 |
   r r8 g, a h |
@@ -1806,6 +1806,174 @@ SiConsistantBSoloIILyrics = \lyricmode {
   hanc re -- qui -- ram, a Do -- mi -- no.
 }
 
+
+SiConsistantSStaff = <<
+\new Staff = "SiConsistantSStaff" \with {
+         instrumentName = \SInstrumentName
+         shortInstrumentName = \SShortInstrumentName
+} <<
+  \new Voice = "SiConsistantSVoice" {
+      \dynamicUp
+      \SiConsistantSettings 
+      \SClef
+      \SiConsistantKey 
+      \SiConsistantTimeSignature 
+      \cueText "Tutti"
+      \quoteDuring #"SiConsistantSMusic" {s1*44 s2 s4 }
+      \bar"||"
+      \SiConsistantSettingsII
+      s4 | s2.*31 \bar"||"
+      \SiConsistantSettingsIII
+      s4 s s 
+      \cueText "Soprano Tutti" \SClef
+      \set Staff.instrumentName = \SInstrumentName
+      \set Staff.shortInstrumentName = \SShortInstrumentName
+      \quoteDuring #"SiConsistantSMusic" {s4 | s1*42 }
+      \bar"|."
+  }
+  \new Voice = "SiConsistantT1SoloInSStaffVoice" {
+      \dynamicUp
+      s1*44 | s2 s4 \bar"||" 
+      \TClef
+      \SiConsistantSettingsII 
+      \cueText "Tenore 1 Solo" 
+      \set Staff.instrumentName = "T.1"
+      \set Staff.shortInstrumentName = "T.1"
+
+      \quoteDuring #"SiConsistantTSoloIMusic" {s4 s2.*31 s4 s s} 
+      s4 s1*42
+  }
+>>
+  \new Lyrics = "SiConsistantSLyrics" \lyricsto "SiConsistantSVoice" \SiConsistantSLyrics
+  \context Lyrics = "SiConsistantSLyrics" \lyricsto "SiConsistantT1SoloInSStaffVoice" \SiConsistantTSoloILyrics
+>>
+
+SiConsistantAStaff = <<
+\new Staff = "SiConsistantAStaff" \with {
+         instrumentName = \AInstrumentName
+         shortInstrumentName = \AShortInstrumentName
+} <<
+  \new Voice = "SiConsistantAVoice" {
+      \dynamicUp
+      \SiConsistantSettings 
+      \AClef
+      \SiConsistantKey 
+      \SiConsistantTimeSignature 
+      \cueText "Tutti"
+      \quoteDuring #"SiConsistantAMusic" {s1*44 s2 s4 }
+      \bar"||"
+      \SiConsistantSettingsII
+      s4 | s2.*31 \bar"||"
+      \SiConsistantSettingsIII
+      s4 s s 
+      \cueText "Alto Tutti" \AClef
+      \set Staff.instrumentName = \AInstrumentName
+      \set Staff.shortInstrumentName = \AShortInstrumentName
+      \quoteDuring #"SiConsistantAMusic" {s4 | s1*42 }
+      \bar"|."
+  }
+  \new Voice = "SiConsistantT2SoloInAStaffVoice" {
+      \dynamicUp
+      s1*44 | s2 s4 \bar"||" 
+      \TClef
+      \SiConsistantSettingsII 
+      \cueText "Tenore 2 Solo" 
+      \set Staff.instrumentName = "T.2"
+      \set Staff.shortInstrumentName = "T.2"
+
+      \quoteDuring #"SiConsistantTSoloIIMusic" {s4 s2.*31 s4 s s} 
+      s4 s1*42
+  }
+>>
+  \new Lyrics = "SiConsistantALyrics" \lyricsto "SiConsistantAVoice" \SiConsistantALyrics
+  \context Lyrics = "SiConsistantALyrics" \lyricsto "SiConsistantT2SoloInAStaffVoice" \SiConsistantTSoloIILyrics
+>>
+
+SiConsistantTStaff = <<
+\new Staff = "SiConsistantTStaff" \with {
+         instrumentName = \TInstrumentName
+         shortInstrumentName = \TShortInstrumentName
+} <<
+  \new Voice = "SiConsistantTVoice" {
+      \dynamicUp
+      \SiConsistantSettings 
+      \TClef
+      \SiConsistantKey 
+      \SiConsistantTimeSignature 
+      \cueText "Tutti"
+      \quoteDuring #"SiConsistantTMusic" {s1*44 s2 s4 }
+      \bar"||"
+      \SiConsistantSettingsII
+      s4 | s2.*31 \bar"||"
+      \SiConsistantSettingsIII
+      s4 s s 
+      \cueText "Tenore Tutti" \TClef
+      \set Staff.instrumentName = \TInstrumentName
+      \set Staff.shortInstrumentName = \TShortInstrumentName
+      \quoteDuring #"SiConsistantTMusic" {s4 | s1*42 }
+      \bar"|."
+  }
+  \new Voice = "SiConsistantB1SoloInTStaffVoice" {
+      \dynamicUp
+      s1*44 | s2 s4 \bar"||" 
+      \BClef
+      \SiConsistantSettingsII 
+      \cueText "Basso 1 Solo" 
+      \set Staff.instrumentName = "B.1"
+      \set Staff.shortInstrumentName = "B.1"
+
+      \quoteDuring #"SiConsistantBSoloIMusic" {s4 s2.*31 s4 s s} 
+      s4 s1*42
+  }
+>>
+  \context Lyrics = "SiConsistantTLyrics" \lyricsto "SiConsistantTVoice" \SiConsistantTLyrics
+  \context Lyrics = "SiConsistantTLyrics" \lyricsto "SiConsistantB1SoloInTStaffVoice" \SiConsistantBSoloILyrics
+>>
+
+SiConsistantBStaff = <<
+\new Staff = "SiConsistantBStaff" \with {
+         instrumentName = \BInstrumentName
+         shortInstrumentName = \BShortInstrumentName
+} <<
+  \new Voice = "SiConsistantBVoice" {
+      \dynamicUp
+      \SiConsistantSettings 
+      \BClef
+      \SiConsistantKey 
+      \SiConsistantTimeSignature 
+      \cueText "Tutti"
+      \quoteDuring #"SiConsistantBMusic" {s1*44 s2 s4 }
+      \bar"||"
+      \SiConsistantSettingsII
+      s4 | s2.*31 \bar"||"
+      \SiConsistantSettingsIII
+      s4 s s 
+      \cueText "Basso Tutti" \BClef
+      \set Staff.instrumentName = \BInstrumentName
+      \set Staff.shortInstrumentName = \BShortInstrumentName
+      \quoteDuring #"SiConsistantBMusic" {s4 | s1*42 }
+      \bar"|."
+  }
+  \new Voice = "SiConsistantB2SoloInBStaffVoice" {
+      \dynamicUp
+      s1*44 | s2 s4 \bar"||" 
+      \BClef
+      \SiConsistantSettingsII 
+      \cueText "Basso 2 Solo" 
+      \set Staff.instrumentName = "B.2"
+      \set Staff.shortInstrumentName = "B.2"
+
+      \quoteDuring #"SiConsistantBSoloIIMusic" {s4 s2.*31 s4 s s} 
+      s4 s1*42
+  }
+>>
+  \context Lyrics = "SiConsistantBLyrics" \lyricsto "SiConsistantBVoice" \SiConsistantBLyrics
+  \context Lyrics = "SiConsistantBLyrics" \lyricsto "SiConsistantB2SoloInBStaffVoice" \SiConsistantBSoloIILyrics
+>>
+
+
+
+
 SiConsistantVcBMusic = \relative c {
   c8[\f c c c] c4 r | % 2
   c2:8 c4:8 r | % 3
diff --git a/Eybler_SiConsistant_HV86_Score_Choral.midi b/Eybler_SiConsistant_HV86_Score_Choral.midi
index e6acf05b55757f6f1aea997bb71898aaae465e08..de531ccbdbfb0ce49fa77680d3b3d50f1a466da6 100644
Binary files a/Eybler_SiConsistant_HV86_Score_Choral.midi and b/Eybler_SiConsistant_HV86_Score_Choral.midi differ
diff --git a/Eybler_SiConsistant_HV86_Score_Choral.pdf b/Eybler_SiConsistant_HV86_Score_Choral.pdf
index 0d64e59cc74f2438f3ced5d8f5f4bd9f2da21f5c..46f094ec45005d643a6b2695f64cfc5bc31ea6c1 100644
Binary files a/Eybler_SiConsistant_HV86_Score_Choral.pdf and b/Eybler_SiConsistant_HV86_Score_Choral.pdf differ