diff --git a/Pembaur_VierteLateinischeMesse_01_Kyrie.ly b/Pembaur_VierteLateinischeMesse_01_Kyrie.ly
index 8f2404ce76e21d7280fba7e6e7f317f8b9f96d08..0d961c30888accd0e712d59651f5e5b29f41a364 100644
--- a/Pembaur_VierteLateinischeMesse_01_Kyrie.ly
+++ b/Pembaur_VierteLateinischeMesse_01_Kyrie.ly
@@ -434,13 +434,13 @@ IKyrieSMusic = \relative c'' {
   % Measure 15
   \dynamicsUpInside #-1 d4.\f d8 d2 | R1*3 | r2 r4 c | 
   % Measure 20
-  b( c) b e | g,2( fis) | g r | R1*2 | 
+  b( c) b e | \ignoreSlur g,2( fis) | g r | \ignoreMMNumber R1*2 | 
   % Measure 25
   \dynamicsUpInside #-0.5 g2\f g4 g | fis( a) g r | b2 b4 b | a( c) b r | b2 b4 b | 
   % Measure 30
-  c2\< c | d2 d4 d | e1 | dis2\! r | r2 \dynamicsUpInside #-1.5 a\p | 
+  \hairpinOffset #3.5 c2\< c | d2 d4 d | e1 | dis2\! r | r2 \dynamicsUpInside #-1.5 a\p | 
   % Measure 35
-  gis(\> fis) | e\! r | R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
+  \hairpinOffset #3.5 gis(\> fis) | e\! r | \ignoreMMNumber R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
   % Measure 40
   e( f) e e | g2( f4 e) | d2. r4 | a'4. f8 d4 e | f( g) f f | 
   % Measure 45
@@ -450,9 +450,9 @@ IKyrieSMusic = \relative c'' {
   % Measure 57
   r2 r4 f | e( f) e d | c2( b) |
   % Measure 60
-  c4 \dynamicsUpInside #-1.5 a8\p a g4 f | f( e2 d4) | c2 r | \dynamicsUpInside #-1 g'1\pp | g2( d4. e8) | 
+  c4 \dynamicsUpInside #-1.5 a8\p a g4 f | \ignoreSlur f( e2 d4) | c2 r | \dynamicsUpInside #-1 g'1\pp | g2( d4. e8) | 
   % Measure 65 
-  e1\fermata \bar"|."
+  \ignoreFermata e1\fermata \bar"|."
 }
 
 IKyrieAMusic = \relative c'' {
@@ -462,13 +462,13 @@ IKyrieAMusic = \relative c'' {
   % Measure 15
   \dynamicsUpInside #-0.8 g4.\f g8 g2 | R1*2 | r2 r4 g | fis( g) fis2 | 
   % measure 20 
-  g4 g d e | d2.( c4) | b2 r | R1*2 | 
+  g4 g d e | \ignoreSlur d2.( c4) | b2 r | \ignoreMMNumber R1*2 | 
   % Measure 25
   \dynamicsUpInside #-0.5 e2\f e4 e | e( dis) e r | g2 g4 g | g( fis) g r | gis2 gis4 gis | 
   % Measure 30
-  a2\< a | b2 g4 g | g2( e) | fis\! r | r \dynamicsUpInside #-1.2 e\p | 
+  \hairpinOffset #3.5 a2\< a | b2 g4 g | g2( e) | fis\! r | r \dynamicsUpInside #-1.2 e\p | 
   % Measure 35
-  e(\> dis) | e\! r | R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
+  \hairpinOffset #3.5 e(\> dis) | e\! r | \ignoreMMNumber R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
   % Measure 40
   e( f) e e | g2( f4 e) | d2. r4 | a'4. f8 d4 e | f( g) f f | 
   % Measure 45
@@ -478,11 +478,13 @@ IKyrieAMusic = \relative c'' {
   % Measure 55
   r2 r4 f | e( f) e2 | g1~ | g4 a g f | f( e2 d4) | 
   % Measure 60
-  c \dynamicsUpInside #-1.5 f8\p f e4 d | c2( b) | c r | r \dynamicsUpInside #-1.5 d\pp c( b4. c8) | c1\fermata \bar "|."
+  c \dynamicsUpInside #-1.5 f8\p f e4 d | \ignoreSlur c2( b) | c r | r \dynamicsUpInside #-1.5 d\pp \ignoreSlur c( b4. c8) | 
+  % Measure 65
+  \ignoreFermata c1\fermata \bar "|."
 }
 
 IKyrieTMusic = \relative c' {
-  \dynamicsUpInside #-1 g4.\p e8 c4 d | e( f) e e | g2( f4 e) | d2. r4 | 
+  \dynamicsUpInside #-1 g4.\p e8 c4 d | \ignoreSlur e( f) e e | \ignoreSlur g2( f4 e) | d2. r4 | 
   % Measure 5
   a'4. f8 d4 e | f( g) f f | a2( g4 f) | e2. r4 | c'4. a8 f4 g | 
   % Measure 10
@@ -490,13 +492,13 @@ IKyrieTMusic = \relative c' {
   % Measure 15
   \dynamicsUpInside #-0.5 b4.\f b8 b2 | R1 | r2 r4 c | b( c) b2 | d1~ | 
   % Measure 20 
-  d4 e d c | c( b2 a4) | g2 r | R1*2 | 
+  d4 e d c | c( b2 a4) | g2 r | \ignoreMMNumber R1*2 | 
   % Measure 25
   \dynamicsUpInside #-0.5 b2\f b4 b | c2 b4 r | e2 e4 e | dis2 e4 r | R1 | 
   % Measure 30
-  c2\< c4 c | b2 b4 b | c( g a ais) | b2\! r | r \dynamicsUpInside #-0.5 c\p | 
+  \hairpinOffset #4.5 c2\< c4 c | b2 b4 b | c( g a ais) | b2\! r | r \dynamicsUpInside #-0.5 c\p | 
   % Measure 35
-  b(\> a) | gis\! r | R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
+  \hairpinOffset #3.5 b(\> a) | gis\! r | \ignoreMMNumber R1*2 | \dynamicsUpInside #-1.2 g4.\p e8 c4 d | 
   % Measure 40
   e( f) e e | g2( f4 e) | d2. r4 | a'4. f8 d4 e | f( g) f f | 
   % Measure 45
@@ -504,11 +506,11 @@ IKyrieTMusic = \relative c' {
   % measure 50
   g2. r4 | \dynamicsUpInside #-0.7 c4.\f c8 c2 | R1 | c4. c8 c2 | r2 r4 c4 | 
   % measure 55
-  b( c) b2 | c4( a g c | d e f) e8[ d] | c2 g4( a) | g2.( f4) | 
+  b( c) b2 | \ignoreSlur c4( a g c | d e f) e8[ d] | c2 g4( a) | g2.( f4) | 
   % measure 60: a or f? a in the organ score, f in the tenor score
   e4 r r \dynamicsUpInside #-1.5 a\p | g2.( f4) | e2 r | r \dynamicsUpInside #-2 f\pp | e( g) | 
   % measure 65
-  g1\fermata \bar"|."
+  \ignoreFermata g1\fermata \bar"|."
   
 }
 
@@ -519,15 +521,15 @@ IKyrieBMusic = \relative c' {
   % Measure 10
   a( bes) a b | c2( b4 a) | g2 r | \dynamicsUpInside #-0.8 c,4.\f c8 c2 | R1 | 
   % Measure 15
-  \dynamicsUpInside #-1.4 g'4.\f g8 g2 | r r4 g4 | fis( g) fis2 | g4( e d g | a b c) b8[ a] | 
+  \dynamicsUpInside #-1.4 g'4.\f g8 g2 | r r4 g4 | fis( g) fis2 | \ignoreSlur g4( e d g | a b c) b8[ a] | 
   % Measure 20
-  g2. c,4 | d1 | e2 r | R1*2 | 
+  g2. c,4 | d1 | e2 r | \ignoreMMNumber R1*2 | 
   % Measure 25
   \dynamicsUpInside #-0.5 e2\f e4 g | a2 e4 r | e2 e4 g | a2 e4 r | R1 | 
   % Measure 30
-  a2\< a4 a | g2 g4 g | c,1 | b2\! \dynamicsUpInside #-1.5 a\p | gis2( a | 
+  \hairpinOffset #3.5 a2\< a4 a | g2 g4 g | c,1 | b2\! \dynamicsUpInside #-1.5 a\p | gis2( a | 
   % Measure 35
-  b1)\> | e2\! r | R1*2 | \dynamicsAllInside #-1.2 #1.8 g4.\p e8 c4 d | 
+  \hairpinOffset #3.5 b1)\> | e2\! r | \ignoreMMNumber R1*2 | \dynamicsAllInside #-1.2 #1.8 g4.\p e8 c4 d | 
   % Measure 40
   e( f) e e | g2( f4 e) | d2. r4 | a'4. f8 d4 e | f( g) f f | 
   % Measure 45
@@ -539,8 +541,7 @@ IKyrieBMusic = \relative c' {
   % Measure 60
   a4 r r \dynamicsUpInside #-0.5 f'\p | g2( g,) | c r | \dynamicsUpInside #-1.5 g1\pp | g | 
   % Measure 65
-  c\fermata \bar"|."
-
+  \ignoreFermata c\fermata \bar"|."
 }
 
 IKyrieSLyrics = \lyricmode {
diff --git a/Pembaur_VierteLateinischeMesse_02_Gloria.ly b/Pembaur_VierteLateinischeMesse_02_Gloria.ly
index 9ab69a51fc65e39a68e1b3fee58ec1ad49251795..dba6ce03a32b4a8c9ef8a5d7eeb1f85347d3e179 100644
--- a/Pembaur_VierteLateinischeMesse_02_Gloria.ly
+++ b/Pembaur_VierteLateinischeMesse_02_Gloria.ly
@@ -606,19 +606,19 @@ IIGloriaSMusic = \relative c' {
   % Measure 30
   dis4. dis8 dis2 | e4( fis) g( a) | b2( a) | g r | \dynamicsUpInside #-0.8 es\p f | 
   % Measure 35
-  g as | R1 | g2\< as4 as | bes2 c\! | r2 r4 d,4 | 
+  g as | R1 | \hairpinOffset #3.5 g2\< as4 as | bes2 c\! | r2 r4 d,4 | 
   % Measure 40
-  \once \override DynamicText #'X-offset = #-0.3 d\p\< d8  c fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
+  \once \override DynamicText #'X-offset = #-0.3 \hairpinOffset #3.5 d\p\< d8  c fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
   % Measure 45
   d2 r | R1 | \dynamicsUpInside #-1 e4.\p e8 f4 f | g2 a | g( c4) b | 
   % Measure 50
-  a2 g4 b | a2( d4) c | b4.\< b8 a4 b | c2 f4 e | e4. e8 d2 | 
+  a2 g4 b | a2( d4) c | \hairpinOffset #3.5 b4.\< b8 a4 b | c2 f4 e | e4. e8 d2 | 
   % Measure 55
   e\!\f d | c1 | b2 r | r r4 g | d'2 e | 
   % Measure 60
   g4. f8 e4 c | f e8 e d4 c | b( cis d) f | e1( | d) | 
   % Measure 65
-  c2 r | R1 | g2( a4 c) | e1\fermata \bar"|."
+  c2 r | R1 | g2( a4 c) | \ignoreFermata e1\fermata \bar"|."
   
 }
 
