diff --git a/2-4_marches/mairis_wedding/notes.pipes.ily b/2-4_marches/mairis_wedding/notes.pipes.ily
index 942ece0..4382be0 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 \major
+}
 % Music
 pipesA = {
 	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
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..698b4c2 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 \major
+}
 pipesA = {
 	\grg c8 [ \grG c8 ] \grg c4. a8 |
 	\grg b8 [ \grG b8 ] a2 |
diff --git a/3-4_marches/balmoral/notes.pipes.ily b/3-4_marches/balmoral/notes.pipes.ily
index feec43d..5047f33 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 \major
+}
 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..b18509a 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 \major
+}
 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..9358647 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 \major
+}
 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..608c189 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 \major
+  }
 % 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..6c295ba 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 \major
+}
 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 9f7303a..a678d6f 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"
 arrangerPipes = "1936"
 pipeglobal = {
-	\bagpipeKey
-}
+	\key a \major
+  }
 % 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..7cfa8eb 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 \major
+}
 % 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..17a1a7c 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 \major
 }
 % 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..f2d37d8 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 \major
+}
 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 fd40508..47a3a8d 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 \major
 }
 % Music
 pipesAA = {
diff --git a/3-4_marches/red_hackle/notes.pipes.ily b/3-4_marches/red_hackle/notes.pipes.ily
index ad8f771..0c92165 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 \major
+}
 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..e4c6d8f 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 \major
+}
 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 403d88f..2b39bcb 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"
 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..fd33bfb 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 \major
 }
 % 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/notes.pipes.ily b/4-4_marches/51st_highland_division/notes.pipes.ily
index d83b15b..c13dd24 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 \major
+}
 pipesAAA = {
 	\dble e8. [ c16 ] |
 	a4 \taor a8. [ b16 ] \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] |
diff --git a/4-4_marches/auld_lang_syne/notes.pipes.ily b/4-4_marches/auld_lang_syne/notes.pipes.ily
index 52bd14b..7c37032 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 \major
+}
 pipesA = {
  e4 |
  \grg a4~ a8 [ \wbirl a8 ] \gre a4 \grd c4 |
diff --git a/4-4_marches/battle_of_waterloo/config.ily b/4-4_marches/battle_of_waterloo/config.ily
index f27c965..ab110b9 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 \major
 	\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..39a442b 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 \major
 }
 % 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..56bd023 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 \major
 	\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..20a4856 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 \major
 }
 % 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..cfe9255 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 \major
+}
 % 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..039d8b9 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 \major
+}
 % 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/notes.pipes.ily b/4-4_marches/dawning_of_the_day/notes.pipes.ily
index 65b37ac..a69dc0d 100644
--- a/4-4_marches/dawning_of_the_day/notes.pipes.ily
+++ b/4-4_marches/dawning_of_the_day/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "Trad., arr. PM T.F.J. de Boone"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \major
+}
 % 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..ea0d5f7 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
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipessecnd = "Trad., arr. PM T.F.J. de Boone"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \major
+}
 pipessecndAA = {
 	\grg c8 [ d8 ] |
 	\grg e4 \grG e4 \grg e4 \grg d8 [ e8 ] |
diff --git a/4-4_marches/flett_of_flotta/config.ily b/4-4_marches/flett_of_flotta/config.ily
index 9759690..b029876 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 \major
 	\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..1097b3f 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 \major
+}
 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/notes.pipes.ily b/4-4_marches/hills_of_argyll/notes.pipes.ily
index fbdc91d..6f35218 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 \major
+}
 % 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/notes.pipes.ily b/4-4_marches/minstrel_boy/notes.pipes.ily
index f25c04c..db4f0b8 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 \major
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/4-4_marches/rowan_tree/notes.pipes.ily b/4-4_marches/rowan_tree/notes.pipes.ily
index f385739..d63d2f8 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 \major
 }
 % Music
 pipesAA = {
diff --git a/4-4_marches/scotland_the_brave/notes.pipes.ily b/4-4_marches/scotland_the_brave/notes.pipes.ily
index 8716443..b8b2831 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 \major
+}
 % Music
 pipesAA = {
 	e8 |
diff --git a/4-4_marches/the_crusaders_march/notes.pipes.ily b/4-4_marches/the_crusaders_march/notes.pipes.ily
index dd5ec00..3c698e5 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 \major
+}
 pipesA = {
 	\grg a8. [ b16 ]  |
 	\grg c4 \grip c4 \dblc c4 \gre a8. [ \grd c16 ]  |
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..78c067d 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 \major
+}
 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/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/notes.pipes.ily b/4-4_marches/the_pikemans_march/notes.pipes.ily
