diff --git a/2-4_marches/mairis_wedding/notes.pipes.ily b/2-4_marches/mairis_wedding/notes.pipes.ily
index 942ece0..dc98a61 100644
--- a/2-4_marches/mairis_wedding/notes.pipes.ily
+++ b/2-4_marches/mairis_wedding/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "Trad."
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
diff --git a/3-4_marches/ballad_of_the_green_berets/config.ily b/3-4_marches/ballad_of_the_green_berets/config.ily
index f4cf327..064022b 100644
--- a/3-4_marches/ballad_of_the_green_berets/config.ily
+++ b/3-4_marches/ballad_of_the_green_berets/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 3/4
+	\key a \mixolydian
 	}
 confTempo = {
 	\tempo 4 = 90
diff --git a/3-4_marches/ballad_of_the_green_berets/lyrics.ly b/3-4_marches/ballad_of_the_green_berets/lyrics.ly
index c95a1b0..2327d8e 100644
--- a/3-4_marches/ballad_of_the_green_berets/lyrics.ly
+++ b/3-4_marches/ballad_of_the_green_berets/lyrics.ly
@@ -67,6 +67,5 @@
 	\column {
 		\verseCblock
 	}
-	}
   }
 }
diff --git a/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily b/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
index 8d95ab4..6aac586 100644
--- a/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
+++ b/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "F.J. de Boone, 2009"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg c8 [ \grG c8 ] \grg c4. a8 |
 	\grg b8 [ \grG b8 ] a2 |
diff --git a/3-4_marches/balmoral/config.ily b/3-4_marches/balmoral/config.ily
index 3130c98..4db0482 100644
--- a/3-4_marches/balmoral/config.ily
+++ b/3-4_marches/balmoral/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 3/4
+	\key a \mixolydian
 	}
 confTempo = {
 	\tempo 4 = 78
diff --git a/3-4_marches/balmoral/notes.pipes.ily b/3-4_marches/balmoral/notes.pipes.ily
index feec43d..faa4c42 100644
--- a/3-4_marches/balmoral/notes.pipes.ily
+++ b/3-4_marches/balmoral/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Arr. G. Rooney/Seaforths of Holland"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ b16 ] \grip c4 \grg e4 |
 	\grg a8. [ b16 ] \grip c2 |
diff --git a/3-4_marches/balmoral/notes.pipes.seconds.ily b/3-4_marches/balmoral/notes.pipes.seconds.ily
index df20d3c..7889c16 100644
--- a/3-4_marches/balmoral/notes.pipes.seconds.ily
+++ b/3-4_marches/balmoral/notes.pipes.seconds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 	\grg c8. [ d16 ] \dble e4 \grg A4 |
 	c8. [ d16 ] \dble e2 |
diff --git a/3-4_marches/balmoral/notes.pipes.thirds.ily b/3-4_marches/balmoral/notes.pipes.thirds.ily
index d9790e8..fb335ef 100644
--- a/3-4_marches/balmoral/notes.pipes.thirds.ily
+++ b/3-4_marches/balmoral/notes.pipes.thirds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesThrd = ""
 pipesthrdglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesthrdA = {
 	\grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] |
 	\grf g8 [ f8 ] \grg f8 [ c8 ] \grg f4 |
diff --git a/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily b/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily
index 29f39cd..747ce3f 100644
--- a/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily
+++ b/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "John MacLellan"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-}
+	\key a \mixolydian
+  }
 % Music
 pipesAA = {
 	\dble e8. [ c16 ] \grg a4 \taor a8. [ b16 ] |
diff --git a/3-4_marches/collins_cattle/notes.pipes.ily b/3-4_marches/collins_cattle/notes.pipes.ily
index 03bb2ef..ba81954 100644
--- a/3-4_marches/collins_cattle/notes.pipes.ily
+++ b/3-4_marches/collins_cattle/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ b16 ] \grip c4 \dblc c4 |
 	\dble e4 \dblc c8 [ b8 ] \grG a4 |
diff --git a/3-4_marches/green_hills_of_tyrol/notes.pipes.ily b/3-4_marches/green_hills_of_tyrol/notes.pipes.ily
index 0ce8fc7..c848936 100644
--- a/3-4_marches/green_hills_of_tyrol/notes.pipes.ily
+++ b/3-4_marches/green_hills_of_tyrol/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "PM J. MacLeod"% 93rd Sutherland Highlanders
 arrangerPipes = "1936"
 pipeglobal = {
-	\bagpipeKey
-}
+	\key a \mixolydian
+  }
 % Music
 pipesA = {
 	\grg a8. [ b16 ] \grip c4 \dblc c8 [ \gre a8 ]
diff --git a/3-4_marches/i_see_mull/notes.pipes.ily b/3-4_marches/i_see_mull/notes.pipes.ily
index 40389b3..edf264d 100644
--- a/3-4_marches/i_see_mull/notes.pipes.ily
+++ b/3-4_marches/i_see_mull/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "PM M.D. Roy"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/3-4_marches/i_see_mull/notes.pipes.seconds.ily b/3-4_marches/i_see_mull/notes.pipes.seconds.ily
index 82af6d0..64db60f 100644
--- a/3-4_marches/i_see_mull/notes.pipes.seconds.ily
+++ b/3-4_marches/i_see_mull/notes.pipes.seconds.ily
@@ -4,7 +4,7 @@
 composerPipesSecnd = ""
 arrangerPipesSecnd = "PM M.D. Roy"
 pipessecndglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipessecndAA = {
diff --git a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
index 011d1a5..d838c20 100644
--- a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
+++ b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "R. Watt"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
  \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] |
diff --git a/3-4_marches/lochanside/notes.pipes.ily b/3-4_marches/lochanside/notes.pipes.ily
index 4ddc831..3ed02d6 100644
--- a/3-4_marches/lochanside/notes.pipes.ily
+++ b/3-4_marches/lochanside/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "PM J. MacLellan, DCM"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/3-4_marches/my_land/notes.pipes.ily b/3-4_marches/my_land/notes.pipes.ily
index 23eb5cb..524359f 100644
--- a/3-4_marches/my_land/notes.pipes.ily
+++ b/3-4_marches/my_land/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "N. MacLean"
 arrangerPipes = "1936"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
index 58c0a0f..1b43924 100644
--- a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
+++ b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
@@ -6,8 +6,8 @@ rodin = { \bgrip }
 
 composerPipes = "Gavin Stoddart / Alan Brydon"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] |
 	\grg d8 [ f8 ] \dble e4 c4 |
diff --git a/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily b/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily
index c603472..5c487a4 100644
--- a/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily
+++ b/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = " PM A. M. Cairns, MMM, CD"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/3-4_marches/red_hackle/notes.pipes.ily b/3-4_marches/red_hackle/notes.pipes.ily
index e157f30..d455ef2 100644
--- a/3-4_marches/red_hackle/notes.pipes.ily
+++ b/3-4_marches/red_hackle/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] |
 	\thrwd d8 [ f8 ] \dblf f4 \grg e4 |
diff --git a/3-4_marches/shoals_of_herring/notes.pipes.ily b/3-4_marches/shoals_of_herring/notes.pipes.ily
index 4dbabc3..0e7afc8 100644
--- a/3-4_marches/shoals_of_herring/notes.pipes.ily
+++ b/3-4_marches/shoals_of_herring/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] |
 	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 |
diff --git a/3-4_marches/torosay_castle/notes.pipes.ily b/3-4_marches/torosay_castle/notes.pipes.ily
index aaee431..4cc97c3 100644
--- a/3-4_marches/torosay_castle/notes.pipes.ily
+++ b/3-4_marches/torosay_castle/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "PM J. Laurie"% Argyll and Sutherland Highlanders
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
  \thrwd d8. [ e16 ] \dblf f4 \birl a4 |