@@ -637,19 +637,19 @@ IIGloriaAMusic = \relative c' {
   % Measure 30
   dis4. dis8 dis2 | e4( dis) e( g) | g2( fis) | g r | \dynamicsUpInside #-0.8 es\p f | 
   % Measure 35
-  g as | R1 | g2\< as4 as | bes2 c\! | r r4 d,4 | 
+  g as | R1 | \hairpinOffset #3.5 g2\< as4 as | bes2 c\! | r r4 d,4 | 
   % Measure 40
-  \once \override DynamicText #'X-offset = #-0.3 d\p\< d8 d8 fis4 a | bes2 a | d,4 d d g\! | g2( es2~ | es2 d4 c) | 
+  \once \override DynamicText #'X-offset = #-0.3 \hairpinOffset #3.5 d\p\< d8 d8 fis4 a | bes2 a | d,4 d d g\! | g2( es2~ | es2 d4 c) | 
   % Measure 45
   d2 r | R1 | \dynamicsUpInside #-1 c4.\p c8 c4 c | e2 f | e g | 
   % Measure 50
-  g4( fis) g g | f2 a | a4\< gis a a | a2 a4 a | a4. a8 b2 | 
+  g4( fis) g g | f2 a | \hairpinOffset #3.5 a4\< gis a a | a2 a4 a | a4. a8 b2 | 
   % Measure 55
   g2\!\f f | e( es) | d r | r r4 g | b2 c | 
   % Measure 60
   g4. g8 g4 c | c c8 c a4 a | b( bes) a2 | gis( a~| a g!4 f) | 
   % Measure 65
-  e2 r | R1 | e2( f) | e1\fermata \bar"|."
+  e2 r | R1 | e2( f) | \ignoreFermata e1\fermata \bar"|."
 }
 
 IIGloriaTMusic = \relative c' {
