From f1036984d89f9c4f9ced3fcac6792de28178fd66 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Tue, 2 Apr 2019 18:11:14 +0200
Subject: [PATCH] Further Key assigning to Airs, Strathspeys and Hornpipes

---
 airs/amazing_grace/config.ily                 |  1 +
 airs/amazing_grace/notes.pipes.ily            |  2 +-
 airs/banks_of_the_lee/config.ily              |  2 +-
 airs/banks_of_the_lee/notes.pipes.ily         |  2 +-
 airs/bells_of_dunblane/config.ily             |  5 +-
 airs/bells_of_dunblane/notes.pipes.ily        |  4 +-
 .../bells_of_dunblane/notes.pipes.seconds.ily |  4 +-
 airs/bonnie_black_isle/config.ily             |  4 +-
 airs/bonnie_black_isle/notes.pipes.ily        |  2 +-
 airs/dark_island/config.ily                   |  5 +-
 airs/dark_island/notes.pipes.ily              |  4 +-
 airs/flower_of_scotland/config.ily            |  1 +
 airs/flower_of_scotland/notes.lyrics.ily      |  2 +-
 airs/flower_of_scotland/notes.pipes.ily       |  2 +-
 airs/la_baum/config.ily                       |  1 +
 airs/la_baum/notes.pipes.ily                  |  2 +-
 airs/la_baum/notes.pipes.seconds.ily          |  2 +-
 airs/loch_duich/config.ily                    |  3 +-
 airs/loch_duich/notes.pipes.ily               | 60 +++++++++----------
 airs/loch_duich/notes.pipes.seconds.ily       |  4 +-
 airs/mull_of_kintyre/config.ily               |  5 +-
 airs/mull_of_kintyre/notes.pipes.ily          |  4 +-
 airs/my_home/config.ily                       |  1 +
 airs/my_home/notes.pipes.ily                  |  4 +-
 airs/rose_of_kelvingrove/config.ily           |  4 +-
 airs/rose_of_kelvingrove/notes.pipes.ily      |  2 +-
 airs/sands_of_kuwait/config.ily               |  4 +-
 airs/sands_of_kuwait/notes.pipes.ily          |  2 +-
 airs/the_day_thou_gavest/config.ily           |  4 +-
 airs/the_day_thou_gavest/notes.pipes.ily      | 36 +++++------
 airs/the_mist_covered_mountains/config.ily    |  2 +-
 .../notes.pipes.ily                           | 32 +++++-----
 airs/when_the_pipers_play/config.ily          |  5 +-
 airs/when_the_pipers_play/notes.pipes.ily     |  2 +-
 .../notes.pipes.seconds.ily                   |  2 +-
 hornpipes/jimmy_blue/notes.pipes.ily          |  2 +-
 hornpipes/the_jolly_beggarman/config.ily      |  1 -
 .../lady_mackenzie_of_fairburn/full.ly        |  2 +-
 .../notes.pipes.ily                           |  2 +-
 .../lady_mackenzie_of_fairburn/pipes.ly       |  4 +-
 40 files changed, 119 insertions(+), 113 deletions(-)

diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily
index 39ad9d0..17dd254 100644
--- a/airs/amazing_grace/config.ily
+++ b/airs/amazing_grace/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 3/4
+	\key d \major
 	}
 confTempo = {
 	\tempo 4 = 60
diff --git a/airs/amazing_grace/notes.pipes.ily b/airs/amazing_grace/notes.pipes.ily
index 609031c..7d89e27 100644
--- a/airs/amazing_grace/notes.pipes.ily
+++ b/airs/amazing_grace/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/airs/banks_of_the_lee/config.ily b/airs/banks_of_the_lee/config.ily
index b51b663..e347ba6 100644
--- a/airs/banks_of_the_lee/config.ily
+++ b/airs/banks_of_the_lee/config.ily
@@ -1,7 +1,7 @@
 \version "2.19.0"
 %% Globals
 global = {
-	\key d \major
+	\key a \mixolydian
 	\time 3/4
 	}
 confTempo = { 
diff --git a/airs/banks_of_the_lee/notes.pipes.ily b/airs/banks_of_the_lee/notes.pipes.ily
index 8e9df26..e11b556 100644
--- a/airs/banks_of_the_lee/notes.pipes.ily
+++ b/airs/banks_of_the_lee/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "D. Rickard"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/airs/bells_of_dunblane/config.ily b/airs/bells_of_dunblane/config.ily
index 6a52f24..1b35e1d 100644
--- a/airs/bells_of_dunblane/config.ily
+++ b/airs/bells_of_dunblane/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 60 
-	}
+}
 %% Format
 part = { \partial 4 \grace{s1} s4 }
 measure = { \grace {s1} s1 | }
