diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily
index f805ba4..e3aacc9 100644
--- a/4-4_marches/rowan_tree/notes.side.ily
+++ b/4-4_marches/rowan_tree/notes.side.ily
@@ -6,19 +6,28 @@ sideglobal = { \eighthBeaming }
 
 %%music
 snareEnding = \drummode {
-	\flam d8[ d8]:32(	g8[) d8]:32(	\tuplet 3/2 { g16) d g } \flam d16. g32	d16. g32-> d g d g |
-	\flam d4	d4:32(	d4)
+	\flamdr d8[ d8]:32(	
+	g8[) d8]:32(	
+	\tuplet 3/2 { g16) d g } \flam d16. g32	
+	d16.\fr g32-> d g d g
+	|
+	\flamdr d4	d4:32(	d4)\fr
 }
 snareA = \drummode {
-	r8 d8 |
-	d4:32(	d8) g8	d4:32(	d8) g8 |
-	\flam d16 g8 d16->	g16. g32 \flam d16. g32	\flam d16. d32:128( d16.) g32->	d32 g d g \flam d8 |
+	r8 d8\dr |
+	d4:32(	d8) g8	d4:32(	d8) g8
+	|
+	\flam d16\fr g8 d16->	
+	g16. g32 \flam d16. g32	
+	\flamdr d16. d32:128( d16.)\fr g32->	
+	\triplet {d16 g d } \flam g8
+	|
 	\snareEnding
 }
 % Part 2
 snareBA = \drummode {
 	d8. g16 |
-	d8[:32(-> g8]:32)(->	g8[:32)( d8]:32)(->	g8[:32)( d8]:32)(->	g8[)-> d8]:32( |
-	g8.) g16	d8:32( g8)	\flam d8 d8:32(	g8.) g16 |
+	d8[:32(->\dr g8]:32)(->	d8[:32)( g8]:32)(->	d8[:32)( g8]:32)(->	d8[)->\fr d8]:32( |
+	g8.)\pp g16	d8:32( g8)	\flam d8 d8:32(	g8.) g16\f |
 	\snareEnding
 }
diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily
index 2c8d636..ec57e80 100644
--- a/4-4_marches/scotland_the_brave/notes.side.ily
+++ b/4-4_marches/scotland_the_brave/notes.side.ily
@@ -7,17 +7,17 @@ sideglobal = {
 	}
 %%music
 snareA = \drummode {
-	d8:32( |
-	g8.) g16	d8:32( g8)	\flam d8 d8:32(	g8) d8:32( |
-	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8 d8:32( |
+	d8:32(\dr |
+	g8.)\fr g16	d8:32( g8)	\flam d8[ d8:32(]	g8)[ d8:32(]\dr |
+	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8\fr d8:32( |
 	g8.) g16	d8:32( g8)	\flam d8 d8:32(	\triplet { g16) d g } d8 |
-	\flam d4	d4:32(	d4)	r8
+	\flamdr d4	d4:32(	d4)\fr	r8
 }
 % Part 2
 snareBA = \drummode {
 	g8 |
-	d4:32(	d8) g8	d4:32(	d8) g8:32( |
-	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8 d8 |
-	d4:32(	d8) g8	d4:32(	d8) g8 |
-	\flam d4	d4:32(	d4)	r8
+	d4:32(\dr	d8) g8	d4:32(	d8)\fr d8:32( |
+	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8 g8 |
+	d4:32(\dr	d8) g8	d4:32(	d8) g8 |
+	\flam d4	d4:32(	d4)\fr	r8
 }
diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily
index c6c9afe..b10cea3 100644
--- a/4-4_marches/wings/notes.side.ily
+++ b/4-4_marches/wings/notes.side.ily
@@ -8,18 +8,18 @@ sideglobal = {
 
 %%music
 snareAAI = \drummode {
-	g8.) \parenthesize d16	d8:32( g8)	r8  d32-> \< g d g	d-> g d g d8-> \! |
-	\flamd d16 \f g8 d16->	g16. g32 \flamd d8	d4:32( \<	d8) \! d16. g32 |
+	g8.)\fr g16	d8:32( g8)	r8  d32->\dr \< g d g	d-> g d g d8-> \! |
+	\flamd d16\fr \f g8 d16->	g16. g32 \flamd d8	d4:32(\dr \<	d8)\fr \! d16. g32 |
 }
 
 
 snareAA = \drummode {
-	d8:32( \mf |
+	d8:32(\dr \mf |
   \snareAAI
 }
 snareABA = \drummode {
-	d4:32( \<	d8) \! \flamg g8	d16 \flamg g8 g16	\flamd d8 d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d8	d16.[ g32 \dragd d8]	d32 g d g d8	\afterGrace d4:32( {s8)}
+	d4:32(\dr \<	d8) \! \flamg g8	d16 \flamg g8 g16	\flamd d8\fr d8:32( |
+	\tuplet 3/2 { g16) d g } \flamd d8	d16.[ g32 \dragd d8]	d32 g d g d8	d8[:32~\dr \afterGrace g8]:32(  {s8)\ofr}
 }
 snareABB = \drummode {
 	d4:32)( \<	d8) \! \flamg g8	d32 g d g d8	d16.[ g32  \dragd d8] |
@@ -27,10 +27,10 @@ snareABB = \drummode {
 }
 % Part 2
 snareBA = \drummode {
-	d8:32( |
-	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 } |
+	d8:32(\dr |
+	g8) d16. g32	\flam d16. d32:128( d8)	\flamd d8 d16. g32	d8:32(-> \< g8:32)(-> |
+	d8.)->\fr \! g16	d8:32( g16.) g32	d8:32( g16.) g32	\tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } |
 
-	\flamd d8 d16. g32->	d16. d32 \flamg g8	\flamd d4	\tuplet 3/2 { d16 \p g d } \flamg g8 |
-	\flamd d4	r4	d8[:32(-> \< g8]:32)(->	d8[:32)(->  \afterGrace g8]:32)(->  {s8)\!}
+	\flamdr d8 d16. g32->	d16. d32 \flamg g8	\flamd d4\fr	\tuplet 3/2 { d16 \p g d } \flamg g8 |
+	\flamd d4	r4	d8[:32(->\dr \< g8]:32)(->	d8[:32)(->  \afterGrace g8]:32)(->  {s8)\!\ofr}
 }
diff --git a/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily
index 2f85393..d03b7ce 100644
--- a/jigs/seaforth_sticks/notes.side.ily
+++ b/jigs/seaforth_sticks/notes.side.ily
@@ -14,7 +14,7 @@ snareA = \drummode {
 	d16 g d g d8->		g8 d g |
 
 	\flamd d8 g d		\flamg g4 g8 |
-	d4.:32->~		d8 g g |
+	d4:32->~ g8:32->(		g8:32 d)-> g |
 
 	\flamd d8 g d		\flamg g4 g8 |
 	d16 g d g d8->		g8 d g |
@@ -40,13 +40,13 @@ snareB = \drummode {
 %C
 snareC = \drummode {
 	d8:32~\< |
-	d4\! \flamd d8		g8 d g-^|
+	d4\! \flamd d8		r4 g8-^|
 	d16 g d g d8		g8 d g |
 
 	\flamd d8-^ g \flamd d-^		g8 d \flamg g-^ |
 	d8 g \flamg d		\flamg g4-^ d8:32~\< |
 
-	d4\! \flamd d8		g8 d g-^|
+	d4\! \flamd d8		r4 g8-^|
 	d16 g d g d8->		g8 d g |
 
 	d16 g d g d8->		g8 d g |
@@ -55,13 +55,13 @@ snareC = \drummode {
 %D
 snareD = \drummode {
 	g8 |
-	d4.:32~->		d8 g g |
-	d4.:32~->		d8 g g |
+	d4:32~-> g8:32(->		g8:32 d) g |
+	d4:32~-> g8:32(->		g8:32 d) g |
 
 	\flamd d8\> g d		\flamg g4\! g8-\v |
 	d8\< g \flamg d		\flamg g4\! g8 |
 
-	d4.:32~->		d8 g g|
+	d4:32~->	g8:32(->	g8:32 d) g|
 	d16 g d g d8->		g8 d g |
 
 	d16 g d g d8->		g8 d g |
@@ -74,7 +74,7 @@ snareE = \drummode {
 	d16 g d g d8->		g8 d g |
 
 	\flamd d8 g d		\backstick d4 g8 |
-	d4.:32~->		d8 g g |
+	d4:32~-> g8:32(->		g8:32 d) g |
 
 	\flamd d8 g d		\backstick d4 g8 |
 	d16 g d g d8->		g8 d g |
@@ -99,30 +99,30 @@ snareF = \drummode {
 }
 %G
 snareG = \drummode {
-	d8:32~ |
-	d4->  \backstick d8		g8 d g|
+	d8:32~\< |
+	d4\!  \backstick d8		r4 g8|
 	d16 g d g d8->		g8 d g |
 
-	\flamd d8 g d		\Y d8 g d  |
-	\flamd d8 g d		\backstick d4 d8:32~ |
+	\flamd d8 g d		\Y d8 d g  |
+	\flamd d8 g d		\backstick d4 d8:32~\< |
 
-	d4-> \backstick d8		g8 d g|
+	d4-> \backstick d8		r4 g8|
 	d16 g d g d8->		g8 d g |
 
-	\flamd d8 g d		\Y d8 g d |
+	\flamd d8 g d		\Y d8 d g |
 	d4.:32~		d4
 }
 %H
 snareH = \drummode {
 	g8 |
 	\flamd d8 d16 g d8		\crossstick { d8 d d }|
-	\flamd d8 g d		\Y d8 g d|
+	\flamd d8 g d		\Y d8 d g|
 
 	\flamd d8 g d		\backstick d4 g8 |
 	\flamd d8 g d		\backstick d4 g8 |
 
 	\flamd d8 d16 g d8		\crossstick { d8 d d }|
-	\flamd d8 g d		\Y d8 g d |
+	\flamd d8 g d		\Y d8 d g |
 
 	\flam d8 g d		\backstick d4 g8 |
 	d4.:32~		d4
diff --git a/sets/set_5.full.ly b/sets/set_5.full.ly
index 7656fb3..5531692 100644
--- a/sets/set_5.full.ly
+++ b/sets/set_5.full.ly
@@ -1,6 +1,8 @@
 \version "2.18.2"
 
+\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
 \paper {#(define page-breaking ly:minimal-breaking)}
+#(ly:set-option 'relative-includes #t)
 
 
 %Scores
diff --git a/sets/set_5.pipes.ly b/sets/set_5.pipes.ly
index 0519d53..1c2768e 100644
--- a/sets/set_5.pipes.ly
+++ b/sets/set_5.pipes.ly
@@ -1,10 +1,12 @@
 \version "2.18.2"
 
+\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
 \paper {#(define page-breaking ly:minimal-breaking)}
+#(ly:set-option 'relative-includes #t)
 
 
 %Scores
 \include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes.ly"
 \include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/pipes.ly"
 \include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes-high.ly"
+\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-pipes.ly"