@@ -665,19 +665,19 @@ IIGloriaTMusic = \relative c' {
   % Measure 30
   dis4. dis8 dis2 | r4 g4( e') e | d2( c) | b r | \dynamicsUpInside #-0.8 es,\p f | 
   % Measure 35
-  g as | R1 | g2\< as4 as | bes2 c\! | r r4 d, | 
+  g as | R1 | \hairpinOffset #3.5 g2\< as4 as | bes2 c\! | r r4 d, | 
   % Measure 40
-  \once \override DynamicText #'X-offset = #-0.3 d\p\< d8 d fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
+  \once \override DynamicText #'X-offset = #-0.3 \hairpinOffset #3.5 d\p\< d8 d fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
   % Measure 45
   d2 r | R1 | \dynamicsUpInside #-1 g4.\p g8 a4 a | c2 c | c2. d4 | 
   % Measure 50
-  e( d8[ c]) b4 r | d2. e4 | f\< e8[ d] c4 c | c2 c4 c | c4. c8 b2 | 
+  e( d8[ c]) b4 r | d2. e4 | \hairpinOffset #3.5 f\< e8[ d] c4 c | c2 c4 c | c4. c8 b2 | 
   % Measure 55
   c\!\f g | g( fis) | g r4 g | d'2 e | g4. f8 e4 g, | 
   % Measure 60
   d'4. d8 e2 | c2( f4) e | d( e a,) b8[ c] | b2( c~ | c b) | 
   % Measure 65
-  c r | R1 | c2( a) | g1\fermata \bar"|."
+  c r | R1 | c2( a) | \ignoreFermata g1\fermata \bar"|."
 }
 
 IIGloriaBMusic = \relative c {
@@ -693,22 +693,22 @@ IIGloriaBMusic = \relative c {
   % Measure 30
   dis4. dis8 dis2 | r4 c2 c4 | d1 | g2 r | \dynamicsUpInside #-0.5 es\p f | 
   % Measure 35
-  g as | R1 | g2\< as4 as | bes2 c\! | r r4 d, | 
+  g as | R1 | \hairpinOffset #4.5 g2\< as4 as | bes2 c\! | r r4 d, | 
   % Measure 40
-  \once \override DynamicText #'X-offset = #-0.3 d\p\< d8 d fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
+  \once \override DynamicText #'X-offset = #-0.3 \hairpinOffset #4.5 d\p\< d8 d fis4 a | bes2 a | d,4 d d g\! | g2( es~ | es d4 c) | 
   % Measure 45
   d2 r | R1 | \dynamicsUpInside #-1 c4.\p c8 f4 f | c2 f | c( e4) d | 
   % Measure 50
   % TODO: vertical position of hairpin! Also exclude from spacing
   c( d) g r | d2( f4) e | %\dynamicsUpInside #-0.8 
-  d\< e a g | f2 f4 f | fis4. fis8 g2 | 
+  \hairpinOffset #3.5 d\< e a g | f2 f4 f | fis4. fis8 g2 | 
   % Measure 55
 %   \dynamicsUpInside #-0.8 
   c,\!\f c | c1 | g2 r4 g'4 | b2 c | g4. g8 c4 g | 
   % Measure 60
   b4. b8 c4( b) | a( g f) fis | g2( f4) d | e2( a | f g) | 
   % Measure 65
-  c, r | R1 | c2( f) | c1\fermata \bar"|."
+  c, r | R1 | c2( f) | \ignoreFermata c1\fermata \bar"|."
 }
 
 IIGloriaSLyrics = \lyricmode {
diff --git a/Pembaur_VierteLateinischeMesse_03_Credo.ly b/Pembaur_VierteLateinischeMesse_03_Credo.ly
index 2a5d3faea24fa37524bb57b030bfee9fef97de53..71d386153903f5d3609b89cc8a8a7ce93d9e76df 100644
--- a/Pembaur_VierteLateinischeMesse_03_Credo.ly
+++ b/Pembaur_VierteLateinischeMesse_03_Credo.ly
@@ -1109,7 +1109,7 @@ IIICredoSMusic = {
     c''2 bes'2 | % 78
     \dynamicsUpInside #-1.2 as'4\p g'4 f'4 e'4 | % 79
     \hairpinOffset #3.5 f'2\> f'2 | \barNumberCheck #80
-    \dynamicsAllInside #-3.5 #3 g'1\!\pp\fermata \bar "||" % 81
+    \dynamicsAllInside #-3.5 #3 \ignoreFermata g'1\!\pp\fermata \bar "||" % 81
     \IIICredoSettingsIII
     \IIICredoKeyIII
     \dynamicsAllInside #-2.5 #0.75 e'4\mf  e'4 g'4 | % 82
@@ -1238,7 +1238,7 @@ IIICredoAMusic = {
     a'2 bes'2 | % 78
     \dynamicsUpInside #-1.2 f'4\p  e'4 f'4 c'4 | % 79
     \hairpinOffset #3.5 c'2\> c'2 | \barNumberCheck #80
-    \dynamicsAllInside #-3.5 #3 b1\!\pp\fermata \bar "||" % 81
+    \dynamicsAllInside #-3.5 #3 \ignoreFermata b1\!\pp\fermata \bar "||" % 81
     \IIICredoSettingsIII
     \IIICredoKeyIII
     \dynamicsAllInside #-2.5 #0.75 e'4\mf e'4 g'4 | % 82
@@ -1365,7 +1365,7 @@ IIICredoTMusic = {
     es'2 d'2 | % 78
     \dynamicsUpInside #-1.2 c'4\p c'4 c'4 c'4 | % 79
     \hairpinOffset #3.5 c'2\> c2 | \barNumberCheck #80
-    \dynamicsAllInside #-3.5 #3 d1\!\pp\fermata \bar "||" % 81
+    \dynamicsAllInside #-3.5 #3 \ignoreFermata d1\!\pp\fermata \bar "||" % 81
     \IIICredoSettingsIII
     \IIICredoKeyIII
     \dynamicsAllInside #-2.5 #0.75 e4\mf e4 g4 | % 82
@@ -1432,8 +1432,8 @@ IIICredoBMusic = {
     g4. g8 b4 | % 11
     a4( b4) c'4 | % 12
     b2 r4 | % 13
-    c'4( d'4) e'4 | % 14
-    d'4( c'4) b4 | % 15
+    \ignoreSlur c'4( d'4) e'4 | % 14
+    \ignoreSlur d'4( c'4) b4 | % 15
     a2 a4 | % 16
     g2 r4 | % 17
     e2 g4 | % 18
@@ -1452,7 +1452,7 @@ IIICredoBMusic = {
     d'4( c'4) d'4 | % 33
     e'2 b4 | % 34
     c'4 b4 a4 | % 35
-    g4( c'2 | % 36
+    \ignoreSlur g4( c'2 | % 36
     d'2) d'4 | % 37
     c'2 r4 | % 38
     \dynamicsUpInside #-0.8 e2\f e4 | % 39
@@ -1494,7 +1494,7 @@ IIICredoBMusic = {
     f2 bes2 | % 78
     \dynamicsUpInside #-1.2 f4\p g4 as4 bes4 | % 79
     \hairpinOffset #3.5 as2\> as,2 | \barNumberCheck #80
-    \dynamicsAllInside #-3.5 #3 g,1\!\pp\fermata \bar "||" 
+    \dynamicsAllInside #-3.5 #3 \ignoreFermata g,1\!\pp\fermata \bar "||" 
     \IIICredoSettingsIII
     \IIICredoKeyIII
     \dynamicsAllInside #-2.5 #0.75 e4\mf e4 g4 | % 82
diff --git a/Pembaur_VierteLateinischeMesse_04_Sanctus.ly b/Pembaur_VierteLateinischeMesse_04_Sanctus.ly
index 31565cf6e8c0a786d0a4dfdf6873ea467512cf9e..8f81e63577a7ec5ef09f47314b6b75679e11da9e 100644
--- a/Pembaur_VierteLateinischeMesse_04_Sanctus.ly
+++ b/Pembaur_VierteLateinischeMesse_04_Sanctus.ly
@@ -240,11 +240,11 @@ IVSanctusSMusic = {
     a'2. r4 | % 5
     b'2( g'4 a'4) | % 6
     b'2. r4 | % 7
-    c''2\< e''4 d''4\! | % 8 % FIXED: c2 instead of r4 c4 in KlA
+    \hairpinOffset #3.5 c''2\< e''4 d''4\! | % 8 % FIXED: c2 instead of r4 c4 in KlA
     c''2. b'4 | % 9
-    a'2.\> a'4 | \barNumberCheck #10
+    \hairpinOffset #4 a'2.\> a'4 | \barNumberCheck #10
     a'2.\! r4  | % 11
-    \dynamicsAllInside #-0.5 #3 bes'2\f\< bes'4 bes'4 | % 12
+    \hairpinOffset #3.5 bes'2\f\< bes'4 bes'4 | % 12
     d''2 d''4 d''4\! | % 13
     es''2( d''4 c''4) | % 14
     d''2. r4 | R1 | % 16
@@ -264,11 +264,11 @@ IVSanctusAMusic = {
     fis'2. r4 | % 5
     d'2( e'4 es'4) | % 6
     d'2. r4 | % 7
-    e'2\< e'4 g'4\! | % 8
+    \hairpinOffset #3.5 e'2\< e'4 g'4\! | % 8
     d'2 d'2 | % 9
-    d'2\> cis'2 | \barNumberCheck #10
+    \hairpinOffset #3.5 d'2\> cis'2 | \barNumberCheck #10
     d'2.\! r4  | % 11
-    \dynamicsAllInside #-0.5 #3 g'2\f\< g'4  g'4 | % 12
+    \hairpinOffset #3.5 g'2\f\< g'4  g'4 | % 12
     f'2  f'4 f'4\! | % 13
     g'2( ges'2) | % 14
     f'2. r4 | % 15
@@ -289,11 +289,11 @@ IVSanctusTMusic = {
     a2. r4 | % 5
     g2.( fis4) | % 6
     g2. r4 | % 7
-    g2\< g4  g4\! | % 8
+    \hairpinOffset #3.5 g2\< g4  g4\! | % 8
     fis2 g2 | % 9
-    fis2\> e2 | \barNumberCheck #10
+    \hairpinOffset #3.5 fis2\> e2 | \barNumberCheck #10
     fis2.\! r4  | % 11
-    \dynamicsAllInside #-0.5 #3 d'2\f\< d'4  d'4 | % 12
+    \hairpinOffset #3.5 d'2\f\< d'4  d'4 | % 12
     d'2 bes4 bes4\! | % 13
     bes2( a2) | % 14
     bes2. r4 | % 15
@@ -315,11 +315,12 @@ IVSanctusBMusic = {
     d2. r4 | % 5
     g,1 | % 6
     g,2. r4 | % 7
-    c2\< c4 b,4\! | % 8
+%     
+    \hairpinOffset #3.5 c2\< c4 b,4\! | % 8
     b,4( a,4) g,2 | % 9
-    a,2\> a,2 | \barNumberCheck #10
+    \hairpinOffset #3.5 a,2\> a,2 | \barNumberCheck #10
     d2.\! r4 | % 11
-    \dynamicsAllInside #-0.5 #3 g2\f\< g4 g4 | % 12
+    \hairpinOffset #4.5 \once \override DynamicLineSpanner #'after-line-breaking = #(line-break-offset 3.5 4.5) g2\f\< g4 g4 | % 12
     bes2 bes4 bes4\! | % 13
     es1 | % 14
     bes,2. r4 | % 15
diff --git a/Pembaur_VierteLateinischeMesse_05_Benedictus.ly b/Pembaur_VierteLateinischeMesse_05_Benedictus.ly
index 96e57116648715f35fd6a70bd6971c88dccb552b..ff34fe02c75d6f8c5597e396d04c1b4463dcbf87 100644
--- a/Pembaur_VierteLateinischeMesse_05_Benedictus.ly
+++ b/Pembaur_VierteLateinischeMesse_05_Benedictus.ly
@@ -323,14 +323,14 @@ VBenedictusVaMusic = \relative c' {
 }
 
 VBenedictusSMusic =  {
-  a'16\p a'16 | % 1
-  a'4\< a'8 c''8\! | % 2
-  d''4\> c''8 a'8\! | % 3
+  \dynamicsUpInside #-1.5 a'16\p a'16 | % 1
+  \hairpinOffset #3.5 a'4\< a'8 c''8\! | % 2
+  \hairpinOffset #3.5 d''4\> c''8 a'8\! | % 3
   f'8 g'16 a'16 bes'8\> a'8\! | % 4
   g'4 r8 g'16 g'16 | % 5
-  g'4\< g'8 bes'8\! | % 6
+  \hairpinOffset #3.5 g'4\< g'8 bes'8\! | % 6
   c''4 bes'8 g'8 | % 7
-  e'8\> f'16 g'16 a'8 g'8\! | % 8
+  \hairpinOffset #3.5 e'8\> f'16 g'16 a'8 g'8\! | % 8
   f'4 r4 | R2 | % 10
   b'8([ d''8)] c''8([ b'8)] | % 11
   a'4 a'4 | % 12
@@ -339,26 +339,26 @@ VBenedictusSMusic =  {
   e''4 f''8 d''8 | % 15
   b'8 c''16 d''16 e''8 d''8 | % 16
   c''4 r4 | % 17
-  r4 r8 b'8\f | % 18
+  r4 r8 \dynamicsUpInside #-1 b'8\f | % 18
   c''4 c''8 e''8 | % 19
   f''8 f''16 f''16 e''8 d''8 | \barNumberCheck #20
   c''4 r4 | R2 | % 22
-  r4 r8 g'16\p g'16 | % 23
-  a'4\< a'8 c''8\! | % 24
-  d''4\> c''8 a'8\! | % 25
-  f'8 g'16 a'16\> bes'8\! a'8 | % 26
+  r4 r8 \dynamicsUpInside #-1.5 g'16\p g'16 | % 23
+  \hairpinOffset #3.5 a'4\< a'8 c''8\! | % 24
+  \hairpinOffset #3.5 d''4\> c''8 a'8\! | % 25
+  f'8 g'16 \hairpinOffset #3.5 a'16\> bes'8\! a'8 | % 26
   g'4 r8 g'16 g'16 | % 27
-  g'4\< g'8 bes'8\! | % 28
+  \hairpinOffset #3.5 g'4\< g'8 bes'8\! | % 28
   c''4 bes'8 g'8 | % 29
   e'8 f'16 g'16 a'8 g'8 | \barNumberCheck #30
   f'4 r4 | R2 | % 32
-  b'8\f([ d''8)] c''8([ b'8)] | % 33
+  \dynamicsUpInside #-1.5 b'8\f([ d''8)] c''8([ b'8)] | % 33
   a'4 a'4 | % 34
   c''8([ e''8)] d''8([ c''8)] | % 35
-  b'4\< c''8 d''16([ e''16)] | % 36
-  f''4\!\f f''8 d''8 | % 37
-  c''8\> c''16 c''16 a'8 g'8\! | % 38
-  f'4 r8 f'8\f | % 39
+  \hairpinOffset #4 b'4\< c''8 d''16([ e''16)] | % 36
+  \dynamicsAllInside #-1.5 #2.5 f''4\!\f f''8 d''8 | % 37
+  \hairpinOffset #3.5 c''8\> c''16 c''16 a'8 g'8\! | % 38
+  f'4 r8 \dynamicsUpInside #-1.5 f'8\f | % 39
   bes'4 bes'8 f'8 | \barNumberCheck #40
   d''8 d''8 c''8 bes'8 | % 41
   a'4( g'4) | % 42
@@ -366,14 +366,14 @@ VBenedictusSMusic =  {
 }
 
 VBenedictusAMusic = {
-  f'16\p f'16 | % 1
-  f'4\< f'8 f'8\! | % 2
-  d'8\>([ e'8)] f'8 c'8\! | % 3
-  d'8 c'16 f'16 d'8\> d'8\! | % 4
+  \dynamicsUpInside #-1.5 f'16\p f'16 | % 1
+  \hairpinOffset #3.5 f'4\< f'8 f'8\! | % 2
+  \hairpinOffset #3.5 d'8\>([ e'8)] f'8 c'8\! | % 3
+  d'8 c'16 f'16 \hairpinOffset #3.5 d'8\> d'8\! | % 4
   e'4 r8 e'16 e'16 | % 5
-  d'8\<([ es'8)] d'8 g'8\! | % 6
+  \hairpinOffset #3.5 d'8\<([ es'8)] d'8 g'8\! | % 6
   g'8([ fis'8)] g'8 d'8 | % 7
