diff --git a/4-4_marches/green_glens_of_antrim/side.ly b/4-4_marches/green_glens_of_antrim/side.ly
index 0912756..bab2dbc 100644
--- a/4-4_marches/green_glens_of_antrim/side.ly
+++ b/4-4_marches/green_glens_of_antrim/side.ly
@@ -1,29 +1,27 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
+	\new PipeBandDrumStaff {
+		\global
 		<<
 			\new NullVoice = "format" {
-				\repeat volta 2 {
-					\part \halfline \markTextEol "Fine"
+				\repeat segno 2 {
+					\repeat volta 2 {
+						\part \line
+						\volta 2 {
+							\fine
+						}
+					}
+					\break
+					\section
+					\part \line
+					\section
 				}
-				\break
-				\part
-				\halfline
-				\markTextEol "D.C. al Fine"
-				\bar "||"
 			}%Format
 			\new DrumVoice = "side" {
 				\sideglobal
diff --git a/4-4_marches/muss_i_denn/side.ly b/4-4_marches/muss_i_denn/side.ly
index c718394..0c0d4b9 100644
--- a/4-4_marches/muss_i_denn/side.ly
+++ b/4-4_marches/muss_i_denn/side.ly
@@ -1,34 +1,30 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
-		\sideglobal
+	\new PipeBandDrumStaff {
+		\global
 		<<
 			\new NullVoice = "format" {
-				\repeat volta 2 {
-					\part \halfline
+				\repeat segno 2 {
+					\repeat volta 2 {
+						\part \halfline
+						\volta 2 {
+							\fine
+						}
+					}
+					\break
+					\section
+					\part \repeat unfold 4 \measure
+					\section
 				}
-				\markTextEol "Fine"
-				\break
-				\part \repeat unfold 4 \measure
-				\markTextEol "D.C. al Fine"
-				\bar "|."
 			}%Format
-			
 			\new DrumVoice = "side" {
+				\sideglobal
 				\snareA s4
 
 				\snareBA s4
diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly
index dfe6c3f..4b19100 100644
--- a/4-4_marches/rowan_tree/side.ly
+++ b/4-4_marches/rowan_tree/side.ly
@@ -1,35 +1,28 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
-		<<
-			\new NullVoice = "format" {
-				\repeat volta 2 {
-					\part \halfline \markTextEol "Fine"
-				}
-				\break
-				\part \halfline \markTextEol "D.C. al Fine"\bar "||"
-			}%Format
-			
-			\new DrumVoice = "side" {
-				\sideglobal
-				\snareA s4
-
-				\snareBA
+	\new PipeBandDrumStaff {
+		\global
+		\sideglobal
+		\repeat segno 2 {
+			\repeat volta 2 {
+				\partial 4
+				\snareA
 			}
-		>>
+			\volta 2 \fine
+
+			\volta 1 {
+			  \allowBreak
+			  \break
+			  \snareBA
+			  \section
+			}
+		}
 	}
 	\header {
 		title = \title
diff --git a/4-4_marches/scotland_the_brave/high-side.ly b/4-4_marches/scotland_the_brave/high-side.ly
index d3e813d..a298897 100644
--- a/4-4_marches/scotland_the_brave/high-side.ly
+++ b/4-4_marches/scotland_the_brave/high-side.ly
@@ -1,31 +1,28 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
-	\sideglobal
-        <<
-			{
-				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \markTextEol "D.C. al Fine" \bar "||"
+	\new PipeBandDrumStaff {
+		\global
+		\sideglobal
+		%\unfoldRepeats
+		\repeat segno 2 {
+			\repeat volta 2 {
+				\partial 8 \snareA
 			}
-			{
-			 \snareA s8
-
-			 \snareBAhigh
+			\volta 2 \fine
+			\volta 1 {
+				\allowBreak
+				\section
+				\partial 8 \snareBAhigh
+				\section
+				\allowBreak
 			}
-		>>
+		}
 	}
 	\header {
 		title = #(string-append title " (high)" )
diff --git a/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly
index d6ae27a..b9a7427 100644
--- a/4-4_marches/scotland_the_brave/side.ly
+++ b/4-4_marches/scotland_the_brave/side.ly
@@ -1,26 +1,30 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
-	\sideglobal
-        <<
-			{
-				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \markTextEol "D.C. al Fine" \bar "||"
+	\new PipeBandDrumStaff {
+		\global
+		<<
+			\new NullVoice = "format" {
+				\repeat segno 2 {
+					\repeat volta 2 {
+						\part \line
+						\volta 2 {
+							\fine
+						}
+					}
+					\break
+					\section
+					\part \line
+					\section
+				}
 			}
-			{
+			\new DrumVoice = "side" {
+			\sideglobal
 			 \snareA s8
 
 			 \snareBA
diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly
index 4c8aabd..4388d89 100644
--- a/4-4_marches/the_leaving_of_liverpool/side.ly
+++ b/4-4_marches/the_leaving_of_liverpool/side.ly
@@ -6,8 +6,8 @@
 \include "./notes.side.ily"
 
 \score {
-    \new PipeBandDrumStaff {
-        \global
+	\new PipeBandDrumStaff {
+		\global
 		\sideglobal
 		\repeat volta 2 {
 			\partial 4 r8
diff --git a/4-4_marches/the_old_rustic_bridge/drums.ly b/4-4_marches/the_old_rustic_bridge/drums.ly
index 4126e00..c65784f 100644
--- a/4-4_marches/the_old_rustic_bridge/drums.ly
+++ b/4-4_marches/the_old_rustic_bridge/drums.ly
@@ -1,4 +1,4 @@
-\version "2.19.0"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
@@ -11,6 +11,7 @@
 	indent = 5.0
 	short-indent = 2.0
 }
+mBreak = {\break}
 
 \score {
 	\new StaffGroup <<
@@ -19,31 +20,35 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\global
-			\sideglobal
 			<<
 				\new NullVoice = "format" {
 					\part
-					\repeat volta 2 {
-						\measure
-						s2.
-					} \alternative {
-						{ s4 | \halfline }
-						{
-						  s4 |
-						  \halfline
-						  \fine
+					\repeat segno 2 {
+						\repeat volta 2 {
+							\measure
+							s2.
+						} \alternative {
+							{ s4 | \halfline }
+							{
+							  s4 |
+							  \halfline
+							  \fine
+							}
+						}
+
+						\volta 2 \fine
+						\volta 1 {
+							\allowBreak
+							\mBreak
+							\section
+							\part
+							\line
+							\section
 						}
 					}
-					\bar "||"
-					\break
-
-					\part
-					\line
-					\dcalfine
-					\bar "||"
-
 				}%End of Format
 				\new DrumVoice = "side" {
+					\sideglobal
 					\snareAupbeatA
 					\snareAA
 					\snareAB r8 \snareAupbeatB
@@ -59,12 +64,13 @@
 		} {
 			\tenorglobal
 
-			\drummode { g4 | }
+			s4 |
 			\tenorAA
 			\tenorABA r4
 			r8 g8 | \tenorABB s4
 
 			r4 \tenorBA
+			\section
 		}
 %{		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
diff --git a/4-4_marches/the_old_rustic_bridge/side.ly b/4-4_marches/the_old_rustic_bridge/side.ly
index 162bae0..826d4e3 100644
--- a/4-4_marches/the_old_rustic_bridge/side.ly
+++ b/4-4_marches/the_old_rustic_bridge/side.ly
@@ -1,41 +1,32 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-fine = {\mark \markup "Fine" }
-
 \score {
-    \new PipeBandDrumStaff {
-        \global
+	\new PipeBandDrumStaff {
+		\global
 		\sideglobal
-		<<
-			\new NullVoice = "format" {
-				\part
-				\repeat volta 2 {
-				  \halfline \measure << s2. { s2 \fine } >>
-				} \alternative {
-				  { s4 | }
-				  {
-				  }
-				}
-				%\bar "||"
-				\break
-
-				\part \line
-				\dcalfine
-				\bar "||"
-			}%Format
-			\new DrumVoice = "side" {
-				\snareAupbeatA
+		\partial 4 \snareAupbeatA
+		\repeat segno 2 {
+			\repeat volta 2 {
 				\snareA
-				r8 \snareAupbeatB
+				\volta 2 \fine
+				\alternative {
+					\volta 1 { r8 \snareAupbeatB }
+				}
+			}
 
+			\volta 1 {
+				\allowBreak
+				\break
+				\section
+				\partial 4
 				r8 \snareBA
 			}
-		>>
+		}
 	}
 	\header {
 		title = \title
diff --git a/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly
index c1f88e0..3b6db1a 100644
--- a/4-4_marches/the_old_rustic_bridge/tenor.ly
+++ b/4-4_marches/the_old_rustic_bridge/tenor.ly
@@ -1,40 +1,34 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
+mBreak = {\break}
 \score {
-    \new PipeBandDrumStaff {
+	\new PipeBandDrumStaff {
 		\global
-        <<
-			{
-				\part \repeat volta 2 {
-					\halfline
-				} \alternative {
-					\halfline
-					{
-						\halfline
-						\fine
-					}
+		\tenorglobal
+		\partial 4 \drummode { g4 } |
+		\repeat segno 2 {
+			\repeat volta 2 {
+				\tenorAA
+				\alternative {
+					{ \tenorABA r4 }
+					{ \tenorABB r4 }
 				}
-				\bar "||"
-				\break
-
-				\line
-				\dcalfine
-				\bar "||"
 			}
-			{
-			  \drummode { g4 | } 
-			  \tenorAA
-			  \tenorABA r4
-			  \tenorABB r4
-
-			  \tenorBA
+			\volta 2 {\fine}
+			\volta 1 {
+				\allowBreak
+				\mBreak
+				\section
+				\tenorBA
+				\section
 			}
-		>>
+		}
+		
 	}
 	\header {
 		title = \title
diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily
index ae3820d..370d3c1 100644
--- a/4-4_marches/wings/notes.side.ily
+++ b/4-4_marches/wings/notes.side.ily
@@ -31,6 +31,6 @@ snareBA = \drummode {
 	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16. g32	d8:32(-> \< g8:32)(-> |
 	d8.)->\fr \! g16	d8:32( g16.) g32	d8:32( g16.) g32	\sextuplet { d16[ g d-> g d g] } |
 
-	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4\fr	\triplet { <> \p d16 g d } \flam g8 |
-	\flam d4	r4	d8:32(\dr \< g8:32)(->	d8:32)(->  \afterGrace g8:32)(->  {s8)\!\ofr}
+	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4	\triplet { <> \p d16 g d } \flam g8 |
+	\flam d4	r4	d8:32( \< g8:32)(->	d8:32)(->  \afterGrace g8:32)(->  {s8)\!\ofr}
 }
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index b403589..f346135 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -1,38 +1,38 @@
-\version "2.18.2"
+\version "2.24.1"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
+mbreak = {\break}
 
 \score {
-    \new PipeBandDrumStaff {
-        \global
+	\new PipeBandDrumStaff {
+		\global
+		\sideglobal
 		<<
 			\new NullVoice = "format" {
 				\partial 8 s8
-				\repeat volta 2 {
-					\quartline
-				} \alternative {
-				  	\quartline
-					{	\quartline 
-						\markTextEol "Fine"
+				\repeat segno 2 {
+					\repeat volta 2 {
+						\quartline
+					} \alternative {
+						\quartline
+						{	\quartline
+							\fine
+						}
 					}
-				}\bar "|."
-				\break
 
-				\partial 8 s8
-				\halfline 
-				\markTextEol "D.C. al Fine"
-				\bar "||"
+					\volta 1 {
+						\allowBreak
+						\mbreak
+						\partial 8 s8
+						\halfline
+						\bar "||"
+					}
+				}
 			}%Format
-			
 			\new DrumVoice = "side" {
 				\sideglobal
 				\snareAA