diff --git a/3-4_marches/when_the_battle_is_over/notes.pipes.ily b/3-4_marches/when_the_battle_is_over/notes.pipes.ily
index b2ef2ba..47f7924 100644
--- a/3-4_marches/when_the_battle_is_over/notes.pipes.ily
+++ b/3-4_marches/when_the_battle_is_over/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "1936"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/4-4_marches/48th_highlanders_of_holland/notes.pipes.ily b/4-4_marches/48th_highlanders_of_holland/notes.pipes.ily
index 82a6b59..4057ef9 100644
--- a/4-4_marches/48th_highlanders_of_holland/notes.pipes.ily
+++ b/4-4_marches/48th_highlanders_of_holland/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "PM Rev. Dr. K. B. Bice, 2015"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily
index 455df55..16210c7 100644
--- a/4-4_marches/51st_highland_division/config.ily
+++ b/4-4_marches/51st_highland_division/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 	}
 confTempo = {
 	\tempo 4 = 90
diff --git a/4-4_marches/51st_highland_division/notes.pipes.ily b/4-4_marches/51st_highland_division/notes.pipes.ily
index d83b15b..e267b0c 100644
--- a/4-4_marches/51st_highland_division/notes.pipes.ily
+++ b/4-4_marches/51st_highland_division/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesAAA = {
 	\dble e8. [ c16 ] |
 	a4 \taor a8. [ b16 ] \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] |
diff --git a/4-4_marches/auld_lang_syne/config.ily b/4-4_marches/auld_lang_syne/config.ily
index 6e2607a..8b8e9eb 100644
--- a/4-4_marches/auld_lang_syne/config.ily
+++ b/4-4_marches/auld_lang_syne/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 	}
 confTempo = { 
 	\tempo 4 = 90 
diff --git a/4-4_marches/auld_lang_syne/notes.pipes.ily b/4-4_marches/auld_lang_syne/notes.pipes.ily
index 52bd14b..ebe677b 100644
--- a/4-4_marches/auld_lang_syne/notes.pipes.ily
+++ b/4-4_marches/auld_lang_syne/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Trad."
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
  e4 |
  \grg a4~ a8 [ \wbirl a8 ] \gre a4 \grd c4 |
diff --git a/4-4_marches/auld_lang_syne/pipes.d.ly b/4-4_marches/auld_lang_syne/pipes.d.ly
new file mode 100644
index 0000000..4ec687a
--- /dev/null
+++ b/4-4_marches/auld_lang_syne/pipes.d.ly
@@ -0,0 +1,30 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \transpose a d {
+	  \new Staff {
+		\global
+		\pipeglobal
+		\repeat volta 2 { 
+			\partial 4
+			\pipesA s4
+		}
+		\break
+		\repeat volta 2 {
+			\partial 4
+			\pipesB s4
+		}
+	}
+  }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/4-4_marches/battle_of_waterloo/config.ily b/4-4_marches/battle_of_waterloo/config.ily
index f27c965..d9fd857 100644
--- a/4-4_marches/battle_of_waterloo/config.ily
+++ b/4-4_marches/battle_of_waterloo/config.ily
@@ -1,7 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
-	\key d \major
+	\key a \mixolydian
 	\time 4/4
 	}
 confTempo = { 
diff --git a/4-4_marches/battle_of_waterloo/notes.pipes.ily b/4-4_marches/battle_of_waterloo/notes.pipes.ily
index dc727bc..7ad06f7 100644
--- a/4-4_marches/battle_of_waterloo/notes.pipes.ily
+++ b/4-4_marches/battle_of_waterloo/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/4-4_marches/bonnie_galloway/notes.pipes.ily b/4-4_marches/bonnie_galloway/notes.pipes.ily
index 32689f8..00aee3c 100644
--- a/4-4_marches/bonnie_galloway/notes.pipes.ily
+++ b/4-4_marches/bonnie_galloway/notes.pipes.ily
@@ -5,29 +5,25 @@
 hvthrwd = { \gripthrwd }
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
-pipesA = {
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \grg a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ f8 ] \dble e4 a4 | 
-
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \gre a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ d8 ] \dbld d2 
+pipesAA = {
+	\grg f4~ f8 [ c8 ] \grg e4 d4 |
+	\grg b8 [ d8~ ] d4 \grg a2 |
+	\grg a4~ a8 [ b8 ] \hvthrwd d4 f4 |
+	\grg e4~ e8 [ f8 ] \dble e4 a4 | 
+}
+pipesAB = {
+	\grg f4~ f8 [ c8 ] \grg e4 d4 |
+	\grg b8 [ d8~ ] d4 \gre a2 |
+	\grg a4~ a8 [ b8 ] \hvthrwd d4 f4 |
+	\grg e4~ e8 [ d8 ] \dbld d2 
 }
 
-pipesB = {
-	\dblA A4 A8 [ \grg A8 ] f4 \hvthrwd d4 |
+pipesBA = {
+	\dblA A4~ A8 [ \grg A8 ] f4 \hvthrwd d4 |
 	\dblA A4 d4 \dblf f2 |
-	\dblA A4 A8 [ \grg A8 ] f4 \hvthrwd d4 |
+	\dblA A4~ A8 [ \grg A8 ] f4 \hvthrwd d4 |
 	\grg c8 [ b8 ] \grg c8 [ d8 ] \dble e4 a4 | 
-
-	\grg f4 f8 [ c8 ] \grg e4 d4 |
-	\grg b8 [ d8 ] d4 \grg a2 |
-	\grg a4 a8 [ b8 ] \hvthrwd d4 f4 |
-	\grg e4 e8 [ d8 ] \dbld d4 
 }
diff --git a/4-4_marches/bonnie_lass_o_fyvie/notes.pipes.ily b/4-4_marches/bonnie_lass_o_fyvie/notes.pipes.ily
index bbaa803..1cba7bc 100644
--- a/4-4_marches/bonnie_lass_o_fyvie/notes.pipes.ily
+++ b/4-4_marches/bonnie_lass_o_fyvie/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Trad."
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 pipesA = {
 	a8 |
 	\thrwd d4 \dbld d8. [ e16 ] \thrwd d4~ d8 [ a8 ] |
diff --git a/4-4_marches/cabar_feidh/config.ily b/4-4_marches/cabar_feidh/config.ily
index 9740300..9064973 100644
--- a/4-4_marches/cabar_feidh/config.ily
+++ b/4-4_marches/cabar_feidh/config.ily
@@ -1,6 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
+	\key a \mixolydian
 	\time 4/4
 	}
 confTempo = { 
diff --git a/4-4_marches/cabar_feidh/notes.pipes.agira.ily b/4-4_marches/cabar_feidh/notes.pipes.agira.ily
index 6c719bf..c36ba04 100644
--- a/4-4_marches/cabar_feidh/notes.pipes.agira.ily
+++ b/4-4_marches/cabar_feidh/notes.pipes.agira.ily
@@ -6,7 +6,7 @@ titleAgira = "Cabar Feidh (Agira Version)"
 meterAgira = "March"
 instrumentPipesAgira = "Pipes"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAgiraA = {
diff --git a/4-4_marches/cabar_feidh/notes.pipes.charge.ily b/4-4_marches/cabar_feidh/notes.pipes.charge.ily
index dcf585a..0329d8d 100644
--- a/4-4_marches/cabar_feidh/notes.pipes.charge.ily
+++ b/4-4_marches/cabar_feidh/notes.pipes.charge.ily
@@ -6,8 +6,8 @@ meterCharge = "The Charge"
 titleCharge = "Cabar Feidh"
 instrumentPipesCharge = "Pipes"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesChargeA = {
 	e8 |
diff --git a/4-4_marches/cabar_feidh/notes.pipes.ily b/4-4_marches/cabar_feidh/notes.pipes.ily
index 4d0f9af..820f81e 100644
--- a/4-4_marches/cabar_feidh/notes.pipes.ily
+++ b/4-4_marches/cabar_feidh/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/4-4_marches/cockney_jocks/notes.pipes.ily b/4-4_marches/cockney_jocks/notes.pipes.ily
index f473439..c8a07d7 100644
--- a/4-4_marches/cockney_jocks/notes.pipes.ily
+++ b/4-4_marches/cockney_jocks/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	a8 |
diff --git a/4-4_marches/dawning_of_the_day/config.ily b/4-4_marches/dawning_of_the_day/config.ily
index 7ee748c..2f5c11f 100644
--- a/4-4_marches/dawning_of_the_day/config.ily
+++ b/4-4_marches/dawning_of_the_day/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/dawning_of_the_day/notes.pipes.ily b/4-4_marches/dawning_of_the_day/notes.pipes.ily
index 65b37ac..15b2743 100644
--- a/4-4_marches/dawning_of_the_day/notes.pipes.ily
+++ b/4-4_marches/dawning_of_the_day/notes.pipes.ily
@@ -1,10 +1,11 @@
 % 4/4 Dawning of the Day
 % Pipes
 \version "2.18.2"
-composerPipes = "Trad., arr. PM T.F.J. de Boone"
+composerPipes = "Trad."
+arrangerPipes = "PM T.F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipeAlines = {
  \grg a8 [ b8 ] |
diff --git a/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily b/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily
index 2f1f87a..7f0c2ab 100644
--- a/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily
+++ b/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily
@@ -1,10 +1,11 @@
 % 4/4 Dawning of the Day
 % Pipes (Seconds)
 \version "2.18.2"
-composerPipessecnd = "Trad., arr. PM T.F.J. de Boone"
+composerPipesSecnd = "Trad."
+arrangerPipesSecnd = "PM T.F.J. de Boone"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndAA = {
 	\grg c8 [ d8 ] |
 	\grg e4 \grG e4 \grg e4 \grg d8 [ e8 ] |
diff --git a/4-4_marches/dawning_of_the_day/pipes.full.ly b/4-4_marches/dawning_of_the_day/pipes.full.ly
index 9673d52..65c40f7 100644
--- a/4-4_marches/dawning_of_the_day/pipes.full.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.full.ly
@@ -45,11 +45,11 @@
 		composer = \markup \large {
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesSecnd))  #{ \markup {\line { \composerPipesSecnd ":" }} #} )
 			}
 			\column \right-align {
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesSecnd))  #{ \markup {\line { \instrumentPipesSecnd }}#} )
 			}
 		}
 	}