-  c'8\> c'16 e'16 f'8 e'8\! | % 8
+  \hairpinOffset #3.5 c'8\> c'16 e'16 f'8 e'8\! | % 8
   f'4 r4 | R2 | % 10
   g'8([ b'8)] a'8([ g'8)] | % 11
   f'8([ a'8)] g'8([ f'8)] | % 12
@@ -381,27 +381,27 @@ VBenedictusAMusic = {
   e'4 e'8 g'8 | % 14
   g'4 a'8 a'8 | % 15
   g'8 g'16 g'16 g'8 f'8 | % 16
-  e'8 c'8\f e'8 g'16 g'16 | % 17
+  e'8 \dynamicsUpInside #-1 c'8\f e'8 g'16 g'16 | % 17
   g'4 f'4 | % 18
   e'4 c'4 | % 19
   f'8 f'16 f'16 f'8 f'8 | \barNumberCheck #20
   e'4 r4 | R2 | % 22
-  r4 r8 e'16\p e'16 | % 23
-  f'4\< f'8 f'8\! | % 24
-  d'8\>([ e'8)] f'8 c'8\! | % 25
-  d'8 c'16 f'16\> d'8\! d'8 | % 26
+  r4 r8 \dynamicsUpInside #-1.5 e'16\p e'16 | % 23
+  \hairpinOffset #3.5 f'4\< f'8 f'8\! | % 24
+  \hairpinOffset #3.5 d'8\>([ e'8)] f'8 c'8\! | % 25
+  d'8 c'16 \hairpinOffset #3.5 f'16\> d'8\! d'8 | % 26
   e'4 r8 e'16 e'16 | % 27
