diff --git a/2-4_marches/black_bear.side.ly b/2-4_marches/black_bear.side.ly
index feb177b..0c1ccc3 100755
--- a/2-4_marches/black_bear.side.ly
+++ b/2-4_marches/black_bear.side.ly
@@ -3,9 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-	\drums {
+	\new PipeBandDrumStaff {
 		\time 2/4
+		\eighthBeaming
 
+		\drummode {
 		% Part 1
 			\repeat volta 2 {
 				\partial 8 d8:32( |
@@ -40,6 +42,7 @@
 				\flamd d8 d8:32( g8) \bar "|."
 
 	}% End of drums %
+	}
 
 	\header {
 		title = "Black Bear"
diff --git a/2-4_marches/black_bear.v1.2.side.ly b/2-4_marches/black_bear.v1.2.side.ly
index 710c759..95d94e8 100755
--- a/2-4_marches/black_bear.v1.2.side.ly
+++ b/2-4_marches/black_bear.v1.2.side.ly
@@ -3,8 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-   \new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+   \new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
diff --git a/2-4_marches/black_bear.v1.3.side.ly b/2-4_marches/black_bear.v1.3.side.ly
index 164a84a..132b3b6 100755
--- a/2-4_marches/black_bear.v1.3.side.ly
+++ b/2-4_marches/black_bear.v1.3.side.ly
@@ -5,7 +5,7 @@
 yell = \markup { \bold \small HOY }
 
 \score {
-   \new DrumStaff = "staff_side" {
+   \new PipeBandDrumStaff = "staff_side" {
 		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
diff --git a/2-4_marches/duncan_mcinness.side.ly b/2-4_marches/duncan_mcinness.side.ly
index 68cda82..1b6c293 100755
--- a/2-4_marches/duncan_mcinness.side.ly
+++ b/2-4_marches/duncan_mcinness.side.ly
@@ -3,8 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 2/4
+
+        \drummode {
         	\repeat volta 2{
 				\partial 8 d8:32( |
 				g8) d16. g32->		d16. d32 \flamg g8 |
@@ -76,7 +79,7 @@
 						\flamd d8 d8:32(	g4)
 						\bar "|."
 					}
-					\new DrumStaff{
+					\new PipeBandDrumStaff{
 						\once \omit Staff.TimeSignature
 						\flamd d16. g32 d16. d32	\flamg g16. d32 g16. g32 |
 						d16. \flamg g32 d16. d32	\flamg g8 d8:32( |
@@ -86,8 +89,8 @@
 					}
 				>>
 			}
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "Duncan McInness"
 		meter = "Drum Salute in Quick Time"
diff --git a/2-4_marches/mackenzie_highlanders.alternate.side.ly b/2-4_marches/mackenzie_highlanders.alternate.side.ly
index 829a22b..fcb0893 100755
--- a/2-4_marches/mackenzie_highlanders.alternate.side.ly
+++ b/2-4_marches/mackenzie_highlanders.alternate.side.ly
@@ -1,5 +1,5 @@
 \score {
-	\new DrumStaff = "staff_side" {
+	\new PipeBandDrumStaff = "staff_side" {
 		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
@@ -19,7 +19,7 @@
 				g8) \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
 				d8-> g8:32(->	d8:32)(-> \tuplet 3/2 { g16) d g } |
 
-				d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+				d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
 				d4:32(	d8)
 			}
 			\break
@@ -34,7 +34,7 @@
 			d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 			d8-> g8:32(->	d8:32)(-> \tuplet 3/2{ g16) d g } |
 
-			d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+			d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
 			d4:32(	d8) g8
 
 			\bar "||"
@@ -49,7 +49,7 @@
 			d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
 			d32 g d g-> d16.-> g32	d8:32(-> \tuplet 3/2 { g16) d g } |
 
-			d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+			d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
 			d4:32( d4)
 			\bar ":|"
 		}
diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly
index 2a1132b..49be3ec 100755
--- a/2-4_marches/mackenzie_highlanders.side.ly
+++ b/2-4_marches/mackenzie_highlanders.side.ly
@@ -1,6 +1,5 @@
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
@@ -13,7 +12,7 @@
 				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
 				\flam d8 d8:32(	g8:32)(-> \tuplet 3/2 { d16) g d } |
 
-				\flam g8 \drag d16. d32->		g16. \drag d32 d16. g32 |
+				\flam g8[ \drag d16. d32]->		g16.[ \drag d32 d16. g32] |
 				d4:32(		d8) d8:32( |
 
 				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
diff --git a/3-4_marches/on_the_road_to_passchendaele.side.ly b/3-4_marches/on_the_road_to_passchendaele.side.ly
index 4e4f6ce..b20daf1 100755
--- a/3-4_marches/on_the_road_to_passchendaele.side.ly
+++ b/3-4_marches/on_the_road_to_passchendaele.side.ly
@@ -3,8 +3,10 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 3/4
+
+		\drummode {
         	\repeat volta 2{
 				\flamd d8. g16		d4:32(		d8) d8:32( |
 				\tuplet 3/2 { g16) d g } \flamd d8		\flamd d4		d4:32( |
@@ -32,9 +34,8 @@
 				\flamd d8. g16		d4:32(		d8:32)(-> \tuplet 3/2 { g16) d g } |
 				d16. d32 \flamg g8		d4:32(		d4)
 			}
-		\break
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "On the Road to Passchendaele"
 		meter = "Retreat"
diff --git a/4-4_marches/51st_highland_division.side.ly b/4-4_marches/51st_highland_division.side.ly
index f608998..49491ea 100755
--- a/4-4_marches/51st_highland_division.side.ly
+++ b/4-4_marches/51st_highland_division.side.ly
@@ -3,52 +3,53 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
 
-		\repeat volta 2 {
-				\partial 8 d16. g32 |
-				d4:32(		d8.) g16		\flamd d8 d8:32(		g8) d8:32( |
-				g8.) g16		\flamd d8 \flamg g8		d4:32(->		d8.)-> g16 |
+		\drummode {
+			\repeat volta 2 {
+					\partial 8 d16. g32 |
+					d4:32(		d8.) g16		\flamd d8 d8:32(		g8) d8:32( |
+					g8.) g16		\flamd d8 \flamg g8		d4:32(->		d8.)-> g16 |
 
 
-		}
-		\alternative {
-			{
-				d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
-				\flamg g4		d4:32(		d4) r8
 			}
-			{
-				d8:32(-> g8)		\flamd d8 d8:32(		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
-				\flamg g4		d4:32(		d4) r8
+			\alternative {
+				{
+					d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
+					\flamg g4		d4:32(		d4) r8
+				}
+				{
+					d8:32(-> g8)		\flamd d8 d8:32(		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
+					\flamg g4		d4:32(		d4) r8
+				}
 			}
+
+			\break
+					d16. g32 |
+					d8:32(-> \tuplet 3/2 { g16) d g }		d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
+					\tuplet 3/2 { g16) d g } \flamd d16. g32->		\tuplet 3/2 { d16 g d } \flamg g8		d4:32(->		d8.)-> g16 |
+
+					d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
+
+				\set Timing.measureLength = #(ly:make-moment 7/8)
+					\flamg g4		d4:32(		d4) r8
+
+			\break
+				\set Timing.measureLength = #(ly:make-moment 1/8)
+					d16. g32 |
+				\set Timing.measureLength = #(ly:make-moment 4/4)
+					d4:32(		d8.) g16		\flamd d8 d8:32(		g8) d8:32( |
+					g8.) g16		\flamd d8 \flamg g8		d4:32(->		d8.)-> g16 |
+
+					d8:32(-> g8)		\flamd d8 d8:32(		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
+					\flamg g4		d4:32(		d4) r8
+			}% End of drums %
 		}
-
-        \break
-				d16. g32 |
-				d8:32(-> \tuplet 3/2 { g16) d g }		d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
-				\tuplet 3/2 { g16) d g } \flamd d16. g32->		\tuplet 3/2 { d16 g d } \flamg g8		d4:32(->		d8.)-> g16 |
-
-				d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
-
-			\set Timing.measureLength = #(ly:make-moment 7/8)
-				\flamg g4		d4:32(		d4) r8
-
-		\break
-			\set Timing.measureLength = #(ly:make-moment 1/8)
-				d16. g32 |
-			\set Timing.measureLength = #(ly:make-moment 4/4)
-				d4:32(		d8.) g16		\flamd d8 d8:32(		g8) d8:32( |
-				g8.) g16		\flamd d8 \flamg g8		d4:32(->		d8.)-> g16 |
-
-				d8:32(-> g8)		\flamd d8 d8:32(		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
-				\flamg g4		d4:32(		d4) r8
-    }% End of drums %
-
-
-}\header {
+	\header {
 		title = "51st Highland Division"
 		meter = "March"
 		composer = ""
 		instrument = "Side"
-	}
\ No newline at end of file
+	}
+}
\ No newline at end of file
diff --git a/4-4_marches/flett_from_flotta.side.ly b/4-4_marches/flett_from_flotta.side.ly
index 186660c..1baec6c 100755
--- a/4-4_marches/flett_from_flotta.side.ly
+++ b/4-4_marches/flett_from_flotta.side.ly
@@ -3,9 +3,9 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
-
+		\drummode {
 				\repeat volta 2{
 					\partial 8 d8:32( |
 					g8.) g16		d8:32( g8)		d4:32(		d8) d8:32( |
@@ -32,8 +32,8 @@
 					d4)->		d4:32(		d4)		r8
 				}
 
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "Flett from Flotta"
 		meter = "March"
diff --git a/4-4_marches/minstrel_boy.side.ly b/4-4_marches/minstrel_boy.side.ly
index e7c0439..84d8004 100755
--- a/4-4_marches/minstrel_boy.side.ly
+++ b/4-4_marches/minstrel_boy.side.ly
@@ -3,8 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
diff --git a/4-4_marches/rowan_tree.side.ly b/4-4_marches/rowan_tree.side.ly
index 45eb077..03a4d62 100755
--- a/4-4_marches/rowan_tree.side.ly
+++ b/4-4_marches/rowan_tree.side.ly
@@ -3,32 +3,35 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
+        \eighthBeaming
 
-        % Part 1
-		\repeat volta 2 {
-		\partial 4
-				r8 d8 |
-				d4:32(	d8) g8	d4:32(	d8) g8 |
-				\flamd d8 g16. d32->	g16. g32 \flamd d16. g32	\flamd d16. d32:128( d16.) g32->	d32 g d \flamd d g8 |
-				\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
-				d4	d4:32(	d4)
+		\drummode {
+			% Part 1
+			\repeat volta 2 {
+			\partial 4
+					r8 d8 |
+					d4:32(	d8) g8	d4:32(	d8) g8 |
+					\flamd d8 g16. d32->	g16. g32 \flamd d16. g32	\flamd d16. d32:128( d16.) g32->	d32 g d \flamd d g8 |
+					\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
+					d4	d4:32(	d4)
+			}
+		\break
+			% Part 2 ( Part 2.2 = Part 1)
+					d8. g16 |
+					d8:32(-> g8:32)(->	g8:32)( d8:32)(->	g8:32)( d8:32)(->	g8)-> d8:32( |
+					g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8.) g16 |
+					\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
+					d4	d4:32(	d4)
+
+					r8 d8 |
+					d4:32(	d8) g8	d4:32(	d8) g8 |
+					\flamd d8 g16. d32->	g16. g32 \flamd d16. g32	\flamd d16. d32:128( d16.) g32->	d32 g d \flamd d g8 |
+					\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
+					d4	d4:32(	d4)
+			}% End of drums %
 		}
-	\break
-        % Part 2 ( Part 2.2 = Part 1)
-				d8. g16 |
-				d8:32(-> g8:32)(->	g8:32)( d8:32)(->	g8:32)( d8:32)(->	g8)-> d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8.) g16 |
-				\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
-				d4	d4:32(	d4)
-
-				r8 d8 |
-				d4:32(	d8) g8	d4:32(	d8) g8 |
-				\flamd d8 g16. d32->	g16. g32 \flamd d16. g32	\flamd d16. d32:128( d16.) g32->	d32 g d \flamd d g8 |
-				\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
-				d4	d4:32(	d4)
-    }% End of drums %
 	\header {
 		title = "Rowan Tree"
 		meter = "Quick March"
diff --git a/4-4_marches/scotland_the_brave.side.ly b/4-4_marches/scotland_the_brave.side.ly
index ac986fc..f5d0fe0 100755
--- a/4-4_marches/scotland_the_brave.side.ly
+++ b/4-4_marches/scotland_the_brave.side.ly
@@ -3,28 +3,30 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
+        \eighthBeaming
 
-        % Part 1
-            \repeat volta 2 {
-				\partial 8 d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8) d8:32( |
-				\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	\tuplet 3/2 { g16) d g } d8 |
-				\flamd d4	d4:32(	d4)	r8
-			}
+		\drummode {
+			% Part 1
+				\repeat volta 2 {
+					\partial 8 d8:32( |
+					g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8) d8:32( |
+					\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8:32( |
+					g8.) g16	d8:32( g8)	\flamd d8 d8:32(	\tuplet 3/2 { g16) d g } d8 |
+					\flamd d4	d4:32(	d4)	r8
+				}
 
-			\break
+				\break
 
-        % Part 2 ( Part 2.2 = Part 1)
-				g8 |
-				d4:32(	d8) g8	d4:32(	d8) g8:32( |
-				\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8 |
-				d4:32(	d8) g8	d4:32(	d8) g8 |
-				\flamd d4	d4:32(	d4)	r8
-
-    }% End of drums %
+			% Part 2 ( Part 2.2 = Part 1)
+					g8 |
+					d4:32(	d8) g8	d4:32(	d8) g8:32( |
+					\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8 |
+					d4:32(	d8) g8	d4:32(	d8) g8 |
+					\flamd d4	d4:32(	d4)	r8
+			}% End of drums %
+		}
 	\header {
 		title = "Scotland the Brave"
 		meter = "Quick March"
diff --git a/4-4_marches/the_leaving_of_liverpool.side.ly b/4-4_marches/the_leaving_of_liverpool.side.ly
index 93fa397..4e5698e 100755
--- a/4-4_marches/the_leaving_of_liverpool.side.ly
+++ b/4-4_marches/the_leaving_of_liverpool.side.ly
@@ -3,40 +3,42 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
+        \eighthBeaming
 
-				\repeat volta 2{
-					\partial 4 r8 d16. g32 |
-					\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+		\drummode {
+			\repeat volta 2{
+				\partial 4 r8 d16. g32 |
+				\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
 
-					\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+				\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
 
-					\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8 |
+				\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8 |
 
-					\flamd d4	d4:32(		d4)
-				}
-			\break
-			\partial 4 \flamd d4 |
-					d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
+				\flamd d4	d4:32(		d4)
+			}
+		\break
+		\partial 4 \flamd d4 |
+				d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
 
-					\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+				\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
 
-					d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> g8 |
+				d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> g8 |
 
-					\flamd d4	d4:32(		d4)		r8
+				\flamd d4	d4:32(		d4)		r8
 
-			\partial 4 \flamd d4 |
-					d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
+		\partial 4 \flamd d4 |
+				d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
 
-					\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+				\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
 
-					\flamg g16. d32:128( d16.) g32		d16.:64( d32) \tuplet 3/2 { g16 d g }		\flamd d16. g32-> d32 g d g		d16. g32-> d32 g d g |
+				\flamg g16. d32:128( d16.) g32		d16.:64( d32) \tuplet 3/2 { g16 d g }		\flamd d16. g32-> d32 g d g		d16. g32-> d32 g d g |
 
-					d4	d4:32(		d4)		r8
-
-    }% End of drums %
+				d4	d4:32(		d4)		r8
 
+		}% End of drums %
+	}
 	\header {
 		title = "The Leaving of Liverpool"
 		meter = "March"
diff --git a/4-4_marches/the_old_rustic_bridge.tenor.ly b/4-4_marches/the_old_rustic_bridge.tenor.ly
index d0b0e3c..a85557f 100755
--- a/4-4_marches/the_old_rustic_bridge.tenor.ly
+++ b/4-4_marches/the_old_rustic_bridge.tenor.ly
@@ -3,9 +3,10 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff {
+	\new PipeBandDrumStaff {
 		\drummode {
 			\time 4/4
+			\eighthBeaming
 
 			\repeat volta 2 {
 				\partial 16 g16 |
diff --git a/4-4_marches/the_pikemans_march.side.ly b/4-4_marches/the_pikemans_march.side.ly
index 9c743e5..43a8130 100755
--- a/4-4_marches/the_pikemans_march.side.ly
+++ b/4-4_marches/the_pikemans_march.side.ly
@@ -3,45 +3,43 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
+        \eighthBeaming
 
-		\repeat volta 2 {
-			\partial 8 g8 |
-			\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
-			g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
-			\flamd d4		\flamd d16 g-> d d		\flamg g16 d-> g g		\flamd d16 g-> d d |
-			\flamd d4		d4:32(		d4)		r8 g8 |
-		\break
-			\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
-			\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> d16. g32 |
-			d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> g8	|
-			\flamd d4		d4:32(		d4)		r8
-		}
-		\break
-			\partial 8 d16. g32 |
-			\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-			g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
-			d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
-			\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 g8 |
+				\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
+				\flamd d4		\flamd d16 g-> d d		\flamg g16 d-> g g		\flamd d16 g-> d d |
+				\flamd d4		d4:32(		d4)		r8 g8 |
+			\break
+				\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
+				\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> d16. g32 |
+				d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> g8	|
+				\flamd d4		d4:32(		d4)		r8
+			}
+			\break
+				\partial 8 d16. g32 |
+				\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
+				d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
+				\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
 
-		\break
-			\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-			g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
-			d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
-			\flamd d4		d4:32(		d4)		r8 d16. g32 |
+			\break
+				\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+				d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
+				\flamd d4		d4:32(		d4)		r8 d16. g32 |
 
-		\break
-			\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-			g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
-			d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
-			\flamd d4		d8:32( g8:32)(->		d4)		r4
-
-
-
-
-
-    }% End of drums %
+			\break
+				\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+				d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
+				\flamd d4		d8:32( g8:32)(->		d4)		r4
+		}% End of drums %
+	}
 	\header {
 		title = "The Pikeman's March"
 		meter = "March"
diff --git a/4-4_marches/the_pikemans_march.v1.5.side.ly b/4-4_marches/the_pikemans_march.v1.5.side.ly
index b4535b9..c7557b4 100755
--- a/4-4_marches/the_pikemans_march.v1.5.side.ly
+++ b/4-4_marches/the_pikemans_march.v1.5.side.ly
@@ -3,8 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-   \new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+   \new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
diff --git a/4-4_marches/were_no_awa_tae_bide_awa.side.ly b/4-4_marches/were_no_awa_tae_bide_awa.side.ly
index 38a741a..0019ddb 100755
--- a/4-4_marches/were_no_awa_tae_bide_awa.side.ly
+++ b/4-4_marches/were_no_awa_tae_bide_awa.side.ly
@@ -1,6 +1,5 @@
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
diff --git a/4-4_marches/wings.side.ly b/4-4_marches/wings.side.ly
index cd866af..f537fe2 100755
--- a/4-4_marches/wings.side.ly
+++ b/4-4_marches/wings.side.ly
@@ -3,51 +3,50 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
+        \eighthBeaming
 
-        % Part 1
-		\repeat volta 2 {
-		\partial 8
-				d8:32)(^"Part 2 of 2" |
-				g8.) \parenthesize d16	d8:32( g8)	r8  d32-> \dr g d g	d-> g d g d8-> \fr |
-				\flamd d8 g16. d32->	g16. g32 \flamd d8	d4:32(	d8) d16. g32 |
-		}
-		\alternative {
-			{
-			\break
-			\set Timing.measureLength = #(ly:make-moment 4/4)
-				d4:32(	d8) \flamg g8	d16 \flamg g8 g16	\flamd d8 d8:32( |
-			\set Timing.measureLength = #(ly:make-moment 8/8)
-				\tuplet 3/2 { g16) d g } \flamd d8	d16. g32 \dragd d8	d32 g d g d8	d4:32(
+		\drummode {
+			% Part 1
+			\repeat volta 2 {
+			\partial 8
+					d8:32)(^"Part 2 of 2" |
+					g8.) \parenthesize d16	d8:32( g8)	r8  d32-> \dr g d g	d-> g d g d8-> \fr |
+					\flamd d8 g16. d32->	g16. g32 \flamd d8	d4:32(	d8) d16. g32 |
 			}
-			{
-			\break
-			\set Timing.measureLength = #(ly:make-moment 4/4)
-				d4:32)(	d8) \flamg g8	d32 g d g d8	d16. g32  \dragd d8 |
-			\set Timing.measureLength = #(ly:make-moment 7/8)
-				d32 g d g d8	d4:32(	d4)	r8
+			\alternative {
+				{
+				\break
+				\set Timing.measureLength = #(ly:make-moment 4/4)
+					d4:32(	d8) \flamg g8	d16 \flamg g8 g16	\flamd d8 d8:32( |
+				\set Timing.measureLength = #(ly:make-moment 8/8)
+					\tuplet 3/2 { g16) d g } \flamd d8	d16. g32 \dragd d8	d32 g d g d8	d4:32(
+				}
+				{
+				\break
+				\set Timing.measureLength = #(ly:make-moment 4/4)
+					d4:32)(	d8) \flamg g8	d32 g d g d8	d16. g32  \dragd d8 |
+				\set Timing.measureLength = #(ly:make-moment 7/8)
+					d32 g d g d8	d4:32(	d4)	r8
+				}
 			}
-		}
-		\bar "|."
-	\break
-        % Part 2 ( Part 2.2 = Part 1)
-			\set Timing.measureLength = #(ly:make-moment 1/8)
-				d8:32( |
-			\set Timing.measureLength = #(ly:make-moment 4/4)
-				g8) d16. g32	d16. d32:128( d8)	\flamd d8 d16. g32	d8:32(-> g8:32)(-> |
-				d8.)-> g16	d8:32( g16.) g32	d8:32( g16.) g32	\tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } |
-			\break
-				\flamd d8 d16. g32->	d16. d32 \flamg g8	\flamd d4	\tuplet 3/2 { d16 g d } \flamg g8 |
-				\flamd d4	r4	d8:32(-> g8:32)(->	d8:32)(-> g8:32)(-> \bar "|."
-
-
-    }% End of drums %
-
+			\bar "|."
+		\break
+			% Part 2 ( Part 2.2 = Part 1)
+				\set Timing.measureLength = #(ly:make-moment 1/8)
+					d8:32( |
+				\set Timing.measureLength = #(ly:make-moment 4/4)
+					g8) d16. g32	d16. d32:128( d8)	\flamd d8 d16. g32	d8:32(-> g8:32)(-> |
+					d8.)-> g16	d8:32( g16.) g32	d8:32( g16.) g32	\tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } |
+				\break
+					\flamd d8 d16. g32->	d16. d32 \flamg g8	\flamd d4	\tuplet 3/2 { d16 g d } \flamg g8 |
+					\flamd d4	r4	d8:32(-> g8:32)(->	d8:32)(-> g8:32)(-> \bar "|."
+		}% End of drums %
+	}
 	\header {
 		title = "Wings"
 		meter = "Quick March"
-		composer = ""
 		instrument = "Side"
 	}
 }
\ No newline at end of file
diff --git a/5-4_marches/cullen_bay.bass.ly b/5-4_marches/cullen_bay.bass.ly
index 76b6148..33c2362 100755
--- a/5-4_marches/cullen_bay.bass.ly
+++ b/5-4_marches/cullen_bay.bass.ly
@@ -3,13 +3,14 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff {
+	\new PipeBandDrumStaff {
 		\time 5/4
-		\repeat volta 2 {
-			\repeat unfold 8 {	d4-^ g d-> g d | }
+		\drummode {
+			\repeat volta 2 {
+				\repeat unfold 8 {	d4-^ g d-> g d | }
+			}
 		}
 	}
-
 	\header {
 		title = "Cullen Bay"
 		meter = "March"
diff --git a/5-4_marches/cullen_bay.tenor.ly b/5-4_marches/cullen_bay.tenor.ly
index e926c63..1742579 100755
--- a/5-4_marches/cullen_bay.tenor.ly
+++ b/5-4_marches/cullen_bay.tenor.ly
@@ -3,9 +3,10 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff {
+	\new PipeBandDrumStaff {
+		\time 5/4
+
 		\drummode {
-			\time 5/4
 			\repeat volta 4 {
 				d8-> g d g d-> g d4 d4 |
 				d8. g16 d8-> g8-> r8 g8 d4 d4 |
@@ -19,7 +20,6 @@
 			}
 		}
 	}
-
 	\header {
 		title = "Cullen Bay"
 		meter = "March"
diff --git a/6-8_marches/hills_of_glenorchy.snare.ly b/6-8_marches/hills_of_glenorchy.snare.ly
index fe11062..a71f821 100755
--- a/6-8_marches/hills_of_glenorchy.snare.ly
+++ b/6-8_marches/hills_of_glenorchy.snare.ly
@@ -2,48 +2,51 @@
 
 \include "lilydrum.ly"
 
-\drums {
-	\time 6/8
+\score {
+	\new PipeBandDrumStaff {
+		\time 6/8
 
-	% Part 1
-		\repeat volta 2 {
-			\partial 8 d8 |
-			\flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> |
-			\tuplet 5/2 { d8 g d g d } g8-> d4.:32( |
-			d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } |
-			d16 g16 d16 g16 \flamd d8 \flamg g4 d8 |
+		\drummode {
+			% Part 1
+			\repeat volta 2 {
+				\partial 8 d8 |
+				\flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> |
+				\tuplet 5/2 { d8 g d g d } g8-> d4.:32( |
+				d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } |
+				d16 g16 d16 g16 \flamd d8 \flamg g4 d8 |
+
+				\break
+
+				\flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> |
+				\tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } |
+				\flamd d16 d16 g16 d16 g16 d16  \flamg g16 g16 d16 g16 d16 g16:32(-> |
+				g8.:32)( d16) g8:32(-> d4)
+
+			}
 
 			\break
 
-			\flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> |
-			\tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } |
-			\flamd d16 d16 g16 d16 g16 d16  \flamg g16 g16 d16 g16 d16 g16:32(-> |
-			g8.:32)( d16) g8:32(-> d4)
+		% Part 2 ( Part 2.2 = Part 1)
+			\repeat volta 2 {
+				\tuplet 5/2 { d16 g d g d } |
+				g8. d16 g8 d4.:32( |
+				d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 |
+				\flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 |
+				g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8
 
-		}
+				\break
 
-		\break
-
-	% Part 2 ( Part 2.2 = Part 1)
-		\repeat volta 2 {
-			\tuplet 5/2 { d16 g d g d } |
-			g8. d16 g8 d4.:32( |
-			d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 |
-			\flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 |
-			g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8
-
-			\break
-
-			\flamg g8. d16 g8 d4.:32( |
-			d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 |
-			\flamd d16 d16 g16 d16 g16 d16  \flamg g16 g16 d16 g16 d16 g16:32(-> |
-			g8.:32)( d16) g8:32(-> d4)
-		}
-}% End of drums %
-
-\header {
-	title = "Hills of Glenorchy"
-	meter = "March"
-	composer = "G. Clark, 1977"
-	instrument = "Side"
+				\flamg g8. d16 g8 d4.:32( |
+				d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 |
+				\flamd d16 d16 g16 d16 g16 d16  \flamg g16 g16 d16 g16 d16 g16:32(-> |
+				g8.:32)( d16) g8:32(-> d4)
+			}
+		}% End of drums %
+	}
+	\header {
+		title = "Hills of Glenorchy"
+		meter = "March"
+		composer = "G. Clark, 1977"
+		instrument = "Side"
+	}
 }
\ No newline at end of file
diff --git a/airs/abide_with_me.side.ly b/airs/abide_with_me.side.ly
index 0089db9..319ab92 100755
--- a/airs/abide_with_me.side.ly
+++ b/airs/abide_with_me.side.ly
@@ -1,12 +1,11 @@
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
 		\time 4/4
 		\eighthBeaming
-		%\markup{ 1st time through rolls, n+1th time: n drums play score}
+
 		\drummode {
 			\repeat unfold 3{
 				\flam  d8->) \! \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 g |
@@ -28,5 +27,6 @@
 	\header {
 		title = "Abide with Me"
 		meter = "Hymn"
+		composer = "nth time through: n drums play score, others: rolls"
 	}
 }
diff --git a/airs/alexander_mackenzie.side.ly b/airs/alexander_mackenzie.side.ly
index 2fd2656..f70da68 100755
--- a/airs/alexander_mackenzie.side.ly
+++ b/airs/alexander_mackenzie.side.ly
@@ -3,10 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-        % Part 1
+		\drummode {
+			% Part 1
             \repeat volta 2 {
 				\partial 8 d16. g32 |
 				d8:32( d8.)-> g16 d4:32( d8) |
@@ -25,7 +26,7 @@
 
 			\break
 
-        % Part 2 ( Part 2.2 = Part 1)
+			% Part 2 ( Part 2.2 = Part 1)
 				d8:32( |
 				g4) \flamd d16. g32 d8:32( g8) \flamd d8 |
 				d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32  d4-> d8:32( |
@@ -53,9 +54,8 @@
 				d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
 				d4.:32( d4)
 				\bar "|."
-
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "Alexander MacKenzie"
 		meter = "Slow March"
diff --git a/airs/amazing_grace.side.ly b/airs/amazing_grace.side.ly
index 81798f5..6e5136a 100755
--- a/airs/amazing_grace.side.ly
+++ b/airs/amazing_grace.side.ly
@@ -3,42 +3,42 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 3/4
 
-		\partial 4
-		\flamd d8. g16 |
+        \drummode {
+			\partial 4
+			\flamd d8. g16 |
 
-		\repeat volta 2{
-			\flamd d2)\! \flamd d8 g16 d16 |
-			\flamd d2 \flamd d8. g16 |
-			d4:32( d4:32)( d4:32)(\> |
-			d2)\! \flamd d8. g16 |
-			\break
+			\repeat volta 2{
+				\flamd d2)\! \flamd d8 g16 d16 |
+				\flamd d2 \flamd d8. g16 |
+				d4:32( d4:32)( d4:32)(\> |
+				d2)\! \flamd d8. g16 |
+				\break
 
-			\flamd d2 \flamd d8 g16 d16 |
-			\flamd d2 \flamd d8. \flamg g16-> |
-			d4:32(\< d4:32)( d4:32)(\> |
-			d4:32)(\! d4:32)( d4:32)(\< |
-			\break
+				\flamd d2 \flamd d8 g16 d16 |
+				\flamd d2 \flamd d8. \flamg g16-> |
+				d4:32(\< d4:32)( d4:32)(\> |
+				d4:32)(\! d4:32)( d4:32)(\< |
+				\break
 
-			d2->)\! d8 g16 d16 |
-			\flamd d2 d8. g16 |
-			d4:32( d4:32)( d4:32)(\> |
-			d2)\! \flamd d8. g16 |
-			\break
-
-			\flamd d2 d8 g16 d16 |
-			\flamd d2 \dragd d4 |
-			d4:32(\> d4:32)( d4:32)(\! |
-			d4:32)( d4:32)(\< d4:32)(
-			\break
-			\bar "||"
-		}
-
-
-    }% End of drums %
+				d2->)\! d8 g16 d16 |
+				\flamd d2 d8. g16 |
+				d4:32( d4:32)( d4:32)(\> |
+				d2)\! \flamd d8. g16 |
+				\break
 
+				\flamd d2 d8 g16 d16 |
+				\flamd d2 \dragd d4 |
+				d4:32(\> d4:32)( d4:32)(\! |
+				d4:32)( d4:32)(\< d4:32)(
+				\break
+				\bar "||"
+			}
+			\bar "|."
+		}% End of drums %
+	}
 	\header {
 		title = "Amazing Grace"
 		meter = "Hymn"
diff --git a/airs/farewell_to_camraw.side.ly b/airs/farewell_to_camraw.side.ly
index 05d2dcf..f5e65bf 100755
--- a/airs/farewell_to_camraw.side.ly
+++ b/airs/farewell_to_camraw.side.ly
@@ -3,12 +3,12 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
 		\time 4/4
+        \eighthBeaming
 		\drummode {
 			\repeat volta 2{
 				r1 |
diff --git a/airs/farewell_to_camraw.tenor.ly b/airs/farewell_to_camraw.tenor.ly
index d9c5dca..9a5db2d 100755
--- a/airs/farewell_to_camraw.tenor.ly
+++ b/airs/farewell_to_camraw.tenor.ly
@@ -3,7 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff {
+	\new PipeBandDrumStaff {
 		\drummode {
 			\time 4/4
 			\repeat volta 2 {
diff --git a/airs/flower_of_scotland.side.ly b/airs/flower_of_scotland.side.ly
index 1876c05..e9ac587 100755
--- a/airs/flower_of_scotland.side.ly
+++ b/airs/flower_of_scotland.side.ly
@@ -1,6 +1,5 @@
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
diff --git a/airs/loch_duich.side.ly b/airs/loch_duich.side.ly
index 4c0b5cd..bd466d0 100755
--- a/airs/loch_duich.side.ly
+++ b/airs/loch_duich.side.ly
@@ -3,57 +3,58 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-		\repeat volta 2 {
-			\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-			d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+		\drummode {
+			\repeat volta 2 {
+				\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
+				d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
 
-			\flamd d4 \flamd d8 	d16:64( d8) d16:64( d8) |
-			d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+				\flamd d4 \flamd d8 	d16:64( d8) d16:64( d8) |
+				d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
 
-			\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-			d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+				\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
+				d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
 
-			\flamg g8 d8:32( d8)		r8 d8:32( d8) |
-			\dragd d16 d-> g g \flamd d8		d4.:32(\< |
-		}
-		\break
-		\repeat volta 2 {
-			d4)\! g8		d8:32( d8) g8 |
-			d8:32( d8) g8		\dragd d16 d-> g g \flamd d8 |
-
-			\flamg g4 g8		d8:32( d8) g8 |
-			d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
-
-			\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-			d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
-
-			\flamg g8 d8:32( d8)		r8 d8:32( d8) |
-			\dragd d16 d-> g g \flamd d8		d4.:32(\< |
-		}
-		\break
-		\repeat volta 2 {
-			d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
-			d8 g16 d-> g g		d4.:32(\< |
-
-			d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8
-			d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
-
-			d8 \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
-			d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
-		}
-		\alternative {
-			{
+				\flamg g8 d8:32( d8)		r8 d8:32( d8) |
 				\dragd d16 d-> g g \flamd d8		d4.:32(\< |
 			}
-			{
-				\dragd d16)\! d-> g g \flamd d8		\flamd d4. |
-			}
-		}
-    }% End of drums %
+			\break
+			\repeat volta 2 {
+				d4)\! g8		d8:32( d8) g8 |
+				d8:32( d8) g8		\dragd d16 d-> g g \flamd d8 |
 
+				\flamg g4 g8		d8:32( d8) g8 |
+				d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+
+				\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
+				d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+
+				\flamg g8 d8:32( d8)		r8 d8:32( d8) |
+				\dragd d16 d-> g g \flamd d8		d4.:32(\< |
+			}
+			\break
+			\repeat volta 2 {
+				d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
+				d8 g16 d-> g g		d4.:32(\< |
+
+				d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8
+				d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+
+				d8 \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
+				d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+			}
+			\alternative {
+				{
+					\dragd d16 d-> g g \flamd d8		d4.:32(\< |
+				}
+				{
+					\dragd d16)\! d-> g g \flamd d8		\flamd d4. |
+				}
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "Loch Duich"
 		meter = "Slow Air"
diff --git a/airs/miss_kirkwood.side.ly b/airs/miss_kirkwood.side.ly
index 99bf0f1..a4a2466 100755
--- a/airs/miss_kirkwood.side.ly
+++ b/airs/miss_kirkwood.side.ly
@@ -3,34 +3,35 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-		\repeat volta 2 {
-			d4.:32(		d4)	g8 |
-			\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
-			d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
-			d2.:32(\< |
-		\break
-			d8)\! \flamg g8. g16		d4:32( d8) |
-			d8:32( d8.) g16		d4.:32( |
-			d8) \tuplet 3/2 { d16 g d } \flamg g8		d8:32( g16) d16-> g16 g16 |
-			d4.:32(		d4) r8
-		}
-		\break
-		\repeat volta 2 {
-			d4:32(	d8)		g8 d8:32( d8) |
-			\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
-			d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
-			\dragd d16 d16-> g16 g16 \flamd d8		d8:32( d8) g8 |
-		\break
-			d4:32(	d8)		g8 d8:32( d8) |
-			\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
-			d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( g16) d16-> g16 g16 |
-			d4.:32(		d4) r8
-		}
-    }% End of drums %
-
+        \drummode {
+			\repeat volta 2 {
+				d4.:32(		d4)	g8 |
+				\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
+				d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
+				d2.:32(\< |
+			\break
+				d8)\! \flamg g8. g16		d4:32( d8) |
+				d8:32( d8.) g16		d4.:32( |
+				d8) \tuplet 3/2 { d16 g d } \flamg g8		d8:32( g16) d16-> g16 g16 |
+				d4.:32(		d4) r8
+			}
+			\break
+			\repeat volta 2 {
+				d4:32(	d8)		g8 d8:32( d8) |
+				\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
+				d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
+				\dragd d16 d16-> g16 g16 \flamd d8		d8:32( d8) g8 |
+			\break
+				d4:32(	d8)		g8 d8:32( d8) |
+				\flamd d8 g16 d16-> g16 g16		d4.:32(\< |
+				d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( g16) d16-> g16 g16 |
+				d4.:32(		d4) r8
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "Miss Kirkwood"
 		meter = "Slow Air"
diff --git a/airs/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan.side.ly
index 699a120..4d8a6f6 100755
--- a/airs/morag_of_dunvegan.side.ly
+++ b/airs/morag_of_dunvegan.side.ly
@@ -3,34 +3,35 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-		\repeat volta 2 {
-			\flamd d8 d8:32( g8)		\flamd d8 r8 \flamd d8 |
-			g8 d8:32( g8)		g8 \tuplet 3/2 { d16 g d } g8 |
-			\flamd d8 d8:32( g8)		\flamd d8 r8 d8 |
-			\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
+        \drummode {
+			\repeat volta 2 {
+				\flamd d8 d8:32( g8)		\flamd d8 r8 \flamd d8 |
+				g8 d8:32( g8)		g8 \tuplet 3/2 { d16 g d } g8 |
+				\flamd d8 d8:32( g8)		\flamd d8 r8 d8 |
+				\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
 
-			d8)\! d8:32( g8)		\flamd d8 r8 \flamd d8 |
-			g8 d8:32( g8)		\flamd d8 \tuplet 3/2 { d16 g d } g8 |
-			\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
-			d4.:32(		d4.)
-		}
-		\break
-		\repeat volta 2 {
-			d16.-> g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
-			d16.-> g32 d16. d32 g8		\flamd d8-> \tuplet 3/2 { d16 g d } g8 |
-			d16.-> g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
-			\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
-
-			d16.)->\! g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
-			d16. g32 d16. d32 g8		\flamd d8-> \tuplet 3/2 { d16 g d } g8 |
-			\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
-			d4.:32(		d4.)
-		}
-    }% End of drums %
+				d8)\! d8:32( g8)		\flamd d8 r8 \flamd d8 |
+				g8 d8:32( g8)		\flamd d8 \tuplet 3/2 { d16 g d } g8 |
+				\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
+				d4.:32(		d4.)
+			}
+			\break
+			\repeat volta 2 {
+				d16.-> g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
+				d16.-> g32 d16. d32 g8		\flamd d8-> \tuplet 3/2 { d16 g d } g8 |
+				d16.-> g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
+				\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
 
+				d16.)->\! g32 d16. d32 g8		d8:32(-> g8) \flamd d8 |
+				d16. g32 d16. d32 g8		\flamd d8-> \tuplet 3/2 { d16 g d } g8 |
+				\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
+				d4.:32(		d4.)
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "Morag of Dunvegan"
 		meter = "Slow Air"
diff --git a/airs/my_home.side.ly b/airs/my_home.side.ly
index 66bae5c..c532bfc 100755
--- a/airs/my_home.side.ly
+++ b/airs/my_home.side.ly
@@ -3,33 +3,34 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-		\repeat volta 2 {
-			\partial 8 d8:32( |
-			g8.) d16 g8		\flamd d8. g16 d8 |
-			\flamg g8. d16 g8		d4.:32( |
-			d8.) g16 d8		\flamg g8. d16 g8 |
-			\flamd d8. g16 d8		d4.:32( |
-			d8.) g16 d8		\flamd d4 g8 |
-			d8. g16 d8		d4.:32( |
-			d8.) g16 d8		\flamg g8. d16 g8 |
-			d4.:32(		d4)
-		}
-		\repeat volta 2 {
-			\partial 8 d8 |
-			\flamd d8. g16 d8		d4.:32(
-			d8.) g16 d8		d4.:32( |
-			d8.) g16 d8		\flamg g8. d16 g8 |
-			\flamd d8. g16 d8		d4.:32( |
-			d8.) g16 d8		d4.:32( |
-			d8.) g16 d8		\flamd d4 g8 |
-			\flamd d8. g16 d8		\flamg g8. d16 g8 |
-			d4.:32(		d4)
-		}
-    }% End of drums %
-
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 d8:32( |
+				g8.) d16 g8		\flamd d8. g16 d8 |
+				\flamg g8. d16 g8		d4.:32( |
+				d8.) g16 d8		\flamg g8. d16 g8 |
+				\flamd d8. g16 d8		d4.:32( |
+				d8.) g16 d8		\flamd d4 g8 |
+				d8. g16 d8		d4.:32( |
+				d8.) g16 d8		\flamg g8. d16 g8 |
+				d4.:32(		d4)
+			}
+			\repeat volta 2 {
+				\partial 8 d8 |
+				\flamd d8. g16 d8		d4.:32(
+				d8.) g16 d8		d4.:32( |
+				d8.) g16 d8		\flamg g8. d16 g8 |
+				\flamd d8. g16 d8		d4.:32( |
+				d8.) g16 d8		d4.:32( |
+				d8.) g16 d8		\flamd d4 g8 |
+				\flamd d8. g16 d8		\flamg g8. d16 g8 |
+				d4.:32(		d4)
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "My Home"
 		meter = "Slow Air"
diff --git a/airs/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains.side.ly
index fe8db3e..10897e1 100755
--- a/airs/the_mist_covered_mountains.side.ly
+++ b/airs/the_mist_covered_mountains.side.ly
@@ -3,34 +3,35 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
 
-		\repeat volta 2 {
-			\partial 8 d8:32( |
-			g8.) d16 g8		d8[ r8 d8:32(] |
-			g8.) d16 g8		d8[ r8 d8:32(] |
-			g8.) d16 g8		d8. g16 d8 |
-			d4.:32(		d8)[ r8 d8:32(] |
-			g8.) d16 g8		d8 r8 d8:32( |
-			g8.) d16 g8		d8 r8 d8:32( |
-			g8.) d16 g8		d8. g16 d8 |
-			d4.:32(		d4.) |
-		}
-		\break
-		\repeat volta 2 {
-			\partial 8 d8 |
-			d2.:32( |
-			d8.)-> g16 d8		g8. d16 g8 |
-			d2.:32( |
-			d8.)-> g16 d8		g8 r8 g8 |
-			d2.:32( |
-			d8.)-> g16 d8		g8. d16 g8 |
-			r8 g8 d8		r8 d8 g8 |
-			d4.:32(		d4.) |
-		}
-    }% End of drums %
-
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 d8:32( |
+				g8.) d16 g8		d8[ r8 d8:32(] |
+				g8.) d16 g8		d8[ r8 d8:32(] |
+				g8.) d16 g8		d8. g16 d8 |
+				d4.:32(		d8)[ r8 d8:32(] |
+				g8.) d16 g8		d8 r8 d8:32( |
+				g8.) d16 g8		d8 r8 d8:32( |
+				g8.) d16 g8		d8. g16 d8 |
+				d4.:32(		d4.) |
+			}
+			\break
+			\repeat volta 2 {
+				\partial 8 d8 |
+				d2.:32( |
+				d8.)-> g16 d8		g8. d16 g8 |
+				d2.:32( |
+				d8.)-> g16 d8		g8 r8 g8 |
+				d2.:32( |
+				d8.)-> g16 d8		g8. d16 g8 |
+				r8 g8 d8		r8 d8 g8 |
+				d4.:32(		d4.) |
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "The Mist Covered Mountains"
 		meter = "Slow Air"
diff --git a/airs/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains.tenor.ly
index 8b4cc50..2bb4a0a 100755
--- a/airs/the_mist_covered_mountains.tenor.ly
+++ b/airs/the_mist_covered_mountains.tenor.ly
@@ -3,7 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff {
+	\new PipeBandDrumStaff {
 		\drummode {
 			\time 6/8
 			\repeat volta 2 {
diff --git a/hornpipes/itchy_fingers.side.ly b/hornpipes/itchy_fingers.side.ly
index dc0914f..3bdad69 100755
--- a/hornpipes/itchy_fingers.side.ly
+++ b/hornpipes/itchy_fingers.side.ly
@@ -3,55 +3,56 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 2/4
+        \eighthBeaming
 
-		\repeat volta 2 {
-			\partial 8 r8 |
-			\flamd d16^"2 of 2"-> g d \flamg g->		d16 g \flamd d-> g |
-			d16 \flamg g-> d g		d8-> d8:32( |
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 r8 |
+				\flamd d16^"2 of 2"-> g d \flamg g->		d16 g \flamd d-> g |
+				d16 \flamg g-> d g		d8-> d8:32( |
 
-			g16)-> d32 g32 d16 g16->		d32 g32 d32 g32 d16-> d16:64( |
-			d16) g16-> d32 g d g		d4:32( |
+				g16)-> d32 g32 d16 g16->		d32 g32 d32 g32 d16-> d16:64( |
+				d16) g16-> d32 g d g		d4:32( |
 
-		\break
-			\flamd d16)-> g d \flamg g->		d16 g \flamd d-> g |
-			d16 \flamg g-> d g		d8-> \flamd d16-> g16 |
-
-			d32 g d g d16-> g16		d16 d16:64( d16) g16 |
-			d8:32(-> g8:32)(->		d8)->
-		}
-		\break
-		\repeat volta 2 {
-			\partial 8 d16 g16 |
-			d32-> g d g  d g d g		d16-> g d d |
-			g32-> d g d  g-> d g d		g16-> d g g |
-
-			d32-> g d g  d g d-> g		d g d g d8-> |
-			d16-> d16:64( d16) g16		d4:32(-> |
 			\break
-		}
-		\alternative {
-			{
-				d8)-> \flamg g8->		\flamd d16-> g d \flamg g-> |
-				d16 g16-> d32 g d g		d8-> \flamd d16-> g16 |
-
-				d32 g d g d16-> g16		d16 d16:64( d16) g16 |
-				d8:32(-> g8:32)(->		d8)->
-				\break
-			}
-			{
-				d16[)-> g d \flamg g]->		d16 g \flamd d-> g |
+				\flamd d16)-> g d \flamg g->		d16 g \flamd d-> g |
 				d16 \flamg g-> d g		d8-> \flamd d16-> g16 |
 
 				d32 g d g d16-> g16		d16 d16:64( d16) g16 |
 				d8:32(-> g8:32)(->		d8)->
-				\bar "|."
 			}
-		}
+			\break
+			\repeat volta 2 {
+				\partial 8 d16 g16 |
+				d32-> g d g  d g d g		d16-> g d d |
+				g32-> d g d  g-> d g d		g16-> d g g |
 
-    }% End of drums %
+				d32-> g d g  d g d-> g		d g d g d8-> |
+				d16-> d16:64( d16) g16		d4:32(-> |
+				\break
+			}
+			\alternative {
+				{
+					d8)-> \flamg g8->		\flamd d16-> g d \flamg g-> |
+					d16 g16-> d32 g d g		d8-> \flamd d16-> g16 |
 
+					d32 g d g d16-> g16		d16 d16:64( d16) g16 |
+					d8:32(-> g8:32)(->		d8)->
+					\break
+				}
+				{
+					d16[)-> g d \flamg g]->		d16 g \flamd d-> g |
+					d16 \flamg g-> d g		d8-> \flamd d16-> g16 |
+
+					d32 g d g d16-> g16		d16 d16:64( d16) g16 |
+					d8:32(-> g8:32)(->		d8)->
+					\bar "|."
+				}
+			}
+		}% End of drums %
+	}
 	\header {
 		title = "Itchy Fingers"
 		meter = "Hornpipe"
diff --git a/jigs/seaforth_sticks.side.ly b/jigs/seaforth_sticks.side.ly
index 4b37f4d..8ad3e86 100755
--- a/jigs/seaforth_sticks.side.ly
+++ b/jigs/seaforth_sticks.side.ly
@@ -3,15 +3,15 @@
 \include "lilydrum.ly"
 
 \score {
-	\new DrumStaff = "staff_side" {
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_side" {
 		\set Staff.instrumentName = #"Side"
 		\set Staff.shortInstrumentName = #"S.D."
 
 		\time 6/8
 		\drummode {
+			\mark \default
 			\repeat volta 2{
-				\partial 8 r8^"A" |
+				\partial 8 r8 |
 				\flamd d8 g8 d8		\flamg g4 g8 |
 				d16 g d g d8->		g8 d8 g8 |
 
@@ -26,8 +26,9 @@
 			}
 			\break
 			% B
+			\mark \default
 			\repeat volta 2{
-				\partial 8 g8^"B" |
+				\partial 8 g8 |
 				d4.:32(->		d4.:32)(-> |
 				d16) g d g d8->		g8 d8 g8 |
 
@@ -42,8 +43,9 @@
 			}
 			\break
 			% C
+			\mark \default
 			\repeat volta 2{
-				\partial 8 d8:32(^"C" |
+				\partial 8 d8:32( |
 				d4) \flamd d8		g8 d8 g8-^|
 				d16 g d g d8		g8 d8 g8 |
 
@@ -58,8 +60,9 @@
 			}
 			\break
 			% D
+			\mark \default
 			\repeat volta 2{
-				\partial 8 g8^"D" |
+				\partial 8 g8 |
 				d4.:32(->		g8) d8 g8|
 				d4.:32(->		g8) d8 g8|
 
@@ -75,29 +78,31 @@
 
 		\break
 			%E
+			\mark \default
 			\repeat volta 2{
-				\partial 8 r8^"E" |
-				\flamd d8 g8 d8		dback4 g8 |
+				\partial 8 r8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 				d16 g d g d8->		g8 d8 g8 |
 
-				\flamd d8 g8 d8		dback4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 				d4.:32(->		d8) g8 g8 |
 
-				\flamd d8 g8 d8		dback4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 				d16 g d g d8->		g8 d8 g8 |
 
-				\flamd d8 g8 d8		dback4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 				d4.:32(		d4.)
 			}
 			\break
 			% F
+			\mark \default
 			\repeat volta 2{
-				\partial 8 g8^"F" |
+				\partial 8 g8 |
 				d4.:32(->		d4.:32)(-> |
 				d16) g d g d8->		g8^"Y" d8 g8 |
 
 				\flamd d8-^ g8 \flamd d8-^		g8^"Y" d8 g8 |
-				\flamd d8 g8 d8		dback4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 
 				d4.:32(->		d8) g8 g8 |
 				d16 g d g d8->		g8 d8 g8 |
@@ -106,44 +111,45 @@
 				d4.:32(		d4.)
 			}
 			\break
-			% G
+
+			\mark \default
 			\repeat volta 2{
-				\partial 8 d8:32(^"C" |
-				d4)-^  dback8		g8 d8 g8-^|
+				\partial 8 d8:32( |
+				d4)-^  \backstick d8		g8 d8 g8-^|
 				d16 g d g d8		g8 d8 g8 |
 
-				\flamd d8 g8 d8		gback8 d8 g8 |
-				\flamd d8 g8 g8		dback4 d8:32( |
+				\flamd d8 g8 d8		\backstick g4 d8 g8 |
+				\flamd d8 g8 g8		\backstick d4 d8:32( |
 
-				d4)-> dback8		g8 d8 g8|
+				d4)-> \backstick d8		g8 d8 g8|
 				d16 g d g d8->		g8 d8 g8 |
 
-				\flamd d8 g d8->		gback8 d8 g8 |
+				\flamd d8 g d8->		\backstick g4 d8 g8 |
 				d4.:32(		d4.)
 			}
 			\break
 			% H
+			\mark \default
 			\repeat volta 2{
-				\partial 8 g8^"H" |
-				\flamd d8 d16 g16 d8		g8^"X" d8^"X" g8^"X"|
+				\partial 8 g8 |
+				\flamd d8 d16 g16 d8		\repeat unfold 3 { sn8^"X" }|
 				\flamd d8 g8 d8		g8^"Y" d8 g8|
 
-				\flamd d8 g8 d8		dback4 g8 |
-				\flamd d8 g8 d8		dback4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
+				\flamd d8 g8 d8		\backstick d4 g8 |
 
-				\flamd d8 d16 g16 d8		g8^"X" d8^"X" g8^"X"|
+				\flamd d8 d16 g16 d8		\repeat unfold 3 { sn8^"X" }|
 				\flamd d8 g8 d8		g8^"Y" d8 g8|
 
-				\flam d8 g8 d8		dback4 g8 |
+				\flam d8 g8 d8		\backstick d4 g8 |
 				d4.:32(		d4.)
 			}
 
 		}
 	}
-
+	\header {
+		title = "Seaforth Sticks"
+		meter = "Jig"
+	}
 }
 
-\header {
-	title = "Seaforth Sticks"
-	meter = "Jig"
-}
\ No newline at end of file
diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily
index 376059d..b596672 100755
--- a/lilydrum/layout_tweaks.ily
+++ b/lilydrum/layout_tweaks.ily
@@ -32,8 +32,10 @@ drumPitchNames =
 		\DrumStaff
 		\name PipeBandDrumStaff
 		\alias DrumStaff
+
 		% one line per staff
 		\override StaffSymbol.line-positions = #'(0)
+
 		% bar line height
 		\override BarLine.bar-extent = #'(-2 . 2)
 
diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily
index 81e49fd..4fb0211 100755
--- a/lilydrum/musical_functions.ily
+++ b/lilydrum/musical_functions.ily
@@ -3,6 +3,15 @@
 % =================================================	%
 % Part of lilydrum
 
+eighthBeaming = {
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = #'( 2 )
+}
+compoundEighthBeaming = {
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = #'( 3 )
+}
+
 % triplet
 triplet = #(define-music-function (parser location notes) (ly:music?) #{ \tuplet 3/2 { $notes } #})
 
diff --git a/makedrum b/makedrum
index 2ff07bd..4fcefde 100755
--- a/makedrum
+++ b/makedrum
@@ -181,14 +181,13 @@ class MakeDrum:
 \\version "2.18.0"
 
 #(ly:set-option 'point-and-click #f)
-
-#(set-global-staff-size """+self.args.staffsize+""")
-#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""")
-
 """+ lily_includes +"""
 
 \\include \""""+header_format+""".ily"
 
+#(set-global-staff-size """+self.args.staffsize+""")
+#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""")
+
 % The tune to generate.
 		""")
 
diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly
index f2e3d88..f465711 100755
--- a/other/band_of_brothers.snare.ly
+++ b/other/band_of_brothers.snare.ly
@@ -4,7 +4,7 @@
 #(set-global-staff-size 19)
 \layout {
 	indent = 0
-\set Score.markFormatter = #format-mark-box-alphabet
+	\set Score.markFormatter = #format-mark-box-alphabet
 	\context {
 		\DrumStaff
 		% one line per staff
@@ -113,15 +113,8 @@
 			\tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} |
 			sn8 r8 r4 sn4:32( sn4:32)( |
 			\tuplet 3/2 { sn8) sn8 r8 } \tuplet 3/2 { r8 sn8 sn8 }  sn8 r8 r4
-
-
-
-
 		}
 	}
-
-}
-
 	\header {
 		title = "Band of Brothers"
 		subtitle = "for the Edinburgh Military Tattoo 2005"
@@ -129,3 +122,7 @@
 		instrument = "Snare Drum"
 		meter = ""
 	}
+
+}
+
+
diff --git a/standards/24_standards.side.ly b/standards/24_standards.side.ly
index 041e1ff..52cf461 100755
--- a/standards/24_standards.side.ly
+++ b/standards/24_standards.side.ly
@@ -3,8 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 2/4
+
+		\drummode {
         	\repeat volta 2{
 				\partial 8 d16. g32 |
 				\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
@@ -59,9 +62,8 @@
 				g8) \flamd d16. g32		d16. \flamg g32 d16. g32 |
 				\flamd d8 d8:32( g8)
 			}
-
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "2/4 Standards"
 		meter = "Quick March"
diff --git a/standards/34_standards1.side.ly b/standards/34_standards1.side.ly
index 0650fe6..2a6fed6 100755
--- a/standards/34_standards1.side.ly
+++ b/standards/34_standards1.side.ly
@@ -3,8 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 3/4
+
+		\drummode {
         	\repeat volta 2{
 				\flamd d8 d8:32(	g8) d8:32(	d8:32)( d8) |
 				\flamd d8 d8:32(	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8 |
@@ -50,8 +53,8 @@
 				\flamd d8 d8:32(	g16.) g32 \flamd d16. g32	d16. \flamg g32 d16. g32
 				\flamd d4	d4:32(	d4)
 			}
-    }% End of drums %
-
+		}% End of drums %
+	}
 	\header {
 		title = "3/4 Standards\nSetting 1"
 		meter = "Quick March"
diff --git a/standards/34_standards2.side.ly b/standards/34_standards2.side.ly
index 3fa339c..5d49f3a 100755
--- a/standards/34_standards2.side.ly
+++ b/standards/34_standards2.side.ly
@@ -3,8 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 3/4
+
+		\drummode {
 			\repeat volta 2{
 				d4:32(->		d8) d8:32(->		d4) |
 				\flamd d8 d8:32(		\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32		\tuplet 3/2 { d16 g16 d16 } \flamg g8 |
@@ -46,7 +49,8 @@
 				\flamd d8 d32 g d g		d8  d32 g d g		d16. g32-> d16. d32 |
 				\flamd d4		d4:32(		d4)
 			}
-   }% End of drums %
+		}% End of drums %
+	}
 
 	\header {
 		title = "3/4 Standards\n Setting 2"
diff --git a/standards/34_standards3.side.ly b/standards/34_standards3.side.ly
index b8cb71e..f3f2e1b 100755
--- a/standards/34_standards3.side.ly
+++ b/standards/34_standards3.side.ly
@@ -3,8 +3,11 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 3/4
+
+		\drummode {
 			\repeat volta 2{
 				\flamd d8 d8:32(		d8:32)(-> g8:32)(->		g8:32)( d8:32)(-> |
 				d8) d8:32(		\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32		\tuplet 3/2 { d16 g16 d16 } \flamg g8 |
@@ -50,7 +53,8 @@
 				\flamd d8 d32 g d g		d8  d32 g d g		d16. g32-> d16. d32 |
 				\flamd d4		d4:32(		d4)
 			}
-   }% End of drums %
+		}% End of drums %
+	}
 
 	\header {
 		title = "3/4 Standards\n Setting 3"
diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly
index 704b158..aa0797e 100755
--- a/standards/44_standards.side.ly
+++ b/standards/44_standards.side.ly
@@ -3,9 +3,10 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 2/4
 
+		\drummode {
         	\repeat volta 2{
 				\partial 8 r8 |
 				R1 |
@@ -17,7 +18,8 @@
 				g8) \flamd d16. g32		d16. \flamg g32 d16. g32 |
 				\flamd d8 d8:32( g8)
 			}
-    }% End of drums %
+		}% End of drums %
+	}
 
 	\header {
 		title = "2/4 Standards"
@@ -27,7 +29,8 @@
 	}
 }
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
+        \eighthBeaming
         \time 4/4
         	\repeat volta 2{
 				\partial 8 d16. g32 |
diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly
index 0774057..b08a5ab 100755
--- a/standards/68_standards.side.ly
+++ b/standards/68_standards.side.ly
@@ -3,8 +3,10 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 6/8
+
+        \drummode {
         	\repeat volta 2{
 				\partial 8 g8 |
 				\flamd d4 d8:32(	g4) d8:32( |
@@ -76,8 +78,8 @@
 				\flamd d8. d16:64( d8)		d4.:32( |
 				d8.) g16 d8		\flamd d4
 			}
-		\break
-    }% End of drums %
+		}% End of drums %
+	}
 
 	\header {
 		title = "6/8 Standards"
diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly
index e9384ad..65d30de 100755
--- a/standards/standards.bass.ly
+++ b/standards/standards.bass.ly
@@ -2,17 +2,63 @@
 
 \include "lilydrum.ly"
 
-\score {
-	\new DrumStaff {
-		\time 2/4
-		\repeat volta 2 {
-			\repeat unfold 8 { d4-> g4 }
-		}
-	}
-
-	\header {
-		title = "Cullen Bay"
-		meter = "March"
+\header {
+		title = "Standards"
 		instrument = "Bass"
 	}
+
+\score {
+	\new PipeBandDrumStaff {
+		\time 2/4
+		\drummode {
+			\repeat volta 2 {
+				\repeat unfold 8 { d4-> g4 }
+			}
+		}
+	}
+	\header {
+		title = "2/4 Standard"
+	}
+}
+\score {
+	\new PipeBandDrumStaff {
+		\time 3/4
+
+		\drummode {
+			\repeat volta 3 {
+				\repeat unfold 8 { d4-> g4 g4 }
+			}
+		}
+	}
+	\header {
+		title = "3/4 Standard"
+	}
+}
+\score {
+	\new PipeBandDrumStaff {
+		\time 4/4
+
+		\drummode {
+			\repeat volta 2 {
+				\repeat unfold 8 { d4\v g4 d4-> g4}
+			}
+		}
+	}
+	\header {
+		title = "4/4 Standard"
+	}
+}
+\score {
+	\new PipeBandDrumStaff {
+		\time 6/8
+
+		\drummode {
+			\repeat volta 2 {
+				\repeat unfold 8 { d4. g4. }
+			}
+		}
+	}
+	\header {
+		title = "6/8 Standard"
+	}
 }
\ No newline at end of file
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index 2c875c1..41cdf81 100755
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -8,29 +8,31 @@
 }
 
 \score {
-	\drums {
+	\new PipeBandDrumStaff {
 		\time 2/4
 
-		\repeat volta 2 {
-			d8-> g  d g |
-			d8-> g  d g |
-			d8-> g  d g |
-			d8-> g  d g |
-			d8-> g  d g |
-			d8-> g  d g |
-			d8-> g  d g |
-			d4-> r  |
-			\bar "||"
-		\break
-			\flourish {
-				d4 d |
-				g4 g |
-				d4 d |
-				g4 g |
-				d4 d |
-				g4 g |
-				d4 d |
-				g4 d |
+		\drummode {
+			\repeat volta 2 {
+				d8-> g  d g |
+				d8-> g  d g |
+				d8-> g  d g |
+				d8-> g  d g |
+				d8-> g  d g |
+				d8-> g  d g |
+				d8-> g  d g |
+				d4-> r  |
+				\bar "||"
+			\break
+				\flourish {
+					d4 d |
+					g4 g |
+					d4 d |
+					g4 g |
+					d4 d |
+					g4 g |
+					d4 d |
+					g4 d |
+				}
 			}
 		}
 	}
@@ -41,21 +43,23 @@
 }
 
 \score {
-	\drums {
+	\new PipeBandDrumStaff {
 		\time 3/4
 
-		\repeat volta 2 {
-			d8.-> g16 d8 g r g |
-			d4-> d8 g d4 |
-			d8.-> g16 d8 g r g |
-			d4-> d8 g d4 |
-			\bar "||"
-		\break
-			\flourish{
-				d4-> d d |
-				g4-> g g |
-				d4-> d g |
-				g4-> d g |
+		\drummode {
+			\repeat volta 2 {
+				d8.-> g16 d8 g r g |
+				d4-> d8 g d4 |
+				d8.-> g16 d8 g r g |
+				d4-> d8 g d4 |
+				\bar "||"
+			\break
+				\flourish{
+					d4-> d d |
+					g4-> g g |
+					d4-> d g |
+					g4-> d g |
+				}
 			}
 		}
 	}
@@ -66,22 +70,24 @@
 }
 
 \score {
-	\drums {
+	\new PipeBandDrumStaff {
 		\time 4/4
 
-		\repeat volta 2 {
-			d8-^ g d g d-> g d g |
-			d8-^ g d g d-> g d g |
-			d8-^ g d g d-> g d g |
-			d4-^ g d r |
-			\bar "||"
-		\break
-			\flourish {
-				d4 d g g |
-				d4 d g g |
-				d4 d g g |
+		\drummode {
+			\repeat volta 2 {
+				d8-^ g d g d-> g d g |
+				d8-^ g d g d-> g d g |
+				d8-^ g d g d-> g d g |
+				d4-^ g d r |
+				\bar "||"
+			\break
+				\flourish {
+					d4 d g g |
+					d4 d g g |
+					d4 d g g |
+				}
+				\flourish d4 \flourish g d^\splitTheFeather r |
 			}
-			\flourish d4 \flourish g d^\splitTheFeather r |
 		}
 	}
 
@@ -91,31 +97,32 @@
 }
 
 \score {
-	\drums {
+	\new PipeBandDrumStaff {
 		\time 6/8
 
-		\repeat volta 2 {
-			\flourish d4. \flourish g |
-			d^\splitTheFeather r |
-			d g |
-			d8 r8 g8 d4. |
-			\flourish d4. \flourish g |
-			d^\splitTheFeather r |
-			d g |
-			d8 r8 g8 d4. |
-			\bar "||"
-		\break
-			\flourish {
-				d4. d |
-				g g |
-				d d |
-				g g |
-				d d |
-				g g |
+		\drummode {
+			\repeat volta 2 {
+				\flourish d4. \flourish g |
+				d^\splitTheFeather r |
 				d g |
+				d8 r8 g8 d4. |
+				\flourish d4. \flourish g |
+				d^\splitTheFeather r |
+				d g |
+				d8 r8 g8 d4. |
+				\bar "||"
+			\break
+				\flourish {
+					d4. d |
+					g g |
+					d d |
+					g g |
+					d d |
+					g g |
+					d g |
+				}
+				d^\splitTheFeather r |
 			}
-			d^\splitTheFeather r |
-
 		}
 	}
 
diff --git a/strathspeys/aa_camerons.snare.ly b/strathspeys/aa_camerons.snare.ly
index 80cd5b7..e20d762 100755
--- a/strathspeys/aa_camerons.snare.ly
+++ b/strathspeys/aa_camerons.snare.ly
@@ -2,47 +2,50 @@
 
 \include "lilydrum.ly"
 
-\drums {
-	\time 4/4
+\score {
+	\new PipeBandDrumStaff {
+		\time 4/4
 
-	% Part 1
-		\repeat volta 2 {
-			\flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> |
-			d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } |
-		}
-		\alternative {
-			{
-			  g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8  \flamd d8. g16 |
-			  \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 }
+		\drummode {
+			% Part 1
+			\repeat volta 2 {
+				\flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> |
+				d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } |
 			}
-			{
-			  g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 |
-			  \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g }
+			\alternative {
+				{
+				  g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8  \flamd d8. g16 |
+				  \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 }
+				}
+				{
+				  g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 |
+				  \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g }
+				}
 			}
-		}
 
-		\break
+			\break
 
-	% Part 2
-		\repeat volta 2 {
-			d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( |
-			d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } |
-		}
-		\alternative {
-			{
-			  \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g }   d8.-> \tuplet 3/2 { g32 d d } |
-			  g8. d16  \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g }
+			% Part 2
+			\repeat volta 2 {
+				d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( |
+				d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } |
 			}
-			{
-			  \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> |
-			  d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d }
+			\alternative {
+				{
+				  \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g }   d8.-> \tuplet 3/2 { g32 d d } |
+				  g8. d16  \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g }
+				}
+				{
+				  \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> |
+				  d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d }
+				}
 			}
-		}
-}% End of drums %
-
-\header {
-	title = "A. A. Cameron's Strathspey"
-	meter = "Strathspey"
-	composer = "G. Clark, 1988"
-	instrument = "Side"
+		}% End of drums %
+	}
+	\header {
+		title = "A. A. Cameron's Strathspey"
+		meter = "Strathspey"
+		composer = "G. Clark, 1988"
+		instrument = "Side"
+	}
 }
\ No newline at end of file
diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly
index f5ac633..51e0d0f 100755
--- a/strathspeys/molly_connell.bass.ly
+++ b/strathspeys/molly_connell.bass.ly
@@ -1,11 +1,9 @@
 \score {
-	\new DrumStaff = "staff_bass"{
-		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+	\new PipeBandDrumStaff = "staff_bass"{
 		\set Staff.instrumentName = #"Bass"
 		\set Staff.shortInstrumentName = #"B.D."
 
 		\time 4/4
-		\numericTimeSignature
 
 		\drummode {
 			\repeat volta 2 {
@@ -19,7 +17,7 @@
 				r8 d8 r8 g8 r8 d8 r8 g8 |
 				d4-> g4 d4 g4 |
 				d4-> g4 r8. g16 d4 |
-	
+
 			}
 		}
 	}
diff --git a/strathspeys/molly_connell.side.ly b/strathspeys/molly_connell.side.ly
index 64c02b7..7b20bb3 100755
--- a/strathspeys/molly_connell.side.ly
+++ b/strathspeys/molly_connell.side.ly
@@ -3,35 +3,36 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
 
-		\repeat volta 2 {
-			\partial 8 r8
-			\flamd d4		\flamg g8.[ d16:64(]		d8.[) \dragg g16]		d8.[ g16] |
-			d8.:64[( g16])		\tuplet 3/2 { d16[ g d g d8]}		\tuplet 3/2 { g8[ d8 \flamg g8] }		\flamd d8.[ g16] |
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 r8
+				\flamd d4		\flamg g8.[ d16:64(]		d8.[) \dragg g16]		d8.[ g16] |
+				d8.:64[( g16])		\tuplet 3/2 { d16[ g d g d8]}		\tuplet 3/2 { g8[ d8 \flamg g8] }		\flamd d8.[ g16] |
 
-			d16:64[( d8.])		g8.[ \dragd d16]		\tuplet 3/2 { d16[ g d g d8] }		g8.[ g16] |
-			\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8
-		}
-		\break
-			\partial 8 g8 |
-			d4:32(		d8.[) \dragd d16]		\tuplet 3/2 { d16[ g d g d g8] }		g8.[ g16] |
-			\dragd d16[ d8.]		\flamd d8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] }		\tuplet 3/2 { g8[ d g] } |
+				d16:64[( d8.])		g8.[ \dragd d16]		\tuplet 3/2 { d16[ g d g d8] }		g8.[ g16] |
+				\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8
+			}
+			\break
+				\partial 8 g8 |
+				d4:32(		d8.[) \dragd d16]		\tuplet 3/2 { d16[ g d g d g8] }		g8.[ g16] |
+				\dragd d16[ d8.]		\flamd d8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] }		\tuplet 3/2 { g8[ d g] } |
 
-			\tuplet 3/2 { \flamd d8[ g16 g16 d8] }		g8.[ g16]		\tuplet 3/2 { d8[ g16 g16 d8] }		g8.[ g16] |
-			\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8 |
-		\break
-			\partial 8 g8 |
-			d4:32(		d8.[) \dragd d16]		\tuplet 3/2 { d16[ g d g d g8] }		g8.[ g16] |
-			\dragd d16[ d8.]		\flamd d8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] }		\tuplet 3/2 { g8[ d g] } |
+				\tuplet 3/2 { \flamd d8[ g16 g16 d8] }		g8.[ g16]		\tuplet 3/2 { d8[ g16 g16 d8] }		g8.[ g16] |
+				\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8 |
+			\break
+				\partial 8 g8 |
+				d4:32(		d8.[) \dragd d16]		\tuplet 3/2 { d16[ g d g d g8] }		g8.[ g16] |
+				\dragd d16[ d8.]		\flamd d8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] }		\tuplet 3/2 { g8[ d g] } |
 
-			\flamd d4		\flamg g8.[ d16:64](		d8.[) \dragg g16]		d8.[ g16] |
-			\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8 |
-
-		\bar "|."
-    }% End of drums %
+				\flamd d4		\flamg g8.[ d16:64](		d8.[) \dragg g16]		d8.[ g16] |
+				\tuplet 3/2 { \flamd d8[ g d] }		\flamg g8.[ \flamg g16]		\tuplet 3/2 { d16[ g d g d8] } g8 |
 
+			\bar "|."
+		}% End of drums %
+	}
 	\header {
 		title = "Molly Connell"
 		meter = "Strathspey"
diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly
index 449a27f..fe8d116 100755
--- a/strathspeys/molly_connell.tenor.ly
+++ b/strathspeys/molly_connell.tenor.ly
@@ -3,30 +3,31 @@
 \include "lilydrum.ly"
 
 \score {
-    \drums {
+    \new PipeBandDrumStaff {
         \time 4/4
 
-		\repeat volta 2 {
-			d4 g4 d8. g16 d4
-			d4 g4 r8. g16 d4
-			d4 d4 g4 g4
-			d4 g4 d4 g4
-		}
-		\break
-			d4 g4 d4 g4
-			d4 d8. g16 r8. g16 d4
-			d4 g4 d8. g16 d4
-			d4 g4 d4 g4
+		\drummode {
+			\repeat volta 2 {
+				d4 g4 d8. g16 d4
+				d4 g4 r8. g16 d4
+				d4 d4 g4 g4
+				d4 g4 d4 g4
+			}
+			\break
+				d4 g4 d4 g4
+				d4 d8. g16 r8. g16 d4
+				d4 g4 d8. g16 d4
+				d4 g4 d4 g4
 
-		\break
-			d4 g4 d4 g4
-			d4 d8. g16 r8. g16 d4
-			d4 d4 g4 g4
-			d4 g4 d4 g4
-	\bar "|."
-
-    }% End of drums %
+			\break
+				d4 g4 d4 g4
+				d4 d8. g16 r8. g16 d4
+				d4 d4 g4 g4
+				d4 g4 d4 g4
+		\bar "|."
 
+		}% End of drums %
+	}
 	\header {
 		title = "Molly Connell"
 		meter = "Strathspey"