diff --git a/4-4_marches/dawning_of_the_day/pipes.ly b/4-4_marches/dawning_of_the_day/pipes.ly
index 8f0223e..f66e320 100644
--- a/4-4_marches/dawning_of_the_day/pipes.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.ly
@@ -29,6 +29,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -44,4 +45,11 @@
 		\pipesBB
 	}
 	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
 }
diff --git a/4-4_marches/dawning_of_the_day/pipes.seconds.ly b/4-4_marches/dawning_of_the_day/pipes.seconds.ly
index 348f9be..0871232 100644
--- a/4-4_marches/dawning_of_the_day/pipes.seconds.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.seconds.ly
@@ -26,10 +26,12 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipessecnd
-		composer = \composerPipessecnd
+		instrument = \instrumentPipesSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
 	}
-}\score {
+}
+\score {
 	\new Staff { \global \pipessecndglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
@@ -42,4 +44,11 @@
 		\pipessecndBB 
 	}
 	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipesSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
 }
diff --git a/4-4_marches/flett_of_flotta/config.ily b/4-4_marches/flett_of_flotta/config.ily
index 9759690..a8cb236 100644
--- a/4-4_marches/flett_of_flotta/config.ily
+++ b/4-4_marches/flett_of_flotta/config.ily
@@ -1,6 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
+	\key a \mixolydian
 	\time 4/4
 }
 confTempo = {
diff --git a/4-4_marches/flett_of_flotta/notes.pipes.ily b/4-4_marches/flett_of_flotta/notes.pipes.ily
index dc84c34..b5204cf 100644
--- a/4-4_marches/flett_of_flotta/notes.pipes.ily
+++ b/4-4_marches/flett_of_flotta/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "PM Donald MacLeod"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg f8. [ e16 ]  |
 	\dblc c8. [ e16 ] \dblc c8 [ \gre b8 ] \dblc c4 \gre a8 [ \grd c8 ]  |
diff --git a/4-4_marches/green_glens_of_antrim/notes.pipes.ily b/4-4_marches/green_glens_of_antrim/notes.pipes.ily
index 94463d9..8ccaf8d 100644
--- a/4-4_marches/green_glens_of_antrim/notes.pipes.ily
+++ b/4-4_marches/green_glens_of_antrim/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "Traditional"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-}
+	\key d \major
+  }
 % Music
 pipesA = {
 	a8. [ d16 ] |
diff --git a/4-4_marches/hills_of_argyll/config.ily b/4-4_marches/hills_of_argyll/config.ily
index f2147cc..bd77586 100644
--- a/4-4_marches/hills_of_argyll/config.ily
+++ b/4-4_marches/hills_of_argyll/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/hills_of_argyll/notes.pipes.ily b/4-4_marches/hills_of_argyll/notes.pipes.ily
index fbdc91d..49292b7 100644
--- a/4-4_marches/hills_of_argyll/notes.pipes.ily
+++ b/4-4_marches/hills_of_argyll/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "G. McIntyre"
 arrangerPipes = "S. Cassells"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
  \grg a8. [ b16 ] |
diff --git a/4-4_marches/maple_leaf_forever/notes.pipes.ily b/4-4_marches/maple_leaf_forever/notes.pipes.ily
index 0624c43..d066816 100644
--- a/4-4_marches/maple_leaf_forever/notes.pipes.ily
+++ b/4-4_marches/maple_leaf_forever/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = "Alexander Muir"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 tb = { \pgrace { A32[ b ] } }
 % Music
diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily
index 718e7ab..467c8e1 100644
--- a/4-4_marches/minstrel_boy/config.ily
+++ b/4-4_marches/minstrel_boy/config.ily
@@ -2,11 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
-
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4 = 90
-	}
+}
 %% Format
 part = { \grace{s1} \partial 8 s8 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/minstrel_boy/notes.pipes.ily b/4-4_marches/minstrel_boy/notes.pipes.ily
index f25c04c..4531c82 100644
--- a/4-4_marches/minstrel_boy/notes.pipes.ily
+++ b/4-4_marches/minstrel_boy/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/4-4_marches/rowan_tree/config.ily b/4-4_marches/rowan_tree/config.ily
index 6be2685..2781e47 100644
--- a/4-4_marches/rowan_tree/config.ily
+++ b/4-4_marches/rowan_tree/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 s4 }
 measure = { \grace {s1} s1 | }
diff --git a/4-4_marches/rowan_tree/notes.pipes.ily b/4-4_marches/rowan_tree/notes.pipes.ily
index f385739..d86a418 100644
--- a/4-4_marches/rowan_tree/notes.pipes.ily
+++ b/4-4_marches/rowan_tree/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily
index ececcbf..12ccb9a 100644
--- a/4-4_marches/scotland_the_brave/config.ily
+++ b/4-4_marches/scotland_the_brave/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 }
 
 confTempo = {
diff --git a/4-4_marches/scotland_the_brave/notes.pipes.ily b/4-4_marches/scotland_the_brave/notes.pipes.ily
index 8716443..7435661 100644
--- a/4-4_marches/scotland_the_brave/notes.pipes.ily
+++ b/4-4_marches/scotland_the_brave/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
 	e8 |
diff --git a/4-4_marches/the_crusaders_march/config.ily b/4-4_marches/the_crusaders_march/config.ily
index c4b1494..6838173 100644
--- a/4-4_marches/the_crusaders_march/config.ily
+++ b/4-4_marches/the_crusaders_march/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 \grace{s4} s4 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/the_crusaders_march/notes.pipes.ily b/4-4_marches/the_crusaders_march/notes.pipes.ily
index dd5ec00..21fff47 100644
--- a/4-4_marches/the_crusaders_march/notes.pipes.ily
+++ b/4-4_marches/the_crusaders_march/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	\grg a8. [ b16 ]  |
 	\grg c4 \grip c4 \dblc c4 \gre a8. [ \grd c16 ]  |
diff --git a/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily
index f815984..d1321c0 100644
--- a/4-4_marches/the_leaving_of_liverpool/config.ily
+++ b/4-4_marches/the_leaving_of_liverpool/config.ily
@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 4/4
-	}
-
+	\key a \mixolydian
+}
 %% Format
 part = { \partial 4 s4 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily b/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
index de195d2..a3584ad 100644
--- a/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
+++ b/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesAA = {
 	\grg a8. [ b16 ] 
 	\grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] |
diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily
index e084640..a874892 100644
--- a/4-4_marches/the_old_rustic_bridge/config.ily
+++ b/4-4_marches/the_old_rustic_bridge/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key d \major
 }
 confTempo = {
 	\tempo 4 = 90
diff --git a/4-4_marches/the_old_rustic_bridge/notes.pipes.ily b/4-4_marches/the_old_rustic_bridge/notes.pipes.ily
index e3c3528..b12b29f 100644
--- a/4-4_marches/the_old_rustic_bridge/notes.pipes.ily
+++ b/4-4_marches/the_old_rustic_bridge/notes.pipes.ily
@@ -3,28 +3,28 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesAA = {
-\grg a8. [ d16 ] \bar "|"
- \grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] \bar "|"
- \dblb b4 \gre G8 [ \whslurd d8 ] \grg a4. \grd a8 \bar "|"
- \grg b4 \grg c8 [ d8 ] \dbld d4 \grg c8. [ d16 ] \bar "|"
- \grg e4 \gra e8. [ f16 ] \grg e4 \grg a8. [ d16 ] \bar "|"
+	\grg a8. [ d16 ] |
+	\grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] |
+	\dblb b4 \gre G8 [ \whslurd d8 ] \grg a4. \grd a8 |
+	\grg b4 \grg c8 [ d8 ] \dbld d4 \grg c8. [ d16 ] |
+	\grg e4 \gra e8. [ f16 ] \grg e4 \grg a8. [ d16 ] |
 }
 
 pipesAB = {
- \grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] \bar "|"
- \dblb b4 \gre G8 [\whslurd d8 ] \grg a4. \grd a8 \bar "|"
- \grg b4 \grg e8 [ g8 ] \grA f8 [ e8 ] \grg c8 [ a8 ] \bar "|"
- \thrwd d2 \dbld d4
+	\grg f4 \gre f8. [ g16 ] \hdblf f4 \thrwd d8. [ c16 ] |
+	\dblb b4 \gre G8 [\whslurd d8 ] \grg a4. \grd a8 |
+	\grg b4 \grg e8 [ g8 ] \grA f8 [ e8 ] \grg c8 [ a8 ] |
+	\thrwd d2 \dbld d4
 }
 
 pipesBA = {
- \grg e8. [ d16 ] \bar "|"
- \grg c4 \grip c8. [ d16 ] \grg e4 \grg f8 [ e8 ] \bar "|"
- \dble e4 \grg b8. [ c16 ] \thrwd d4. \grc d8 \bar "|"
- \dblc c4 \dblA A8 [ c8 ] \grg e8 [ d8 ] \grg c8 [ b8 ] \bar "|"
- \grg a4 \grg b4 \grip c4 \grg b8 [ \grG a8 ] \bar "|"
+	\grg e8. [ d16 ] |
+	\grg c4 \grip c8. [ d16 ] \grg e4 \grg f8 [ e8 ] |
+	\dble e4 \grg b8. [ c16 ] \thrwd d4. \grc d8 |
+	\dblc c4 \dblA A8 [ c8 ] \grg e8 [ d8 ] \grg c8 [ b8 ] |
+	\grg a4 \grg b4 \grip c4 \grg b8 [ \grG a8 ] |
 }