-  d'8\<([ es'8)] d'8 g'8\! | % 28
+  \hairpinOffset #3.5 \ignoreSlur d'8\<([ es'8)] d'8 g'8\! | % 28
   g'8([ fis'8)] g'8 d'8 | % 29
   c'8 c'16 e'16 f'8 e'8 | \barNumberCheck #30
   f'4 r4 | R2 | % 32
-  g'8\f([ b'8)] a'8([ g'8)] | % 33
+  \dynamicsUpInside #-1.5 g'8\f([ b'8)] a'8([ g'8)] | % 33
   f'8([ a'8)] g'8([ f'8)] | % 34
   a'8([ c''8)] b'8([ a'8)] | % 35
-  e'4\< e'8 f'16([ g'16)] | % 36
+  \hairpinOffset #3.5 e'4\< e'8 f'16([ g'16)] | % 36
   a'4\!\f bes'8 f'8 | % 37
-  f'8\> e'16 f'16 f'8 e'8\! | % 38
-  f'4 r8 f'8\f | % 39
+  \hairpinOffset #3.5 f'8\> e'16 f'16 f'8 e'8\! | % 38
+  f'4 r8 \dynamicsUpInside #-1.5 f'8\f | % 39
   f'4 f'8 f'8 | \barNumberCheck #40
   f'8 f'8 f'8 f'8 | % 41
   f'4( e'4) | % 42
@@ -409,16 +409,16 @@ VBenedictusAMusic = {
 }
 
 VBenedictusTMusic = {
-  c'16\p c'16 |
-  c'4\< c'8 a8\! | % 2
-  bes4\> a8 a8\! | % 3
-  a8 g16 f16 g8\> f8\! | % 4
+  \dynamicsUpInside #-1.5 c'16\p c'16 |
+  \hairpinOffset #3.5 c'4\< c'8 a8\! | % 2
+  \hairpinOffset #3.5 bes4\> a8 a8\! | % 3
+  a8 g16 f16 \hairpinOffset #3.5 g8\> f8\! | % 4
   e4 r8 c'16 c'16 | % 5
-  bes8\<([ c'8)] bes8 d'8\! | % 6
+  \hairpinOffset #3.5 bes8\<([ c'8)] bes8 d'8\! | % 6
   es'4 d'8 bes8 | % 7
-  bes8\> a16 g16 c'8 bes8\! | % 8
+  \hairpinOffset #3.5 bes8\> a16 g16 c'8 bes8\! | % 8
   a4 r4 | % 9
-  c'8\mf([ e'8)] d'8([ c'8)] | \barNumberCheck #10
+  \dynamicsUpInside #-3 c'8\mf([ e'8)] d'8([ c'8)] | \barNumberCheck #10
   g4 g8 r8 | % 11
   d'8([ f'8)] e'8([ d'8)] | % 12
   a4 a8 a8 | % 13
@@ -426,27 +426,27 @@ VBenedictusTMusic = {
   c'4 c'8 f'8 | % 15
   f'8 e'16 d'16 c'8 b8 | % 16
   c'4 r4 | % 17
-  r8 g8\f b8 d'16 d'16 | % 18
+  r8 \dynamicsUpInside #-1.5 g8\f b8 d'16 d'16 | % 18
   c'2~ | % 19
   c'4 b4 | \barNumberCheck #20
   c'4 r4 | R2 | % 22
-  r4 r8 c'16\p c'16 | % 23
-  c'4\< c'8 a8\! | % 24
-  bes4\> a8 a8\! | % 25
-  a8 g16 f16\> g8\! f8 | % 26
+  r4 r8 \dynamicsUpInside #-1.5 c'16\p c'16 | % 23
+  \hairpinOffset #3.5 c'4\< c'8 a8\! | % 24
+  \hairpinOffset #3.5 bes4\> a8 a8\! | % 25
+  a8 g16 \hairpinOffset #3.5 f16\> g8\! f8 | % 26
   e4 r8 c'16 c'16 | % 27
-  bes8\<([ c'8)] bes8 d'8\! | % 28
+  \hairpinOffset #3.5 bes8\<([ c'8)] bes8 d'8\! | % 28
   es'4 d'8 bes8 | % 29
   bes8 a16 g16 c'8 bes8 | \barNumberCheck #30
   a4 r4 | % 31
-  c'8\f([ e'8)] d'8([ c'8)] | % 32
+  \dynamicsUpInside #-1 c'8\f([ e'8)] d'8([ c'8)] | % 32
   g4 g8 r8 | % 33
   d'8([ f'8)] e'8([ d'8)] | % 34
   a4 a8 a8 | % 35
-  a8\<([ gis8)] a8 c'8 | % 36
+  \hairpinOffset #3.5 a8\<([ gis8)] a8 c'8 | % 36
   c'8\!\f([ es'8)] d'8 bes8 | % 37
-  a8\> g16 a16 c'8 bes8\! | % 38
-  a4 r8 f8\f | % 39
+  \hairpinOffset #3.5 a8\> g16 a16 c'8 bes8\! | % 38
+  a4 r8 \dynamicsUpInside #-1.5 f8\f | % 39
   d'4 d'8 f8 | \barNumberCheck #40
   bes8 bes8 c'8 d'8 | % 41
   c'4.( bes8) | % 42