diff --git a/airs/bells_of_dunblane/notes.pipes.ily b/airs/bells_of_dunblane/notes.pipes.ily
index b6140c1..36b9bc4 100644
--- a/airs/bells_of_dunblane/notes.pipes.ily
+++ b/airs/bells_of_dunblane/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "R. Mathieson"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg a8. [ \grd c16 ] |
diff --git a/airs/bells_of_dunblane/notes.pipes.seconds.ily b/airs/bells_of_dunblane/notes.pipes.seconds.ily
index 1f88ba1..17bbe66 100644
--- a/airs/bells_of_dunblane/notes.pipes.seconds.ily
+++ b/airs/bells_of_dunblane/notes.pipes.seconds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesSecnd = "R. Mathieson"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipessecndA = {
 	\grg a8. [ \grd c16 ] |
diff --git a/airs/bonnie_black_isle/config.ily b/airs/bonnie_black_isle/config.ily
index 3becd34..1c22581 100644
--- a/airs/bonnie_black_isle/config.ily
+++ b/airs/bonnie_black_isle/config.ily
@@ -3,10 +3,10 @@
 global = {
 	\key d \major
 	\time 12/8
-	}
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 4. \grace{s4.} s4. }
 measure = { \grace {s1} s1. | }
diff --git a/airs/bonnie_black_isle/notes.pipes.ily b/airs/bonnie_black_isle/notes.pipes.ily
index 8381e37..6e75cdc 100644
--- a/airs/bonnie_black_isle/notes.pipes.ily
+++ b/airs/bonnie_black_isle/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "D. Knox"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/airs/dark_island/config.ily b/airs/dark_island/config.ily
index 0c0ce1c..47c47fd 100644
--- a/airs/dark_island/config.ily
+++ b/airs/dark_island/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key d \major
+}
 confTempo = { 
 	\tempo 4. = 40 
-	}
+}
 %% Format
 part = { \partial 8 \grace {s1} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/airs/dark_island/notes.pipes.ily b/airs/dark_island/notes.pipes.ily
index 128f51f..de30cde 100644
--- a/airs/dark_island/notes.pipes.ily
+++ b/airs/dark_island/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = "I. McLaughlan"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 % Music
 pipesA = {
 	\grg a16. [ \grd b32 ] |
diff --git a/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily
index f480376..b8cb564 100644
--- a/airs/flower_of_scotland/config.ily
+++ b/airs/flower_of_scotland/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 6/8
+	\key d \major
 }
 confTempo = {
 	\tempo 2. = 60
diff --git a/airs/flower_of_scotland/notes.lyrics.ily b/airs/flower_of_scotland/notes.lyrics.ily
index c0bb20a..9fbc959 100644
--- a/airs/flower_of_scotland/notes.lyrics.ily
+++ b/airs/flower_of_scotland/notes.lyrics.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerLyrics  = "Roy M.B. Williamson, the Corries"
 lyricsglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 lyricsA = {
diff --git a/airs/flower_of_scotland/notes.pipes.ily b/airs/flower_of_scotland/notes.pipes.ily
index 29d4f74..a3cceb4 100644
--- a/airs/flower_of_scotland/notes.pipes.ily
+++ b/airs/flower_of_scotland/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/airs/la_baum/config.ily b/airs/la_baum/config.ily
index 8eef3e1..90b54fc 100644
--- a/airs/la_baum/config.ily
+++ b/airs/la_baum/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 4/4
+	\key a \mixolydian
 	}
 confTempo = { 
 	\tempo 4 = 80 
diff --git a/airs/la_baum/notes.pipes.ily b/airs/la_baum/notes.pipes.ily
index a2266f5..54346be 100644
--- a/airs/la_baum/notes.pipes.ily
+++ b/airs/la_baum/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = "J. Roberts"
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesA = {
diff --git a/airs/la_baum/notes.pipes.seconds.ily b/airs/la_baum/notes.pipes.seconds.ily
index 5c701ad..f5925e5 100644
--- a/airs/la_baum/notes.pipes.seconds.ily
+++ b/airs/la_baum/notes.pipes.seconds.ily
@@ -4,7 +4,7 @@
 composerPipesSecnd = "PM FJ de Boone"
 arrangerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 pipessecndA = {
 	\grg a16 [ b16 ] |
diff --git a/airs/loch_duich/config.ily b/airs/loch_duich/config.ily
index 9153546..7f35ee7 100644
--- a/airs/loch_duich/config.ily
+++ b/airs/loch_duich/config.ily
@@ -2,7 +2,8 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = {
   \tempo 2. = 40
 }
diff --git a/airs/loch_duich/notes.pipes.ily b/airs/loch_duich/notes.pipes.ily
index 78c9b0a..060ea60 100644
--- a/airs/loch_duich/notes.pipes.ily
+++ b/airs/loch_duich/notes.pipes.ily
@@ -3,41 +3,39 @@
 \version "2.18.2"
 composerPipes = "Ensign Christopher MacRae, arr.  Cpl. V.C. Kennedy"
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
-\grg e8 |
- \dblc c4 b8 \grg c16 [ e16~ ] e4 |
- \dblA A4 f8 \grg e16 [ f16~ ] f4 |
- \dble e4 c8 \grg b16 [ \grip c16~ ] c4 |
- \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
- \dblc c4 b8 \grg c16 [ e16~ ] e4 |
- \dblA A4 f8 \grg e16 [ f16~ ] f4 |
- \grg a4 \taor a8 \dble e4 c8 |
- \dblc c16 [ \gre b16~ ] b4 \grG a4
+	\grg e8 |
+	\dblc c4 b8 \grg c16 [ e16~ ] e4 |
+	\dblA A4 f8 \grg e16 [ f16~ ] f4 |
+	\dble e4 c8 \grg b16 [ \grip c16~ ] c4 |
+	\dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
+	\dblc c4 b8 \grg c16 [ e16~ ] e4 |
+	\dblA A4 f8 \grg e16 [ f16~ ] f4 |
+	\grg a4 \taor a8 \dble e4 c8 |
+	\dblc c16 [ \gre b16~ ] b4 \grG a4
 }
-
 pipesB = {
- e8 |
- \grip c4 \gre b8 \grip c4 \gre b8 |
- \grip c4 \gre b8 \grd c16 [ f16~ ] f4 |
- \dblc c4 \gre b8 \whslurd e4 \grg c8 |
- \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
- \dblc c4 b8 \grg c16 [ e16~ ] e4 |
- \dblA A4 f8 \grg e16 [ f16~ ] f4 |
- \grg a4 \taor a8 \dble e4 c8 |
- \dblc c16 [ \gre b16~ ] b4 \grG a4
+	e8 |
+	\grip c4 \gre b8 \grip c4 \gre b8 |
+	\grip c4 \gre b8 \grd c16 [ f16~ ] f4 |
+	\dblc c4 \gre b8 \whslurd e4 \grg c8 |
+	\dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
+	\dblc c4 b8 \grg c16 [ e16~ ] e4 |
+	\dblA A4 f8 \grg e16 [ f16~ ] f4 |
+	\grg a4 \taor a8 \dble e4 c8 |
+	\dblc c16 [ \gre b16~ ] b4 \grG a4
 }
-
 pipesC = {
- e8 |
- \grg a4 \taor a8 \dble e4 a8 |
- \dblc c4 \gre a8 \dble e4 c8 |
- \grg b4 \taor b8 \dblf f4 b8 |
- \thrwd d4 \gre b8 \dblf f4 e8 |
- \grg a4 \taor a8 \dble e4 a8 |
- \dblc c4 \gre b8 \grg c16 [ e16~ ] e4 |
- \dblf f4 e8 \dblA A4 c8 |
- \dblc c16 [ \gre b16~ ] b4 \grG a4
+	e8 |
+	\grg a4 \taor a8 \dble e4 a8 |
+	\dblc c4 \gre a8 \dble e4 c8 |
+	\grg b4 \taor b8 \dblf f4 b8 |
+	\thrwd d4 \gre b8 \dblf f4 e8 |
+	\grg a4 \taor a8 \dble e4 a8 |
+	\dblc c4 \gre b8 \grg c16 [ e16~ ] e4 |
+	\dblf f4 e8 \dblA A4 c8 |
+	\dblc c16 [ \gre b16~ ] b4 \grG a4
 }
diff --git a/airs/loch_duich/notes.pipes.seconds.ily b/airs/loch_duich/notes.pipes.seconds.ily
index def8a6f..ca60d2f 100644
--- a/airs/loch_duich/notes.pipes.seconds.ily
+++ b/airs/loch_duich/notes.pipes.seconds.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipesSecnd = "Ensign Christopher MacRae, arr.  Cpl. V.C. Kennedy"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 pipessecndA = {
 \grg e8 |
  \grg a4 b8 \grg a16 [ \grip c16~ ] c4 |
diff --git a/airs/mull_of_kintyre/config.ily b/airs/mull_of_kintyre/config.ily
index a2437df..2316df7 100644
--- a/airs/mull_of_kintyre/config.ily
+++ b/airs/mull_of_kintyre/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key a \mixolydian
+}
 confTempo = { 
 	\tempo 4 = 60 
-	}
+}
 %% Format
 %part = { \partial 8 s8 }
 measure = { \grace {s1} s2. | }
diff --git a/airs/mull_of_kintyre/notes.pipes.ily b/airs/mull_of_kintyre/notes.pipes.ily
index c02d20f..573d520 100644
--- a/airs/mull_of_kintyre/notes.pipes.ily
+++ b/airs/mull_of_kintyre/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
   %Refrain
diff --git a/airs/my_home/config.ily b/airs/my_home/config.ily
index ceb813b..415e207 100644
--- a/airs/my_home/config.ily
+++ b/airs/my_home/config.ily
@@ -2,6 +2,7 @@
 %% Globals
 global = {
 	\time 6/8
+	\key a \mixolydian
 }
 confTempo = {
   \tempo 2. = 40
diff --git a/airs/my_home/notes.pipes.ily b/airs/my_home/notes.pipes.ily
index ee9d7c3..2f7b5e9 100644
--- a/airs/my_home/notes.pipes.ily
+++ b/airs/my_home/notes.pipes.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
-	}
+	\key a \mixolydian
+}
 % Music
 pipesA = {
 	\grg e16. [ d32 ] |
diff --git a/airs/rose_of_kelvingrove/config.ily b/airs/rose_of_kelvingrove/config.ily
index 2031452..6e942ff 100644
--- a/airs/rose_of_kelvingrove/config.ily
+++ b/airs/rose_of_kelvingrove/config.ily
@@ -3,10 +3,10 @@
 global = {
 	\key d \major
 	\time 4/4
-	}
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 4 \grace{s4.} s4 }
 measure = { \grace {s1} s1 | }
diff --git a/airs/rose_of_kelvingrove/notes.pipes.ily b/airs/rose_of_kelvingrove/notes.pipes.ily
index 002f460..d9b0afe 100644
--- a/airs/rose_of_kelvingrove/notes.pipes.ily
+++ b/airs/rose_of_kelvingrove/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "D. Knox"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesAA = {
diff --git a/airs/sands_of_kuwait/config.ily b/airs/sands_of_kuwait/config.ily
index b1a0317..eb29c2d 100644
--- a/airs/sands_of_kuwait/config.ily
+++ b/airs/sands_of_kuwait/config.ily
@@ -3,10 +3,10 @@
 global = {
 	\key d \major
 	\time 6/4
-	}
+}
 confTempo = { 
 	\tempo 4 = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s1. | }
diff --git a/airs/sands_of_kuwait/notes.pipes.ily b/airs/sands_of_kuwait/notes.pipes.ily
index a699d9d..61778c8 100644
--- a/airs/sands_of_kuwait/notes.pipes.ily
+++ b/airs/sands_of_kuwait/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "L/Cpl Gordon MacKenzie, QOHLDRS, 1991"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesAA = {
diff --git a/airs/the_day_thou_gavest/config.ily b/airs/the_day_thou_gavest/config.ily
index dc11b18..1c316e9 100644
--- a/airs/the_day_thou_gavest/config.ily
+++ b/airs/the_day_thou_gavest/config.ily
@@ -3,10 +3,10 @@
 global = {
 	\key d \major
 	\time 3/4
-	}
+}
 confTempo = {
 	\tempo 4 = 60
-	}
+}
 %% Format
 part = { \partial 8 \grace{s4.} s8 }
 measure = { \grace {s1} s2. | }
diff --git a/airs/the_day_thou_gavest/notes.pipes.ily b/airs/the_day_thou_gavest/notes.pipes.ily
index a44f1a2..e7b8aa1 100644
--- a/airs/the_day_thou_gavest/notes.pipes.ily
+++ b/airs/the_day_thou_gavest/notes.pipes.ily
@@ -8,27 +8,27 @@ pipeglobal = {
 }
 % Music
 pipesA = {
-  a4
- \grg f4 g4 \grA f4 |
- \dblA A4 f4 e4 |
- \thrwd d4 e4 b4 |
- \dbld d4 c4 b4 |
+	a4
+	\grg f4 g4 \grA f4 |
+	\dblA A4 f4 e4 |
+	\thrwd d4 e4 b4 |
+	\dbld d4 c4 b4 |
 
- \grg a2 \wbirl a4 |
- \thrwd d4 e4 f4 |
- \dble e2 d4 |
- \dblc c2
+	\grg a2 \wbirl a4 |
+	\thrwd d4 e4 f4 |
+	\dble e2 d4 |
+	\dblc c2
 }
 
 pipesB = {
-  a4
- \grg f4 g4 \grA f4 |
- \dblA A4 f4 e4 |
- \thrwd d4 e4 b4 |
- \dbld d4 c4 b4 |
+	a4
+	\grg f4 g4 \grA f4 |
+	\dblA A4 f4 e4 |
+	\thrwd d4 e4 b4 |
+	\dbld d4 c4 b4 |
 
- \grg a4 b4 \grd c4 |
- \thrwd d4 f4 e4 |
- \grg b4 d4 \grg c4 |
- \thrwd d2
+	\grg a4 b4 \grd c4 |
+	\thrwd d4 f4 e4 |
+	\grg b4 d4 \grg c4 |
+	\thrwd d2
 }
diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily
index fbc9b20..b7d087b 100644
--- a/airs/the_mist_covered_mountains/config.ily
+++ b/airs/the_mist_covered_mountains/config.ily
@@ -5,7 +5,7 @@ global = {
 	\key b \minor
 }
 confTempo = {
-  \tempo 2. = 40
+	\tempo 2. = 40
 }
 part = {\partial 8 s8 }
 %% Format
diff --git a/airs/the_mist_covered_mountains/notes.pipes.ily b/airs/the_mist_covered_mountains/notes.pipes.ily
index 9f6f572..53c92e4 100644
--- a/airs/the_mist_covered_mountains/notes.pipes.ily
+++ b/airs/the_mist_covered_mountains/notes.pipes.ily
@@ -7,24 +7,24 @@ pipeglobal = {
 }
 % Music
 pipesA = {
- \grg b4. \taor b4. |
- \grg f4 \grip f8 \dblf f8. [ e16 c8 ] |
- \grg a4. \wbirl a4. |
- \dble c8. [ \grg b16 \grd c8 ] \dblb b8. [ \grG a16 b8 ] | 
+	\grg b4. \taor b4. |
+	\grg f4 \grip f8 \dblf f8. [ e16 c8 ] |
+	\grg a4. \wbirl a4. |
+	\dble c8. [ \grg b16 \grd c8 ] \dblb b8. [ \grG a16 b8 ] | 
 
- \thrwd d4. \dble e4. |
- \grg f8. [ g16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
- \grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
- \grg b4. \taor b4. 
+	\thrwd d4. \dble e4. |
+	\grg f8. [ g16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
+	\grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
+	\grg b4. \taor b4. 
 }
 pipesB = {
- \grg f4. \grip f4. |
- \dble e8. [ f16 A8 ] \hdblf f8. [ e16 c8 ] |
- \grg a4 \taor a8 \dble e4 c8 |
- \grg f4 \grip f8 \dble e8. [ d16 c8 ] | 
+	\grg f4. \grip f4. |
+	\dble e8. [ f16 A8 ] \hdblf f8. [ e16 c8 ] |
+	\grg a4 \taor a8 \dble e4 c8 |
+	\grg f4 \grip f8 \dble e8. [ d16 c8 ] | 
 
- \grg b4. \thrwd d4. |
- \dble e8. [ f16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
- \grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
- \grg b4.  \taor b4.
+	\grg b4. \thrwd d4. |
+	\dble e8. [ f16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
+	\grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
+	\grg b4.  \taor b4.
 }
diff --git a/airs/when_the_pipers_play/config.ily b/airs/when_the_pipers_play/config.ily
index 9d2ee84..e891a1c 100644
--- a/airs/when_the_pipers_play/config.ily
+++ b/airs/when_the_pipers_play/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 4/4
-	}
+	\key d \major
+}
 confTempo = { 
 	\tempo 4 = 70 
-	}
+}
 %% Format
 part = { \partial 8*3 \grace {s4} s8*3 }
 measure = { \grace {s1} s1 | }
diff --git a/airs/when_the_pipers_play/notes.pipes.ily b/airs/when_the_pipers_play/notes.pipes.ily
index a02479f..7c516fa 100644
--- a/airs/when_the_pipers_play/notes.pipes.ily
+++ b/airs/when_the_pipers_play/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = ""
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 
 % Music
diff --git a/airs/when_the_pipers_play/notes.pipes.seconds.ily b/airs/when_the_pipers_play/notes.pipes.seconds.ily
index 12cc419..69d87a0 100644
--- a/airs/when_the_pipers_play/notes.pipes.seconds.ily
+++ b/airs/when_the_pipers_play/notes.pipes.seconds.ily
@@ -4,7 +4,7 @@
 composerPipesSecnd = ""
 arrangerPipesSecnd = ""
 pipessecndglobal = {
-	\bagpipeKey
+	\key d \major
 }
 
 % Music
diff --git a/hornpipes/jimmy_blue/notes.pipes.ily b/hornpipes/jimmy_blue/notes.pipes.ily
index 4ad9dc4..83d291a 100644
--- a/hornpipes/jimmy_blue/notes.pipes.ily
+++ b/hornpipes/jimmy_blue/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "Colin Craig"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/hornpipes/the_jolly_beggarman/config.ily b/hornpipes/the_jolly_beggarman/config.ily
index e3af79c..5165505 100644
--- a/hornpipes/the_jolly_beggarman/config.ily
+++ b/hornpipes/the_jolly_beggarman/config.ily
@@ -7,7 +7,6 @@ global = {
 confTempo = { 
 	\tempo 4 = 70
 }
->>>>>>> tunekeys
 %% Format
 part = { \partial 8 \grace {s1} s8 }
 measure = { \grace {s1} s2 | }
diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly
index 52305bf..a14c76c 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/full.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly
@@ -13,7 +13,7 @@
 	\new StaffGroup <<
 		\new Staff {
 			\global
-			\bagpipeKey
+			\pipeglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
index ca4ae66..0ded862 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
@@ -3,7 +3,7 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\key a \major
+	\key a \mixolydian
 }
 pipesA = {
 	d16 |
diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
index 1887c38..f3e9d3b 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
@@ -8,7 +8,7 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
 			{\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."}
 			{\pipesA s16 \pipesBA \pipesBB}
@@ -25,7 +25,7 @@
 	\midi { \confTempo }
 	\new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 			\partial 16 
 			\pipesA
 			\pipesA