diff --git a/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily
index 942c575..a293904 100644
--- a/4-4_marches/the_pikemans_march/config.ily
+++ b/4-4_marches/the_pikemans_march/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 90 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/the_pikemans_march/notes.pipes.ily b/4-4_marches/the_pikemans_march/notes.pipes.ily
index 4dc6c4b..de60830 100644
--- a/4-4_marches/the_pikemans_march/notes.pipes.ily
+++ b/4-4_marches/the_pikemans_march/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 e8 |
diff --git a/4-4_marches/were_no_awa_tae_bide_awa/config.ily b/4-4_marches/were_no_awa_tae_bide_awa/config.ily
index 6da4756..6b448e6 100644
--- a/4-4_marches/were_no_awa_tae_bide_awa/config.ily
+++ b/4-4_marches/were_no_awa_tae_bide_awa/config.ily
@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 }
-
 confTempo = {
 	\tempo 4 = 90
 }
diff --git a/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily
index f720bde..0ac5ad0 100644
--- a/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily
+++ b/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg a8. [ b16 ] |
diff --git a/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily
index e6c11a1..a0cdcd5 100644
--- a/4-4_marches/wings/config.ily
+++ b/4-4_marches/wings/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4 = 90
-	}
+}
 %% Format
 part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
diff --git a/4-4_marches/wings/notes.pipes.ily b/4-4_marches/wings/notes.pipes.ily
index 02f9484..886d951 100644
--- a/4-4_marches/wings/notes.pipes.ily
+++ b/4-4_marches/wings/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/5-4_marches/cullen_bay/bass.hmpd.ly b/5-4_marches/cullen_bay/bass.hmpd.ly
index 7cb7f24..e9319aa 100644
--- a/5-4_marches/cullen_bay/bass.hmpd.ly
+++ b/5-4_marches/cullen_bay/bass.hmpd.ly
@@ -16,7 +16,8 @@
     		}
 	}
 	\header {
-		title = \markup \column { \title \smaller "Holland Massed P&D" }
+		title = \title
+		band = "Holland Massed Pipes and Drums"
 		meter = \meter
 		instrument = \instrumentBass
 		composer = \composerBass
diff --git a/5-4_marches/cullen_bay/config.ily b/5-4_marches/cullen_bay/config.ily
index 17a625e..daa2405 100644
--- a/5-4_marches/cullen_bay/config.ily
+++ b/5-4_marches/cullen_bay/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 5/4
-	}
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4 = 90
-	}
+}
 %% Format
 part = {\partial 8 s8 }
 measure = { \grace { s4 } s2 s2. | }
diff --git a/5-4_marches/cullen_bay/drums.hmpd.ly b/5-4_marches/cullen_bay/drums.hmpd.ly
index fe184df..cdf7312 100644
--- a/5-4_marches/cullen_bay/drums.hmpd.ly
+++ b/5-4_marches/cullen_bay/drums.hmpd.ly
@@ -9,7 +9,6 @@
 
 #(set-global-staff-size 14)
 date = \markup { 16-02-2016 }
-title = \markup { \title \normalsize "(HMPD)" }
 
 \score {
 	\new StaffGroup <<
@@ -60,7 +59,8 @@ title = \markup { \title \normalsize "(HMPD)" }
 	>>
 	\header {
 		date = \date
-		title = \markup \column { \title \smaller "Holland Massed P&D" }
+		title = \title 
+		band = "Holland Massed P&D"
 		meter = \meter
 		composer = \markup \tiny { \composerSide ":" "Drums"
 		}
diff --git a/5-4_marches/cullen_bay/mid.hmpd.ly b/5-4_marches/cullen_bay/mid.hmpd.ly
index 1006e8a..9670605 100644
--- a/5-4_marches/cullen_bay/mid.hmpd.ly
+++ b/5-4_marches/cullen_bay/mid.hmpd.ly
@@ -45,7 +45,8 @@ title = \markup { \title \normalsize "(HMPD)" }
 		}
 	>>
 	\header {
-		title = \markup \column { \title \smaller "Holland Massed P&D" }
+		title = \title
+		band = "Holland Massed P&D"
 		meter = \meter
 		composer = \markup {
 			\column \right-align {
diff --git a/5-4_marches/cullen_bay/notes.pipes.ily b/5-4_marches/cullen_bay/notes.pipes.ily
index c9a8e2b..1037207 100644
--- a/5-4_marches/cullen_bay/notes.pipes.ily
+++ b/5-4_marches/cullen_bay/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "I. Duncan"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2 |
diff --git a/5-4_marches/cullen_bay/side.48th.ly b/5-4_marches/cullen_bay/side.48th.ly
index e47caef..e53cbff 100644
--- a/5-4_marches/cullen_bay/side.48th.ly
+++ b/5-4_marches/cullen_bay/side.48th.ly
@@ -23,7 +23,7 @@
 	}
 	\header {
 		title = \title
-		band = "48th HLDRS"
+		band = "48th HIGHRS"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
diff --git a/5-4_marches/cullen_bay/side.hmpd.ly b/5-4_marches/cullen_bay/side.hmpd.ly
index 4f71a19..01dd28b 100644
--- a/5-4_marches/cullen_bay/side.hmpd.ly
+++ b/5-4_marches/cullen_bay/side.hmpd.ly
@@ -25,7 +25,8 @@
 		>>
 	}
 	\header {
-		title = \markup \column { \title \smaller "Holland Massed P&D" }
+		title = \title
+		band = "Holland Massed P&D"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
diff --git a/5-4_marches/cullen_bay/tenor.hmpd.ly b/5-4_marches/cullen_bay/tenor.hmpd.ly
index bb2f6dc..d0bbe0b 100644
--- a/5-4_marches/cullen_bay/tenor.hmpd.ly
+++ b/5-4_marches/cullen_bay/tenor.hmpd.ly
@@ -17,7 +17,8 @@ title = \markup { \title \normalsize "(HMPD)" }
 		>>
 	}
 	\header {
-		title = \markup \column { \title \smaller "Holland Massed P&D" }
+		title = \title
+		band = "Holland Massed Pipes and Drums"
 		meter = \meter
 		instrument = \instrumentTenor
 		composer = \composerTenor
diff --git a/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily b/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
index 6031808..ede5625 100644
--- a/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
+++ b/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesAA = {
 	\grg a8 |
diff --git a/6-8_marches/72nd_highlanders/notes.pipes.ily b/6-8_marches/72nd_highlanders/notes.pipes.ily
index 101f586..11f6727 100644
--- a/6-8_marches/72nd_highlanders/notes.pipes.ily
+++ b/6-8_marches/72nd_highlanders/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\grg f8. [ e16 ] |
diff --git a/6-8_marches/cock_o_the_north/config.ily b/6-8_marches/cock_o_the_north/config.ily
index 055202f..5721f41 100644
--- a/6-8_marches/cock_o_the_north/config.ily
+++ b/6-8_marches/cock_o_the_north/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2. = 90 
-	}
+}
 %% Format
 part = { \partial 8 \grace { s4 } s8 }
 measure = { \grace { s4 } s1. | }
diff --git a/6-8_marches/cock_o_the_north/notes.pipes.ily b/6-8_marches/cock_o_the_north/notes.pipes.ily
index 4d2e68b..bb442d9 100644
--- a/6-8_marches/cock_o_the_north/notes.pipes.ily
+++ b/6-8_marches/cock_o_the_north/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	A8 |
diff --git a/6-8_marches/farewell_to_the_creeks/config.ily b/6-8_marches/farewell_to_the_creeks/config.ily
index b0f69fc..0c50bba 100644
--- a/6-8_marches/farewell_to_the_creeks/config.ily
+++ b/6-8_marches/farewell_to_the_creeks/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace {s1} s2. | }
diff --git a/6-8_marches/farewell_to_the_creeks/notes.pipes.ily b/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
index 75c5164..41a6cc3 100644
--- a/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
+++ b/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
@@ -4,8 +4,9 @@
 composerPipes = "PM J. Robertson"
 arrangerPipes = "Seaforths of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
+
 % Music
 pipesA = {
 	A8 |
diff --git a/6-8_marches/glendaruel_highlanders/config.ily b/6-8_marches/glendaruel_highlanders/config.ily
index 3f823eb..d7c609d 100644
--- a/6-8_marches/glendaruel_highlanders/config.ily
+++ b/6-8_marches/glendaruel_highlanders/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace { s4 } s8 }
 measure = { \grace {s1} s2. | }
diff --git a/6-8_marches/glendaruel_highlanders/notes.pipes.ily b/6-8_marches/glendaruel_highlanders/notes.pipes.ily
index 120437c..b51d914 100644
--- a/6-8_marches/glendaruel_highlanders/notes.pipes.ily
+++ b/6-8_marches/glendaruel_highlanders/notes.pipes.ily
@@ -6,7 +6,7 @@ composerPipesAdd = ", pts 3 & 4 PM D. R. MacLennan" % Seaforth Highlanders
 composerPipes = \markup { \composerPipes \composerPipesAdd }
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/6-8_marches/hills_of_glenorchy/config.ily b/6-8_marches/hills_of_glenorchy/config.ily
index f6eba74..9decbcf 100644
--- a/6-8_marches/hills_of_glenorchy/config.ily
+++ b/6-8_marches/hills_of_glenorchy/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4. = 90
-	}
+}
 
 %% Format
 part = { \partial 8 \grace{ s4 } s8 }