@@ -454,41 +454,41 @@ VBenedictusTMusic = {
 }
 
 VBenedictusBMusic = {
-  f16\p f16 |
-  f4\< f8  f8\! | % 2
-  f4\> f8 f8\! | % 3
-  d8 e16 f16 bes,8\> bes,8\! | % 4
+  \dynamicsUpInside #-1.5 f16\p f16 |
+  \hairpinOffset #3.5 f4\< f8  f8\! | % 2
+  \hairpinOffset #3.5 f4\> f8 f8\! | % 3
+  d8 e16 f16 \hairpinOffset #3.5 bes,8\> bes,8\! | % 4
   c4 r8 c16 c16 | % 5
-  g4\< g8 g8\! | % 6
+  \hairpinOffset #3.5 g4\< g8 g8\! | % 6
   g8([ a8)] bes8 bes,8 | % 7
-  c8\> c16 c16 c8 c8\! | % 8
+  \hairpinOffset #4 c8\> c16 c16 c8 c8\! | % 8
   f4 r4 | R2 | \barNumberCheck #10
   g4 g4 | % 11
   d4 d4 | % 12
   a4 a4 | % 13
   e4 a8 g8 | % 14
-  c'8([ b8)] a8 f8 | % 15
+  \ignoreSlur c'8([ b8)] a8 f8 | % 15
   g8 g16 g16 g8 g8 | % 16
   c4 r4 | R2 | % 18
-  r8 e8\f g8  bes16 bes16 | % 19
-  bes8([ a8)] g4 | \barNumberCheck #20
+  r8 \dynamicsUpInside #-1.5 e8\f g8  bes16 bes16 | % 19
+  \ignoreSlur bes8([ a8)] g4 | \barNumberCheck #20
   c4 r4 | R2 | % 22
-  r4 r8 c16\p c16 | % 23
-  f4\< f8 f8\! | % 24
-  f4\> f8 f8\! | % 25
-  d8 e16 f16\> bes,8\! bes,8 | % 26
+  r4 r8 \dynamicsUpInside #-1.5 c16\p c16 | % 23
+  \hairpinOffset #3.5 f4\< f8 f8\! | % 24
+  \hairpinOffset #3.5 f4\> f8 f8\! | % 25
+  d8 e16 \hairpinOffset #3.5 f16\> bes,8\! bes,8 | % 26
   c4 r8 c16 c16 | % 27
-  g4\< g8 g8\! | % 28
+  \hairpinOffset #3.5 g4\< g8 g8\! | % 28
   g8([ a8)] bes8 bes,8 | % 29
   c8 c16 c16 c8 c8 | \barNumberCheck #30
   f4 r4 | R2 | % 32
-  g4\f g4 | % 33
+  \dynamicsUpInside #-1.5 g4\f g4 | % 33
   d4 d4 | % 34
   a4 a4 | % 35
-  e4\< a8 g8 | % 36
+  \hairpinOffset #3.5 e4\< a8 g8 | % 36
   f4\!\f bes,8 bes,8 | % 37
-  c8\> c16 c16 c8 c8\! | % 38
-  f4 r8 f8\f | % 39
+  \hairpinOffset #4 c8\> c16 c16 c8 c8\! | % 38
+  f4 r8 \dynamicsUpInside #-1.5 f8\f | % 39
   bes4 bes8 f8 | \barNumberCheck #40
   bes,8 bes,8 a,8 bes,8 | % 41
   c2 | % 42
diff --git a/Pembaur_VierteLateinischeMesse_06_Agnus.ly b/Pembaur_VierteLateinischeMesse_06_Agnus.ly
index c82fe922f86432d6632010f68490afd8bac4a94f..7e838906519642940928c24b0ba05a8aaad48930 100644
--- a/Pembaur_VierteLateinischeMesse_06_Agnus.ly
+++ b/Pembaur_VierteLateinischeMesse_06_Agnus.ly
@@ -280,140 +280,140 @@ VIAgnusVaMusic = \relative es {
 
 VIAgnusSMusic = {
   R1*3  | % 4
-  r2 r4 d'8\p d'8 | % 5
-  es'2 f'4\< f'8 f'8 | % 6
+  r2 r4 \dynamicsUpInside #-1.5 d'8\p d'8 | % 5
+  es'2 \hairpinOffset #3.5 f'4\< f'8 f'8 | % 6
   g'4( bes'4)\! as'4( f'4) | % 7
-  es'2(\> f'2) | % 8
+  \hairpinOffset #3.5 es'2(\> f'2) | % 8
   es'2\! r2 | R1*3 | % 12
-  r2 r4 f'8\p f'8 | % 13
-  g'2\< as'4 as'8 as'8\! | % 14
+  r2 r4 \dynamicsUpInside #-1.5 f'8\p f'8 | % 13
+  \hairpinOffset #3.5 g'2\< as'4 as'8 as'8\! | % 14
   bes'4( des''4 c''4) as'4 | % 15
-  g'2(\> as'4 g'4) | % 16
+  \hairpinOffset #3.5 g'2(\> as'4 g'4) | % 16
   f'2\! r2 | R1*4 \bar "||" % 21
   \VIAgnusSettingsII
-  g'4.\mf e'8 c'4 d'4 | % 22
+  \dynamicsAllInside #-3.2 #1 g'4.\mf e'8 c'4 d'4 | % 22
   e'4( f'4) e'4 g'4 | % 23
-  a'2\< b'2 | % 24
+  \hairpinOffset #3.5 a'2\< b'2 | % 24
   c''4\! e''4 d''4 c''4 | % 25
   g'4( c''2  b'4) | % 26
   c''2 r2 | R1*2 | % 29
-  r2 r4 f''4\f | \barNumberCheck #30
+  r2 r4 \dynamicsUpInside #-2 f''4\f | \barNumberCheck #30
   e''4( f''4) e''4( d''4) | % 31
   c''2( b'2) | % 32
-  c''4 a'8\p a'8 g'4 f'4 | % 33
-  f'4( e'2 d'4) | % 34
+  c''4 \dynamicsUpInside #-1.5 a'8\p a'8 g'4 f'4 | % 33
+  \ignoreSlur f'4( e'2 d'4) | % 34
   c'2 r2 | % 35
-  g'1\p | % 36
+  \dynamicsUpInside #-0.5 g'1\p | % 36
   a'2( d'4. e'8) | % 37
-  e'1\fermata \bar "|." % 0
+  \ignoreFermata e'1\fermata \bar "|." % 0
 }
 
 VIAgnusAMusic = {
   R1*3| % 4
-  r2 r4 b8\p b8 | % 5
-  c'2 d'4\< d'8 d'8 | % 6
+  r2 r4 \dynamicsUpInside #-1.5 b8\p b8 | % 5
+  c'2 \hairpinOffset #3.5 d'4\< d'8 d'8 | % 6
   es'4( des'4)\! c'4( ces'4) | % 7
-  bes4(\> es'2   d'4) | % 8
+  \hairpinOffset #3.5 bes4(\> es'2   d'4) | % 8
   es'2\! r2 | R1*3 | % 12
-  r2 r4 d'8\p d'8 | % 13
-  es'2\< es'4 es'8 es'8\! | % 14
+  r2 r4 \dynamicsUpInside #-1.5 d'8\p d'8 | % 13
+  \hairpinOffset #3.5 es'2\< es'4 es'8 es'8\! | % 14
   es'4( e'2) f'4  | % 15
-  f'2(\> e'2) | % 16
+  \hairpinOffset #3.5 f'2(\> e'2) | % 16
   f'2\! r2 | R1*4 \bar "||" % 21
   \VIAgnusSettingsII
-  g'4.\mf e'8 c'4 d'4 | % 22
+  \dynamicsAllInside #-3.2 #1 g'4.\mf e'8 c'4 d'4 | % 22
   e'4( f'4) e'4 e'4 | % 23
-  f'4(\< a'2) gis'4 | % 24
+  \hairpinOffset #3.5 f'4(\< a'2) gis'4 | % 24
   a'4\! a'4 a'4 a'4 | % 25
   g'2( f'2) | % 26
   e'2 r2 | % 27
-  r2 r4 f'4\f | % 28
+  r2 r4 \dynamicsUpInside #-1.5 f'4\f | % 28
   e'4( f'4) e'2 | % 29
   g'1( | \barNumberCheck #30
   g'4 a'4) g'4( f'4) | % 31
   f'4( e'2 d'4) | % 32
-  c'4 f'8\p f'8 e'4 d'4 | % 33
+  c'4 \dynamicsUpInside #-1.5 f'8\p f'8 e'4 d'4 | % 33
   c'2( b2) | % 34
   c'2 r2 | % 35
-  r2 d'2\p | % 36
+  r2 \dynamicsUpInside #-1.5 d'2\p | % 36
   c'2( b4. c'8) | % 37