index 4dc6c4b..34838cd 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 \major
+}
 % Music
 pipesA = {
 e8 |
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 d0476bd..5ce1c0c 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 \major
+}
 % Music
 pipesA = {
 \grg a8. [ b16 ] |
diff --git a/4-4_marches/wings/notes.pipes.ily b/4-4_marches/wings/notes.pipes.ily
index 4d605e8..2fc2454 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 \major
 }
 % Music
 pipesAA = {
diff --git a/5-4_marches/cullen_bay/notes.pipes.ily b/5-4_marches/cullen_bay/notes.pipes.ily
index c9a8e2b..9299b05 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 \major
+}
 % Music
 pipesA = {
 	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2 |
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/notes.pipes.ily b/6-8_marches/cock_o_the_north/notes.pipes.ily
index 4d2e68b..9f368a3 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 \major
+}
 % Music
 pipesA = {
 	A8 |
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..6ef9740 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 \major
 }
+
 % Music
 pipesA = {
 	A8 |
diff --git a/6-8_marches/glendaruel_highlanders/notes.pipes.ily b/6-8_marches/glendaruel_highlanders/notes.pipes.ily
index d63b7b5..0be8ab4 100644
--- a/6-8_marches/glendaruel_highlanders/notes.pipes.ily
+++ b/6-8_marches/glendaruel_highlanders/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "PM A. Fettes"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \major
 }
 % Music
 pipesA = {
diff --git a/6-8_marches/hills_of_glenorchy/notes.pipes.ily b/6-8_marches/hills_of_glenorchy/notes.pipes.ily
index 08f1cc1..ed85927 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 \major
 }
 % Music
 pipesA = {
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/piobaireachd_of_donald_dubh/notes.pipes.ily b/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
index 41c3568..cb017b7 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 \major
+}
 mbreak = \break
 % Music
 pipesA = {
diff --git a/6-8_marches/the_steamboat/notes.pipes.ily b/6-8_marches/the_steamboat/notes.pipes.ily
index 7f4de6c..280d550 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 \major
+}
 % 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 efad2f2..ca663fa 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/notes.pipes.ily b/9-8_marches/going_to_vancouver_hills/notes.pipes.ily
index f6aeb12..8096248 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 \major
+}
 % Music
 pipesA = {
 	\grg a4 \grd c8 \grip e4. \dble e4. |
diff --git a/9-8_marches/heights_of_dargai/notes.pipes.ily b/9-8_marches/heights_of_dargai/notes.pipes.ily
index 914954f..e97e9a1 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 \major
+}
 % Music
 pipesA = {
 	\grg a8. [ b16 \grip c8 ] \dble e4. \dblc c4 e8 |
diff --git a/airs/abide_with_me/notes.pipes.ily b/airs/abide_with_me/notes.pipes.ily
index 9f0ce2c..91b03d3 100644
--- a/airs/abide_with_me/notes.pipes.ily
+++ b/airs/abide_with_me/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "J.J. van Ommen Kloeke"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \major
+}
 % Music
 pipes = {
 	\grg c2 \grip c4 \gre b4 
diff --git a/airs/alexander_mackenzie/notes.pipes.ily b/airs/alexander_mackenzie/notes.pipes.ily
index 7ef47de..ade5c02 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 \major
+}
 % 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..7330047 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 \major
+}
 pipessecndA = {
 	\grg c16. [ f32 ] |
 	\dble e8 [ \grg c8. d16 ] \grg c4 \grg c8 |
diff --git a/airs/miss_kirkwood/notes.pipes.ily b/airs/miss_kirkwood/notes.pipes.ily
index d1a3f23..351ae99 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 \major
+}
 % Music
 pipesA = {
 	e8 |
diff --git a/airs/miss_kirkwood/notes.pipes.seconds.ily b/airs/miss_kirkwood/notes.pipes.seconds.ily
index c50a0a7..d2cb1e8 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 \major
+}
 pipessecndA = {
 	e8 |
 	\dble e4. \dbld d4 c8 |
diff --git a/airs/morag_of_dunvegan/notes.pipes.ily b/airs/morag_of_dunvegan/notes.pipes.ily
index 383d18c..0a0693c 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 \major
+}
 % Music
 pipesA = {
 	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grG a8 ] |