diff --git a/6-8_marches/hills_of_glenorchy/notes.pipes.ily b/6-8_marches/hills_of_glenorchy/notes.pipes.ily
index 08f1cc1..98c7879 100644
--- a/6-8_marches/hills_of_glenorchy/notes.pipes.ily
+++ b/6-8_marches/hills_of_glenorchy/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/6-8_marches/kilaloe/full.48th.ly b/6-8_marches/kilaloe/full.48th.ly
index 68f141f..5738312 100644
--- a/6-8_marches/kilaloe/full.48th.ly
+++ b/6-8_marches/kilaloe/full.48th.ly
@@ -27,10 +27,13 @@ part = { \partial 4. \grace {s4} s4. }
 					\break
 					\line \bar "||"
 					\break
+
 					\part
 					\line
 					\break
-					\line \bar ".|:-||"
+					\line
+					\bar ".|:-||"
+
 					\break
 					\repeat volta 2 {
 						\part
@@ -77,11 +80,11 @@ part = { \partial 4. \grace {s4} s4. }
 		} {
 			\sideglobal
 
+			\repeat unfold 2 {
 				\snareA \snareA s4.
+			}
 
-				\snareB \snareB s4.
-
-				\snareC
+			\snareC s4.
 
 		}
 		\new PipeBandDrumStaff = "tenor" \with {
@@ -90,14 +93,13 @@ part = { \partial 4. \grace {s4} s4. }
 		} {
 			\tenorglobal
 
-			r4. \tenorAA
-			\tenorAB
+			\repeat unfold 2 {
+				r4. \tenorAA r4. |
+				\tenorAB s4. |
+			}
 
-			r4.	\tenorAA
-			\tenorAB
-
-			r4. \tenorBA
-			\tenorBB
+			r4. \tenorBA r4. |
+			\tenorBB s4. |
 			| % Volta bracket for pipes
 		}
 %		\new PipeBandDrumStaff = "bass" \with {
@@ -110,6 +112,7 @@ part = { \partial 4. \grace {s4} s4. }
 	>>
 	\header {
 		title = \title
+		band = "48th HIGHRS"
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
diff --git a/6-8_marches/kilaloe/notes.pipes.ily b/6-8_marches/kilaloe/notes.pipes.ily
index 4027179..6980e8d 100644
--- a/6-8_marches/kilaloe/notes.pipes.ily
+++ b/6-8_marches/kilaloe/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\grg a8 |
diff --git a/6-8_marches/kilaloe/notes.side.48th.ily b/6-8_marches/kilaloe/notes.side.48th.ily
index e105897..7695287 100644
--- a/6-8_marches/kilaloe/notes.side.48th.ily
+++ b/6-8_marches/kilaloe/notes.side.48th.ily
@@ -2,20 +2,20 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-arrangerSide = "48th HIGHRS, 2018"
+arrangerSide = "2018"
 sideglobal = {}
 
 % Music
 snareA = \drummode {
-		d4.:32(\< |
-		d4)\! g8 \flam d4 g8 |
-		d4.:32( d4.:32)(\<|
-		d4) \!g8 \flam d8 g d |
-		g4.:32( d4.:32)(\<|
-		d4)\! g8 \flam d4 g8:32( |
-		d8) g d \flam g8 d g |
-		\flam d4. d4.:32( |
-		d4.)
+	d4.:32(\< |
+	d4)\! g8 \flam d4 g8 |
+	d4.:32( d4.:32)(\<|
+	d4) \!g8 \flam d8 g d |
+	g4.:32( d4.:32)(\<|
+	d4)\! g8 \flam d4 d8:32( |
+	d8) g d \flam g8 d g |
+	\flam d4. d4.:32( |
+	d4.)
 }
 snareB = \drummode { \snareA }
 
@@ -35,12 +35,9 @@ snareC = \drummode {
 	d2.:32( |
 	d4.) \flam d8 g d |
 	g2.:32( |
-	d4) g8:32( d4) g8:32( |
+	d4) g8:32( g4) d8:32( |
 	d8) g d \flam d4. |
-	r4. r4 g8:32( |
+	r4. r4 d8:32( |
 	d8) g d \flam d4 g8 |
-	d4.:32( d4)
+	d4.:32(
 }
-
-
-
diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily
index ba1e2ec..5930fd4 100644
--- a/6-8_marches/kilaloe/notes.tenor.ily
+++ b/6-8_marches/kilaloe/notes.tenor.ily
@@ -10,7 +10,7 @@ tenorAA = \drummode {
 	d4. g4. | d4. r4.\rswipe | 
 	d4. g4. | d4. r4.\rswipe |
 	d4. g4. | d4. g4. |
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }
 tenorAB = \drummode {
 	\flourish{
@@ -18,7 +18,7 @@ tenorAB = \drummode {
 	  d4. d4. | g4. g4. |
 	  d4. d4. | g4. g4. |
 	}
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }
 tenorBA = \drummode {
 	\tenorAA
@@ -30,5 +30,5 @@ tenorBB = \drummode {
 	  d4. d4. | g4. g4. |
 	}
 	r4. r4. |
-	d4.\up g4.\up | d4.\up r4. |
+	d4.\up g4.\up | d4.\up
 }
diff --git a/6-8_marches/kilaloe/side.48th.ly b/6-8_marches/kilaloe/side.48th.ly
index 62012da..47ea817 100644
--- a/6-8_marches/kilaloe/side.48th.ly
+++ b/6-8_marches/kilaloe/side.48th.ly
@@ -44,7 +44,8 @@ part = {\partial 4. \grace{ s4 } s4. }
 		>>
 	}
 	\header {
-		title = \markup \column { \title \normalsize "48th HIGHRS" }
+		title = \title
+		band = "48th HIGHRS"
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly
index 783962c..61165d7 100644
--- a/6-8_marches/kilaloe/tenor.ly
+++ b/6-8_marches/kilaloe/tenor.ly
@@ -17,11 +17,11 @@
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-				\tenorAA
-				\tenorAB
+				\tenorAA r4. |
+				\tenorAB r4. |
 
-				\tenorBA
-				\tenorBB
+				\tenorBA r4. |
+				\tenorBB r4. |
 			}
 		>>
 	}
diff --git a/6-8_marches/piobaireachd_of_donald_dubh/config.ily b/6-8_marches/piobaireachd_of_donald_dubh/config.ily
index dd8eca2..6a0c0d9 100644
--- a/6-8_marches/piobaireachd_of_donald_dubh/config.ily
+++ b/6-8_marches/piobaireachd_of_donald_dubh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 90 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace { s4 } s1. | }
diff --git a/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily b/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
index 41c3568..8d95985 100644
--- a/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
+++ b/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-  \bagpipeKey
-	}
+	\key a \mixolydian
+}
 mbreak = \break
 % Music
 pipesA = {
diff --git a/6-8_marches/the_steamboat/config.ily b/6-8_marches/the_steamboat/config.ily
index ea9332e..4b6c722 100644
--- a/6-8_marches/the_steamboat/config.ily
+++ b/6-8_marches/the_steamboat/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace { s4 } s1. | }
diff --git a/6-8_marches/the_steamboat/notes.pipes.ily b/6-8_marches/the_steamboat/notes.pipes.ily
index 7f4de6c..c440a93 100644
--- a/6-8_marches/the_steamboat/notes.pipes.ily
+++ b/6-8_marches/the_steamboat/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "Trad., 1936"
 composerPipesAdd = ", pts 3 & 4 by R. Petre" %Ruaraith Petre
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/9-8_marches/battle_of_the_somme/notes.pipes.ily b/9-8_marches/battle_of_the_somme/notes.pipes.ily
index fd45454..afc1507 100644
--- a/9-8_marches/battle_of_the_somme/notes.pipes.ily
+++ b/9-8_marches/battle_of_the_somme/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "W. Laurie"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	a8 |
diff --git a/9-8_marches/going_to_vancouver_hills/config.ily b/9-8_marches/going_to_vancouver_hills/config.ily
index f4a057c..25ebfdd 100644
--- a/9-8_marches/going_to_vancouver_hills/config.ily
+++ b/9-8_marches/going_to_vancouver_hills/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 9/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2. = 80 
-	}
+}
 %% Format
 measure = { \grace {s1} s4.*3 | }
 halfline = { \repeat unfold 4 \measure }