-  c'1\fermata \bar "|."
+  \ignoreFermata c'1\fermata \bar "|."
 }
 
 VIAgnusTMusic = {
   R1*3 | % 4
-  r2 r4 g8\p g8 | % 5
-  g2 bes4\< bes8 bes8 | % 6
+  r2 r4 \dynamicsUpInside #-1.5 g8\p g8 | % 5
+  g2 \hairpinOffset #3.5 bes4\< bes8 bes8 | % 6
   bes4( g4)\! as2 | % 7
-  g2(\> as2) | % 8
+  \hairpinOffset #3.5 g2(\> as2) | % 8
   g2\! r2 | % 9
-  bes4.\p g8 es4 f8 f8 | \barNumberCheck #10
+  \dynamicsUpInside #-1.5 bes4.\p g8 es4 f8 f8 | \barNumberCheck #10
   g4( as4) g4 g4 | % 11
   bes4 bes4 as4( g4) | % 12
   f2 r4 bes8 bes8 | % 13
-  bes2\< c'4 c'8 c'8\! | % 14
+  \hairpinOffset #3.5 bes2\< c'4 c'8 c'8\! | % 14
   bes2 as2 | % 15
-  bes2\>( c'2) | % 16
+  \hairpinOffset #3.5 bes2\>( c'2) | % 16
   as2\! r2 | % 17
-  c'4.\mf as8 f4 g8 g8 | % 18
-  as4(\< bes4 ) as4 as4\! | % 19
-  c'4\> c'4 bes4 ( as4) | \barNumberCheck #20
+  \dynamicsUpInside #-1.5 c'4.\mf as8 f4 g8 g8 | % 18
+  \hairpinOffset #3.5 as4(\< bes4 ) as4 as4\! | % 19
+  \hairpinOffset #3.5 c'4\> c'4 bes4 ( as4) | \barNumberCheck #20
   g2.\!\p r4  \bar "||" % 21
   \VIAgnusSettingsII
-  g4.\mf e8 c4 d4 | % 22
+  \dynamicsAllInside #-3.2 #1 g4.\mf e8 c4 d4 | % 22
   e4( f4) e4 c'4 | % 23
-  c'2\< e'2 | % 24
+  \hairpinOffset #3.5 c'2\< e'2 | % 24
   c'4\! cis'4 d'4 dis'4 | % 25
   e'2( d'2) | % 26
-  c'2 r4 c'4\f | % 27
+  c'2 r4 \dynamicsUpInside #-1.5 c'4\f | % 27
   b4( c'4) b2 | % 28
-  c'4( a4 g4 c'4 | % 29
+  \ignoreSlur c'4( a4 g4 c'4 | % 29
   d'4 e'4 f'4) e'8([ d'8)] | \barNumberCheck #30
   c'4 c'4 g4 a4 | % 31
   g2.( f4) | % 32
-  e4 r4 r4 a4\p | % 33
+  e4 r4 r4 \dynamicsUpInside #-1.5 a4\p | % 33
   g2.( f4) | % 34
   e2 r2 | % 35
-  r2 f2\p | % 36
+  r2 \dynamicsUpInside #-1.5 f2\p | % 36
   e2( g2) | % 37
-  g1\fermata \bar "|." % 0
+  \ignoreFermata g1\fermata \bar "|." % 0
 }
 
 VIAgnusBMusic = {
-  g4.\p es8 c4 d8 d8 | % 2
+  \dynamicsUpInside #-1.5 g4.\p es8 c4 d8 d8 | % 2
   es4( f4) es4 es4 | % 3
   g4 g4 f4( es4) | % 4
   d2 r4 g,8 g,8 | % 5
-  c2 bes,4\< bes,8 bes,8 | % 6
+  c2 \hairpinOffset #3.5 bes,4\< bes,8 bes,8 | % 6
   es4( e4)\! f4( as,4) | % 7
-  bes,1\> | % 8
+  \hairpinOffset #3.5 bes,1\> | % 8
   es2\! r2 | R1*3 | % 12
-  r2 r4 bes,8\p bes,8 | % 13
-  es2\< as4 as8 as8\! | % 14
+  r2 r4 \dynamicsUpInside #-1.5 bes,8\p bes,8 | % 13
+  \hairpinOffset #3.5 es2\< as4 as8 as8\! | % 14
   g2( as4) as,4 | % 15
-  des2(\> c2) | % 16
+  \hairpinOffset #3.5 des2(\> c2) | % 16
   f2\! r2 | % 17
-  c'4.\mf as8 f4 g8 g8 | % 18
-  as4(\< bes4) as4 as4\! | % 19
-  c'4\> c'4 bes4( as4) | \barNumberCheck #20
+  \dynamicsUpInside #-4 c'4.\mf as8 f4 g8 g8 | % 18
+  \hairpinOffset #4.5 as4(\< bes4) as4 as4\! | % 19
+  \hairpinOffset #4.5 c'4\> c'4 bes4( as4) | \barNumberCheck #20
   g2.\!\p r4 \bar "||" % 21
   \VIAgnusSettingsII
-  g4.\mf e8 c4 d4 | % 22
+  \dynamicsAllInside #-3.2 #1 g4.\mf e8 c4 d4 | % 22
   e4( f4) e4 c4 | % 23
-  f2\< e2 | % 24
+  \hairpinOffset #3.5 f2\< e2 | % 24
   a4\! g4 f4 fis4 | % 25
   g2( g,2) | % 26
   c2 r2 | R1 | % 28
-  r2 r4 c4\f | % 29
+  r2 r4 \dynamicsUpInside #-1.5 c4\f | % 29
   b,4( c4) b,2 | \barNumberCheck #30
   c2. f4 | % 31
   g2( g,2) | % 32
-  a,4 r4 r4 f4\p | % 33
+  a,4 r4 r4 \dynamicsUpInside #-1.5 f4\p | % 33
   g2( g,2) | % 34
   c2 r2 | % 35
-  g,1\p | % 36
+  \dynamicsUpInside #-0.5 g,1\p | % 36
   g,1 | % 37
-  c1\fermata \bar "|." 
+  \ignoreFermata c1\fermata \bar "|." 
 }
 
 VIAgnusSLyrics = \lyricmode {
diff --git a/Pembaur_VierteLateinischeMesse_ChoralScore.ly b/Pembaur_VierteLateinischeMesse_ChoralScore.ly
index 4412d87b0b2c08ba94bc04d468f1256faf8fcbff..441016fceafb81e00c8ce8ca2dc9614b2fe8ac03 100644
--- a/Pembaur_VierteLateinischeMesse_ChoralScore.ly
+++ b/Pembaur_VierteLateinischeMesse_ChoralScore.ly
@@ -3,7 +3,6 @@
 \include "Pembaur_VierteLateinischeMesse_Settings_Vocal.ly"
 #(set-global-staff-size 15)
 
-#(ly:set-option 'debug-skylines #t)
 
 \header { 
   instrument = \ChInstrumentTitle
@@ -24,11 +23,13 @@
 
   between-system-space = #0.1
   between-system-padding = #0.1
-%   ragged-bottom=##f
+%   ragged-bottom=##t
   ragged-last-bottom=##t
 }
-\paper { annotate-spacing = ##t 
-ragged-bottom = ##t
+\paper { 
+annotate-spacing = ##t 
+% ragged-bottom = ##f
+#(define page-breaking ly:optimal-breaking)
 }
 #(ly:set-option 'debug-skylines #t)
 
diff --git a/Pembaur_VierteLateinischeMesse_ChoralScore.pdf b/Pembaur_VierteLateinischeMesse_ChoralScore.pdf
index e1cd2a7131485494bcaf80a296c9bcad209f7aba..fbe34c58a8b5f3080caf8eb9fbd4ba53b463f108 100644
Binary files a/Pembaur_VierteLateinischeMesse_ChoralScore.pdf and b/Pembaur_VierteLateinischeMesse_ChoralScore.pdf differ
diff --git a/Pembaur_VierteLateinischeMesse_ChoralScore.toc b/Pembaur_VierteLateinischeMesse_ChoralScore.toc
index edd8b17e281b729b3f6b1332e730234f0ce8ae8a..098150261a4dda36305119fdf7e699e4b62cf1b3 100644
--- a/Pembaur_VierteLateinischeMesse_ChoralScore.toc
+++ b/Pembaur_VierteLateinischeMesse_ChoralScore.toc
@@ -1,6 +1,6 @@
 1, section, 1, {Kyrie}, toc53,
 2, section, 1, {Gloria}, toc54,
 4, section, 1, {Credo}, toc55,
-7, section, 1, {Sanctus}, toc56,
-8, section, 1, {Benedictus}, toc57,
-9, section, 1, {Agnus}, toc58
\ No newline at end of file
+6, section, 1, {Sanctus}, toc56,
+7, section, 1, {Benedictus}, toc57,
+8, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_VierteLateinischeMesse_LongScore.pdf b/Pembaur_VierteLateinischeMesse_LongScore.pdf
index 5e77fa91eb66ff57b2821ac2e89ce8bb11dffff1..67b70332fb4b9eaa6b054246432e0902b6ea424d 100644
Binary files a/Pembaur_VierteLateinischeMesse_LongScore.pdf and b/Pembaur_VierteLateinischeMesse_LongScore.pdf differ
diff --git a/Pembaur_VierteLateinischeMesse_LongScore.toc b/Pembaur_VierteLateinischeMesse_LongScore.toc
index 9833ce4b675bf1df424082554cd1d7416099e9f1..f2ed3ec596c2ba1aea4c1f876baff99e22a5ca15 100644
--- a/Pembaur_VierteLateinischeMesse_LongScore.toc
+++ b/Pembaur_VierteLateinischeMesse_LongScore.toc
@@ -1,6 +1,6 @@
 1, section, 1, {Kyrie}, toc53,
-9, section, 1, {Gloria}, toc54,
-19, section, 1, {Credo}, toc55,
-33, section, 1, {Sanctus}, toc56,
-36, section, 1, {Benedictus}, toc57,
-42, section, 1, {Agnus}, toc58
\ No newline at end of file
+8, section, 1, {Gloria}, toc54,
+17, section, 1, {Credo}, toc55,
+28, section, 1, {Sanctus}, toc56,
+31, section, 1, {Benedictus}, toc57,
+36, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_VierteLateinischeMesse_OrganScore.ly b/Pembaur_VierteLateinischeMesse_OrganScore.ly
index 28bd33f155cca985b266381f3ec3b892e62f6fa4..8de0d92d8b801784e77a046148f0db77eccb9ce1 100644
--- a/Pembaur_VierteLateinischeMesse_OrganScore.ly
+++ b/Pembaur_VierteLateinischeMesse_OrganScore.ly
@@ -1,12 +1,38 @@
 %lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_VierteLateinischeMesse_Settings_FullScore.ly"
-#(set-global-staff-size 16.5)
+% #(set-global-staff-size 16.5)
+#(set-global-staff-size 15)
 
 \header { 
   instrument = "Coro e organo"
   scoretype = "Orgelpartitur / Organ Score"
 }
 
+
+\paper {
+  ragged-bottom = ##t
+  ragged-last-bottom = ##t
+  #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
+}
+\paper {
+%   bookTitleMarkup = \titlePageMarkup
+  left-margin=1.2\cm
+  line-width=18.5\cm
+  top-margin=1\cm
+  bottom-margin=1\cm
+
+  between-system-space = #0.1
+  between-system-padding = #0.1
+%   ragged-bottom=##t
+  ragged-last-bottom=##t
+}
+\paper { 
+annotate-spacing = ##t 
+% ragged-bottom = ##f
+#(define page-breaking ly:optimal-breaking)
+}
+#(ly:set-option 'debug-skylines #t)
+
 % \markup \null
 % \pageBreak
 % 
diff --git a/Pembaur_VierteLateinischeMesse_OrganScore.pdf b/Pembaur_VierteLateinischeMesse_OrganScore.pdf
index 049eac5731ed967b543523a4045cd7b3bd5a030f..c9888d29601b85f5b05c8b72171a968db2181366 100644
Binary files a/Pembaur_VierteLateinischeMesse_OrganScore.pdf and b/Pembaur_VierteLateinischeMesse_OrganScore.pdf differ
diff --git a/Pembaur_VierteLateinischeMesse_OrganScore.toc b/Pembaur_VierteLateinischeMesse_OrganScore.toc
index 97d207ba4c0e95b8115dac1c30819f5856280e28..02b8b1c5fdd46ee6f51201174c83dcf9373f9916 100644
--- a/Pembaur_VierteLateinischeMesse_OrganScore.toc
+++ b/Pembaur_VierteLateinischeMesse_OrganScore.toc
@@ -1,6 +1,6 @@
 1, section, 1, {Kyrie}, toc53,
-5, section, 1, {Gloria}, toc54,
-10, section, 1, {Credo}, toc55,
-17, section, 1, {Sanctus}, toc56,
-18, section, 1, {Benedictus}, toc57,
-21, section, 1, {Agnus}, toc58
\ No newline at end of file
+4, section, 1, {Gloria}, toc54,
+8, section, 1, {Credo}, toc55,
+14, section, 1, {Sanctus}, toc56,
+15, section, 1, {Benedictus}, toc57,
+18, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_VierteLateinischeMesse_Settings_Global.ly b/Pembaur_VierteLateinischeMesse_Settings_Global.ly
index 12a927117ff3a4e2d34b1799b5e0cb54655223b7..1cd83753e86b48a97b396cb059cdfb3a242a017b 100644
--- a/Pembaur_VierteLateinischeMesse_Settings_Global.ly
+++ b/Pembaur_VierteLateinischeMesse_Settings_Global.ly
@@ -198,3 +198,37 @@ hairpinOffset = #(define-music-function (parser location posY) (number?)
   \once \override DynamicLineSpanner #'Y-offset = $posY
   \once \override DynamicLineSpanner #'Y-extent = #(cons +0 -0.01)
 #})
+
+ignoreFermata = #(define-music-function (parser location) ()
+#{
+  \once \override Script #'Y-extent = #(cons +0 -0.01)
+#})
+
+ignoreMMNumber = #(define-music-function (parser location) ()
+#{
+  \once \override MultiMeasureRestNumber #'Y-extent = #(cons +0 -0.01)
+#})
+
+ignoreSlur = #(define-music-function (parser location) ()
+#{
+  \once \override Slur #'Y-extent = #(cons +0 -0.01)
+#})
+
+
+
+#(define ((line-break-offset before after) grob)
+  (let* ((orig (ly:grob-original grob))
+         ; All siblings if line-broken:
+         (siblings (if (ly:grob? orig) (ly:spanner-broken-into orig) '() )))
+    (if (>= (length siblings) 2)
+      ; We have been line-broken
+      (if (eq? (car (last-pair siblings)) grob)
+        ; Last sibling:
+        (ly:grob-set-property! grob 'Y-offset after)
+        ; Others get the before value:
+        (ly:grob-set-property! grob 'Y-offset before)
+      )
+    )
+  )
+)
+
diff --git a/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf
index 3a96a4add37f26b8c3932a6cb4ae08c456cfe4ec..5f90fc9b6ec3813a78eb2e403103db7d3994be53 100644
Binary files a/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf and b/Tex_Pembaur_VierteLateinischeMesse_ChoralScore.pdf differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf b/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf
index 48aea1f1491c1706fbb779edd36466aa82a64427..887f3cf650429f10cbfdd0dd0d9722992243e40d 100644
Binary files a/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf and b/Tex_Pembaur_VierteLateinischeMesse_Instruments.pdf differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf
index e0bc92c5166d1713efafa47481240e60d27bb064..0484502f803c3502bc56f75ad2c0f1db877ebc21 100644
Binary files a/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf and b/Tex_Pembaur_VierteLateinischeMesse_LongScore.pdf differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf
index 31f79673bf8568f77bf7fff4d5d7b1783ffe3562..c7d3118afe10d61da9d16a2009773765673162f1 100644
Binary files a/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf and b/Tex_Pembaur_VierteLateinischeMesse_OrchestralScore.pdf differ
diff --git a/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf b/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf
index 0668e80bcad8fbf270f5efbab5d6737536235f3d..d225c7ac25e7b77eef53adc48c48759aeae510c2 100644
Binary files a/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf and b/Tex_Pembaur_VierteLateinischeMesse_OrganScore.pdf differ