diff --git a/airs/salute_to_the_royal_fendersmith/notes.pipes.ily b/airs/salute_to_the_royal_fendersmith/notes.pipes.ily
index d7d210e..f9b2f66 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 \major
 }
 % 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..4c3f3b6 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 \major
 }
 % Music
 pipessecndAA = { % Same as pipesA
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/notes.pipes.ily b/hornpipes/cabar_feidh/notes.pipes.ily
index 45bf33d..85cad8c 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 \major
+}
 % Music
 pipesA = {
 e16 |
diff --git a/hornpipes/the_jolly_beggarman/notes.pipes.ily b/hornpipes/the_jolly_beggarman/notes.pipes.ily
index d2b29c5..94ca536 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 \major
 }
 % Music
 pipesA = {
diff --git a/hornpipes/the_walrus/notes.pipes.ily b/hornpipes/the_walrus/notes.pipes.ily
index 0de3546..593b79a 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 \major
 	\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/notes.pipes.ily b/jigs/cabar_feidh/notes.pipes.ily
index a3f3b84..ce32eb7 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 \major
 }
 % Music
 pipesAA = {
diff --git a/jigs/the_panda/notes.pipes.ily b/jigs/the_panda/notes.pipes.ily
index 603b436..6af21c5 100644
--- a/jigs/the_panda/notes.pipes.ily
+++ b/jigs/the_panda/notes.pipes.ily
@@ -4,8 +4,8 @@
 composerPipes = "R. Mathieson"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-}
+	\key a \major
+  }
 % Music
 pipesAA = {
 	\grg c8 [ a8 \grd a8 ] \grg d8 [ a8 \grd a8 ] |
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/notes.pipes.ily b/other/o_canada/notes.pipes.ily
index ff6fc09..5127647 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 \major
+}
 % Music
 pipesA = {
 	\grg c4 \grg e8. [ \gra e16 ] |
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/notes.pipes.ily b/reels/cabar_feidh/notes.pipes.ily
index 83327fd..f45f0d3 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 \major
+}
 % Music
 pipesA = {
 	f16 |
diff --git a/reels/jock_wilsons_ball/notes.pipes.ily b/reels/jock_wilsons_ball/notes.pipes.ily
index 71785d7..bffab63 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 \major
+}
 % Music
 pipesAA = {
 	\thrwd d4 c4 \dblb b4 \grg f4 |
diff --git a/reels/piobaireachd_of_donald_dubh/notes.pipes.ily b/reels/piobaireachd_of_donald_dubh/notes.pipes.ily
index 3b6c79e..a7ffff8 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 \major
 }
 % Music
 pipesA = {
diff --git a/reels/the_mackenzies_reel/notes.pipes.ily b/reels/the_mackenzies_reel/notes.pipes.ily
index 32e44d3..8b4d2ca 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 \major
+}
 pipesA = {
 	A8 |
 	\birl a4 
diff --git a/sinterklaas/bonne_bonne_bonne/notes.pipes.ily b/sinterklaas/bonne_bonne_bonne/notes.pipes.ily
index 4714cc7..1e8b672 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 \major
 }
 % Music
 pipesAA =  \repeat unfold 2 {
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..3f6f833 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 \major
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/dag_sinterklaasje/notes.pipes.ily b/sinterklaas/dag_sinterklaasje/notes.pipes.ily
index b0b07db..8e8b928 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 \major
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily b/sinterklaas/de_zak_van_sinterklaas/notes.pipes.ily
index f4ca615..dab9b63 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 \major
 }
 % Music
 pipesA = {
diff --git a/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily b/sinterklaas/o_kom_er_eens_kijken/notes.pipes.ily
index eaa8dfa..6972078 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 \major
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily b/sinterklaas/sinterklaas_goedheiligman/notes.pipes.ily
index 452383d..5c43830 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 \major
 }
 % Music
 pipesAA = {
diff --git a/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily b/sinterklaas/sinterklaas_is_jarig/notes.pipes.ily
index b397b71..be8fbf8 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 \major
 }
 % 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 d33f06c..4126b7f 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/notes.pipes.ily b/strathspeys/cabar_feidh/notes.pipes.ily
index be6060d..12b74bb 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 \major
 }
 % Music
 pipesA = {
diff --git a/strathspeys/molly_connell/notes.pipes.ily b/strathspeys/molly_connell/notes.pipes.ily
index 17af9f1..c612a7c 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 \major
 }
 % Music
 pipesA = {