diff --git a/9-8_marches/going_to_vancouver_hills/notes.pipes.ily b/9-8_marches/going_to_vancouver_hills/notes.pipes.ily
index f6aeb12..2373e52 100644
--- a/9-8_marches/going_to_vancouver_hills/notes.pipes.ily
+++ b/9-8_marches/going_to_vancouver_hills/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "PM F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg a4 \grd c8 \grip e4. \dble e4. |
diff --git a/9-8_marches/heights_of_dargai/config.ily b/9-8_marches/heights_of_dargai/config.ily
index 43f318b..09e8331 100644
--- a/9-8_marches/heights_of_dargai/config.ily
+++ b/9-8_marches/heights_of_dargai/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 9/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace {s1} s4.*3 | }
diff --git a/9-8_marches/heights_of_dargai/notes.pipes.ily b/9-8_marches/heights_of_dargai/notes.pipes.ily
index 914954f..1346cb8 100644
--- a/9-8_marches/heights_of_dargai/notes.pipes.ily
+++ b/9-8_marches/heights_of_dargai/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "J. Wallace"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg a8. [ b16 \grip c8 ] \dble e4. \dblc c4 e8 |
diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily
index 208d204..2532e53 100644
--- a/airs/abide_with_me/config.ily
+++ b/airs/abide_with_me/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 }
 confTempo = {
   	\tempo 4 = 60
diff --git a/airs/abide_with_me/notes.pipes.ily b/airs/abide_with_me/notes.pipes.ily
index c6ec0b3..4241d06 100644
--- a/airs/abide_with_me/notes.pipes.ily
+++ b/airs/abide_with_me/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "W. H. Monk"
 arrangerPipes = "J.J. van Ommen Kloeke"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipes = {
 	\grg c2 \grip c4 \gre b4 
diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily
index 34b4d6c..59b292c 100644
--- a/airs/alexander_mackenzie/config.ily
+++ b/airs/alexander_mackenzie/config.ily
@@ -2,7 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = {
 	\tempo 4. = 60
 }
diff --git a/airs/alexander_mackenzie/notes.pipes.ily b/airs/alexander_mackenzie/notes.pipes.ily
index 7ef47de..3962a91 100644
--- a/airs/alexander_mackenzie/notes.pipes.ily
+++ b/airs/alexander_mackenzie/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
 	\grg e16. [ d32 ] |
diff --git a/airs/alexander_mackenzie/notes.pipes.seconds.ily b/airs/alexander_mackenzie/notes.pipes.seconds.ily
index 18eb663..6874f88 100644
--- a/airs/alexander_mackenzie/notes.pipes.seconds.ily
+++ b/airs/alexander_mackenzie/notes.pipes.seconds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipessecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 	\grg c16. [ f32 ] |
 	\dble e8 [ \grg c8. d16 ] \grg c4 \grg c8 |
diff --git a/airs/going_home/config.ily b/airs/going_home/config.ily
index 0337581..473c663 100644
--- a/airs/going_home/config.ily
+++ b/airs/going_home/config.ily
@@ -1,7 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
-	\key d \major
+	\key a \mixolydian
 	\time 6/8
 	}
 confTempo = {
diff --git a/airs/going_home/notes.pipes.ily b/airs/going_home/notes.pipes.ily
index 38aee08..eb42710 100644
--- a/airs/going_home/notes.pipes.ily
+++ b/airs/going_home/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "A. Dvořák (W. A. Fisher)"
 arrangerPipes = ""
 pipeglobal = {
-	\key a \major
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
@@ -42,4 +42,4 @@ pipesBB = {
 	\grg f4 g8 \dblA A4. |
 	\grg b4 c8 \grg b4 \grG a8 |
 	\grg a4. \wbirl a4.
-	}
\ No newline at end of file
+	}
diff --git a/airs/highland_cathedral/config.ily b/airs/highland_cathedral/config.ily
index 4625518..7705b60 100644
--- a/airs/highland_cathedral/config.ily
+++ b/airs/highland_cathedral/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key d \major
 	}
 confTempo = { 
 	\tempo 4 = 40 
diff --git a/airs/highland_cathedral/notes.pipes.ily b/airs/highland_cathedral/notes.pipes.ily
index 89ca031..2b1de7f 100644
--- a/airs/highland_cathedral/notes.pipes.ily
+++ b/airs/highland_cathedral/notes.pipes.ily
@@ -1,10 +1,11 @@
 % 4/4 Highland Cathedral
 % Pipes
 \version "2.18.2"
-composerPipes = "arr. Marc Gouswaart"
+composerPipes = "M. Korb, U. Roever, 1982"
+arrangerPipes = "Marc Gouswaart"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	d4. e16 [ f16 ] \dble e8 [ d8 ] \grg a8 [ d8 ] |
diff --git a/airs/highland_cathedral/pipes.ly b/airs/highland_cathedral/pipes.ly
index 57002f7..c6f7346 100644
--- a/airs/highland_cathedral/pipes.ly
+++ b/airs/highland_cathedral/pipes.ly
@@ -42,6 +42,7 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
 \score {
@@ -59,5 +60,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
diff --git a/airs/miss_kirkwood/config.ily b/airs/miss_kirkwood/config.ily
index bd8420a..bcaf897 100644
--- a/airs/miss_kirkwood/config.ily
+++ b/airs/miss_kirkwood/config.ily
@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-  }
-
+	\key a \mixolydian
+}
 confTempo = {
   	\tempo 4. = 46
 }
diff --git a/airs/miss_kirkwood/notes.pipes.ily b/airs/miss_kirkwood/notes.pipes.ily
index d1a3f23..f641df2 100644
--- a/airs/miss_kirkwood/notes.pipes.ily
+++ b/airs/miss_kirkwood/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/airs/miss_kirkwood/notes.pipes.seconds.ily b/airs/miss_kirkwood/notes.pipes.seconds.ily
index c50a0a7..b7f0303 100644
--- a/airs/miss_kirkwood/notes.pipes.seconds.ily
+++ b/airs/miss_kirkwood/notes.pipes.seconds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 	e8 |
 	\dble e4. \dbld d4 c8 |
diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily
index aecf2da..c98fd7e 100644
--- a/airs/morag_of_dunvegan/config.ily
+++ b/airs/morag_of_dunvegan/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2. = 45 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace {s1} s2. | }
diff --git a/airs/morag_of_dunvegan/notes.pipes.ily b/airs/morag_of_dunvegan/notes.pipes.ily
index 383d18c..1154c98 100644
--- a/airs/morag_of_dunvegan/notes.pipes.ily
+++ b/airs/morag_of_dunvegan/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "N. Mathieson"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grG a8 ] |
diff --git a/airs/salute_to_the_royal_fendersmith/config.ily b/airs/salute_to_the_royal_fendersmith/config.ily
index 11da2b6..9179472 100644
--- a/airs/salute_to_the_royal_fendersmith/config.ily
+++ b/airs/salute_to_the_royal_fendersmith/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 12/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 40 
-	}
+}
 %% Format
 part = { \partial 4. \grace{s4.} s4. }
 measure = { \grace {s1} s1. | }
diff --git a/airs/salute_to_the_royal_fendersmith/notes.pipes.ily b/airs/salute_to_the_royal_fendersmith/notes.pipes.ily
index d7d210e..994128e 100644
--- a/airs/salute_to_the_royal_fendersmith/notes.pipes.ily
+++ b/airs/salute_to_the_royal_fendersmith/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "PM J.M. Banks"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/airs/salute_to_the_royal_fendersmith/notes.pipes.seconds.ily b/airs/salute_to_the_royal_fendersmith/notes.pipes.seconds.ily
index ff4fea5..e97c144 100644
--- a/airs/salute_to_the_royal_fendersmith/notes.pipes.seconds.ily
+++ b/airs/salute_to_the_royal_fendersmith/notes.pipes.seconds.ily
@@ -4,7 +4,7 @@
 composerPipesSecnd = "PM J.M. Banks"
 arrangerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipessecndAA = { % Same as pipesA
diff --git a/airs/salute_to_the_royal_fendersmith/pipes.full.c.ly b/airs/salute_to_the_royal_fendersmith/pipes.full.c.ly
new file mode 100644
index 0000000..3056475
--- /dev/null
+++ b/airs/salute_to_the_royal_fendersmith/pipes.full.c.ly
@@ -0,0 +1,59 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+%\include "./notes.pipes.thirds.ily"
+
+mbreak = \break
+pipes = {\pipeglobal \pipesA \pipesB }
+pipesII = {
+			\pipessecndglobal
+  \pipessecndAA \pipessecndAB
+  \pipessecndBA \pipessecndBB
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes" \with{
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			<<
+			  	\new NullVoice = "format" {
+					\part \halfline \mbreak \halfline \bar "||"
+					\break
+					\halfline \mbreak \halfline \bar "|."
+				}%Format
+				\set Staff.printPartCombineTexts = ##f
+				\partcombine \pipes \pipesII
+			>>
+		}
+%		\new Staff = "thirds" \with {
+%			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
+%		} {
+%			\pipesthrdglobal
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \composerPipesthrd  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \instrumentPipesthrd }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily
index 972f28a..fbc9b20 100644
--- a/airs/the_mist_covered_mountains/config.ily
+++ b/airs/the_mist_covered_mountains/config.ily
@@ -2,8 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-	}
-
+	\key b \minor
+}
 confTempo = {
   \tempo 2. = 40
 }
diff --git a/airs/the_mist_covered_mountains/notes.pipes.ily b/airs/the_mist_covered_mountains/notes.pipes.ily
index e4f3662..9f6f572 100644
--- a/airs/the_mist_covered_mountains/notes.pipes.ily
+++ b/airs/the_mist_covered_mountains/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key b \minor
+}
 % Music
 pipesA = {
  \grg b4. \taor b4. |
diff --git a/airs/the_mist_covered_mountains/pipes.ly b/airs/the_mist_covered_mountains/pipes.ly
index 675deb5..17e0f24 100644
--- a/airs/the_mist_covered_mountains/pipes.ly
+++ b/airs/the_mist_covered_mountains/pipes.ly
@@ -9,21 +9,14 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			{
-			  	\repeat volta 2 { 
-					\line 
-			  	} 
-			  	\break
-				\repeat volta 2 {
-					\line
-				}
-			}%Format
-			{
-			  \pipesA
-			  \pipesB
-			}
-		>>
+	
+	   	\repeat volta 2 { 
+	 		\pipesA
+	   	} 
+	   	\break
+	 	\repeat volta 2 {
+	 		\pipesB
+	 	}
 	}
 	\header {
 		title = \title
diff --git a/christmas/de_herdertjes_lagen_bij_nachte/notes.pipes.ily b/christmas/de_herdertjes_lagen_bij_nachte/notes.pipes.ily
index 796f0cd..b3e121e 100644
--- a/christmas/de_herdertjes_lagen_bij_nachte/notes.pipes.ily
+++ b/christmas/de_herdertjes_lagen_bij_nachte/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "PM T.F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/hornpipes/cabar_feidh/config.ily b/hornpipes/cabar_feidh/config.ily
index 95602e1..4c4a2b5 100644
--- a/hornpipes/cabar_feidh/config.ily
+++ b/hornpipes/cabar_feidh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 16 \grace{s1} s16}
 measure = { \grace {s1} s2 | }
diff --git a/hornpipes/cabar_feidh/notes.pipes.ily b/hornpipes/cabar_feidh/notes.pipes.ily
index 45bf33d..91baca1 100644
--- a/hornpipes/cabar_feidh/notes.pipes.ily
+++ b/hornpipes/cabar_feidh/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = ""
 arrangerPipes = "Paul Ward"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 e16 |
diff --git a/hornpipes/the_jolly_beggarman/config.ily b/hornpipes/the_jolly_beggarman/config.ily
index 48958b2..e3af79c 100644
--- a/hornpipes/the_jolly_beggarman/config.ily
+++ b/hornpipes/the_jolly_beggarman/config.ily
@@ -2,10 +2,12 @@
 %% Globals
 global = {
 	\time 2/4
-	}
-confTempo = {
+	\key a \mixolydian
+}
+confTempo = { 
 	\tempo 4 = 70
-	}
+}
+>>>>>>> tunekeys
 %% Format
 part = { \partial 8 \grace {s1} s8 }
 measure = { \grace {s1} s2 | }
diff --git a/hornpipes/the_jolly_beggarman/notes.pipes.ily b/hornpipes/the_jolly_beggarman/notes.pipes.ily
index 3c223e6..e2fc3d5 100644
--- a/hornpipes/the_jolly_beggarman/notes.pipes.ily
+++ b/hornpipes/the_jolly_beggarman/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesMid = {
diff --git a/hornpipes/the_walrus/config.ily b/hornpipes/the_walrus/config.ily
index 6c94cb5..b805df4 100644
--- a/hornpipes/the_walrus/config.ily
+++ b/hornpipes/the_walrus/config.ily
@@ -2,7 +2,8 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 %% Format
 part = { \partial 8 \grace { s4 } s8 }
 measure = { \grace { s4 } s2 | }
diff --git a/hornpipes/the_walrus/notes.pipes.ily b/hornpipes/the_walrus/notes.pipes.ily
index 1a7cb40..9fb2e4a 100644
--- a/hornpipes/the_walrus/notes.pipes.ily
+++ b/hornpipes/the_walrus/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = "R. Mathieson"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 	\set Staff.midiInstrument = #"bagpipe"
 	}
 pipesA = {
diff --git a/hornpipes/young_pipers/notes.pipes.ily b/hornpipes/young_pipers/notes.pipes.ily
index 816c020..d27d6ed 100644
--- a/hornpipes/young_pipers/notes.pipes.ily
+++ b/hornpipes/young_pipers/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = "J. Teerlinck-Wiegerinck"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % LOL: In total 296 notes
 % Music
diff --git a/jigs/cabar_feidh/config.ily b/jigs/cabar_feidh/config.ily
index b9bf46b..dc33731 100644
--- a/jigs/cabar_feidh/config.ily
+++ b/jigs/cabar_feidh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 130 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s1} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/jigs/cabar_feidh/notes.pipes.ily b/jigs/cabar_feidh/notes.pipes.ily
index a3f3b84..58c5940 100644
--- a/jigs/cabar_feidh/notes.pipes.ily
+++ b/jigs/cabar_feidh/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "D. Johnstone"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/jigs/the_panda/config.ily b/jigs/the_panda/config.ily
index 46ef3c4..01b0c8f 100644
--- a/jigs/the_panda/config.ily
+++ b/jigs/the_panda/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 120 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/jigs/the_panda/notes.pipes.ily b/jigs/the_panda/notes.pipes.ily
index 603b436..2115937 100644
--- a/jigs/the_panda/notes.pipes.ily
+++ b/jigs/the_panda/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "R. Mathieson"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/other/god_save_the_queen/notes.pipes.ily b/other/god_save_the_queen/notes.pipes.ily
index 648882a..da39f4c 100644
--- a/other/god_save_the_queen/notes.pipes.ily
+++ b/other/god_save_the_queen/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\thrwd d4 \slurd d4 \dble e4 |
diff --git a/other/o_canada/config.ily b/other/o_canada/config.ily
index 9f36054..97a26cc 100644
--- a/other/o_canada/config.ily
+++ b/other/o_canada/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 measure = { \grace {s1} s2 | }
 halfline = { \repeat unfold 4 \measure }
diff --git a/other/o_canada/notes.pipes.ily b/other/o_canada/notes.pipes.ily
index ff6fc09..37077dd 100644
--- a/other/o_canada/notes.pipes.ily
+++ b/other/o_canada/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Calixa Lavallée"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg c4 \grg e8. [ \gra e16 ] |
diff --git a/other/o_canada/pipes.bes.ly b/other/o_canada/pipes.bes.ly
new file mode 100644
index 0000000..1bc5dea
--- /dev/null
+++ b/other/o_canada/pipes.bes.ly
@@ -0,0 +1,32 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \transpose f d \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat unfold 7 {
+				  	\repeat unfold 4 \measure
+					\break
+				}
+				\bar "|."
+			}%Format
+			
+			\new Voice = "pipes" {
+				\pipesA
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/other/wilhelmus/notes.pipes.ily b/other/wilhelmus/notes.pipes.ily
index ac4b915..0145862 100644
--- a/other/wilhelmus/notes.pipes.ily
+++ b/other/wilhelmus/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\grg a4 |
diff --git a/reels/cabar_feidh/config.ily b/reels/cabar_feidh/config.ily
index 4222974..e516d0e 100644
--- a/reels/cabar_feidh/config.ily
+++ b/reels/cabar_feidh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/2
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2 = 80 
-	}
+}
 %% Format
 part = { \partial 16 \grace{s1} s16 }
 measure = { \grace {s1} s1 | }
diff --git a/reels/cabar_feidh/notes.pipes.ily b/reels/cabar_feidh/notes.pipes.ily
index 86aee6e..3e18649 100644
--- a/reels/cabar_feidh/notes.pipes.ily
+++ b/reels/cabar_feidh/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	f16 |
diff --git a/reels/jock_wilsons_ball/config.ily b/reels/jock_wilsons_ball/config.ily
index fdbbcd3..6b686a8 100644
--- a/reels/jock_wilsons_ball/config.ily
+++ b/reels/jock_wilsons_ball/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/2
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2 = 60 
-	}
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace{s1} s2 s2 | }
diff --git a/reels/jock_wilsons_ball/notes.pipes.ily b/reels/jock_wilsons_ball/notes.pipes.ily
index 71785d7..bc465c0 100644
--- a/reels/jock_wilsons_ball/notes.pipes.ily
+++ b/reels/jock_wilsons_ball/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesAA = {
 	\thrwd d4 c4 \dblb b4 \grg f4 |
diff --git a/reels/piobaireachd_of_donald_dubh/config.ily b/reels/piobaireachd_of_donald_dubh/config.ily
index d96257b..ff23274 100644
--- a/reels/piobaireachd_of_donald_dubh/config.ily
+++ b/reels/piobaireachd_of_donald_dubh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/2
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 2 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s1 | }
diff --git a/reels/piobaireachd_of_donald_dubh/notes.pipes.ily b/reels/piobaireachd_of_donald_dubh/notes.pipes.ily
index 3b6c79e..1daece6 100644
--- a/reels/piobaireachd_of_donald_dubh/notes.pipes.ily
+++ b/reels/piobaireachd_of_donald_dubh/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "J. MacInnis"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/reels/the_mackenzies_reel/config.ily b/reels/the_mackenzies_reel/config.ily
index 7dd4e12..7f2dd94 100644
--- a/reels/the_mackenzies_reel/config.ily
+++ b/reels/the_mackenzies_reel/config.ily
@@ -2,7 +2,8 @@
 %% Globals
 global = {
 	\time 2/2
-	}
+	\key a \mixolydian
+}	
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace {s1} s2 s2 | }
diff --git a/reels/the_mackenzies_reel/notes.pipes.ily b/reels/the_mackenzies_reel/notes.pipes.ily
index 32e44d3..5ea16c6 100644
--- a/reels/the_mackenzies_reel/notes.pipes.ily
+++ b/reels/the_mackenzies_reel/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipesA = {
 	A8 |
 	\birl a4 
diff --git a/sinterklaas/bonne_bonne_bonne/config.ily b/sinterklaas/bonne_bonne_bonne/config.ily
index 8f5b06d..1f56e46 100644
--- a/sinterklaas/bonne_bonne_bonne/config.ily
+++ b/sinterklaas/bonne_bonne_bonne/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s4} s2 | }
diff --git a/sinterklaas/bonne_bonne_bonne/notes.pipes.ily b/sinterklaas/bonne_bonne_bonne/notes.pipes.ily
index 4714cc7..96470de 100644
--- a/sinterklaas/bonne_bonne_bonne/notes.pipes.ily
+++ b/sinterklaas/bonne_bonne_bonne/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA =  \repeat unfold 2 {
diff --git a/sinterklaas/daar_wordt_aan_de_deur_geklopt/config.ily b/sinterklaas/daar_wordt_aan_de_deur_geklopt/config.ily
index 874060a..0028456 100644
--- a/sinterklaas/daar_wordt_aan_de_deur_geklopt/config.ily
+++ b/sinterklaas/daar_wordt_aan_de_deur_geklopt/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 3/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/sinterklaas/daar_wordt_aan_de_deur_geklopt/notes.pipes.ily b/sinterklaas/daar_wordt_aan_de_deur_geklopt/notes.pipes.ily
index c4860a2..723f01f 100644
--- a/sinterklaas/daar_wordt_aan_de_deur_geklopt/notes.pipes.ily
+++ b/sinterklaas/daar_wordt_aan_de_deur_geklopt/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/dag_sinterklaasje/config.ily b/sinterklaas/dag_sinterklaasje/config.ily
index e16b967..9110490 100644
--- a/sinterklaas/dag_sinterklaasje/config.ily
+++ b/sinterklaas/dag_sinterklaasje/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s4} s2 | }
diff --git a/sinterklaas/dag_sinterklaasje/notes.pipes.ily b/sinterklaas/dag_sinterklaasje/notes.pipes.ily
index b0b07db..bc09d06 100644
--- a/sinterklaas/dag_sinterklaasje/notes.pipes.ily
+++ b/sinterklaas/dag_sinterklaasje/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/de_zak_van_sinterklaas/config.ily b/sinterklaas/de_zak_van_sinterklaas/config.ily
index 59e62ac..2c69b31 100644
--- a/sinterklaas/de_zak_van_sinterklaas/config.ily
+++ b/sinterklaas/de_zak_van_sinterklaas/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 \grace{s4.} s4 }
 measure = { \grace {s1} s1 | }
diff --git a/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily b/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily
index f4ca615..34f4e82 100644
--- a/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily
+++ b/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/o_kom_er_eens_kijken/config.ily b/sinterklaas/o_kom_er_eens_kijken/config.ily
index 9756569..b7b3c28 100644
--- a/sinterklaas/o_kom_er_eens_kijken/config.ily
+++ b/sinterklaas/o_kom_er_eens_kijken/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily b/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily
index eaa8dfa..1040cf0 100644
--- a/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily
+++ b/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/sinterklaas_goedheiligman/config.ily b/sinterklaas/sinterklaas_goedheiligman/config.ily
index 5f12171..8607197 100644
--- a/sinterklaas/sinterklaas_goedheiligman/config.ily
+++ b/sinterklaas/sinterklaas_goedheiligman/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s4} s2 | }
diff --git a/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily b/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily
index 452383d..aa130d1 100644
--- a/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily
+++ b/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/sinterklaas_is_jarig/config.ily b/sinterklaas/sinterklaas_is_jarig/config.ily
index c03b37c..401e9f1 100644
--- a/sinterklaas/sinterklaas_is_jarig/config.ily
+++ b/sinterklaas/sinterklaas_is_jarig/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily b/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily
index b397b71..704373d 100644
--- a/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily
+++ b/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/notes.pipes.ily b/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/notes.pipes.ily
index 536f66e..63883e8 100644
--- a/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/notes.pipes.ily
+++ b/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily b/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
index 7b11e49..735216a 100644
--- a/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
+++ b/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesAAA = {
diff --git a/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily b/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily
index 2d093d2..38126f4 100644
--- a/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily
+++ b/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/zie_ginds_komt_de_stoomboot/notes.pipes.ily b/sinterklaas/zie_ginds_komt_de_stoomboot/notes.pipes.ily
index 0a25b75..beb6afc 100644
--- a/sinterklaas/zie_ginds_komt_de_stoomboot/notes.pipes.ily
+++ b/sinterklaas/zie_ginds_komt_de_stoomboot/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "Seaforth Highlanders of Holland"
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesAA = {
diff --git a/strathspeys/cabar_feidh/config.ily b/strathspeys/cabar_feidh/config.ily
index b17598d..bc3d22b 100644
--- a/strathspeys/cabar_feidh/config.ily
+++ b/strathspeys/cabar_feidh/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 110
-	}
+}
 %% Format
 part = { \partial 16 \grace{s1} s16 }
 measure = { \grace {s1} s1 | }
diff --git a/strathspeys/cabar_feidh/notes.pipes.ily b/strathspeys/cabar_feidh/notes.pipes.ily
index be6060d..e10a28c 100644
--- a/strathspeys/cabar_feidh/notes.pipes.ily
+++ b/strathspeys/cabar_feidh/notes.pipes.ily
@@ -4,7 +4,7 @@
 arrangerPipes = "PM William Ross"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily
index 4fb5f69..8db8577 100644
--- a/strathspeys/molly_connell/config.ily
+++ b/strathspeys/molly_connell/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 }
 confTempo = {
 	\tempo 4 = 120
diff --git a/strathspeys/molly_connell/notes.pipes.ily b/strathspeys/molly_connell/notes.pipes.ily
index 17af9f1..f1a2961 100644
--- a/strathspeys/molly_connell/notes.pipes.ily
+++ b/strathspeys/molly_connell/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "J. Wark (Strathclyde Police), 1978"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/template/notes.pipes.ily b/template/notes.pipes.ily
index cbdca51..9012048 100644
--- a/template/notes.pipes.ily
+++ b/template/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/template/notes.pipes.seconds.ily b/template/notes.pipes.seconds.ily
index 6d82e2c..4f1fef9 100644
--- a/template/notes.pipes.seconds.ily
+++ b/template/notes.pipes.seconds.ily
@@ -4,7 +4,7 @@
 composerPipesSecnd = ""
 arrangerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipessecndA = {
diff --git a/template/notes.pipes.thirds.ily b/template/notes.pipes.thirds.ily
index 70b9cdd..a290821 100644
--- a/template/notes.pipes.thirds.ily
+++ b/template/notes.pipes.thirds.ily
@@ -4,7 +4,7 @@
 composerPipesthrd = ""
 arrangerPipesthrd = ""
 pipesthrdglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesthrdA = {