diff --git a/airs/abide_with_me/abide.bww b/airs/abide_with_me/abide.bww
deleted file mode 100644
index c74cb9d..0000000
--- a/airs/abide_with_me/abide.bww
+++ /dev/null
@@ -1,43 +0,0 @@
-Bagpipe Reader:1.0
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-InstrumentMappings,(71,71,45,33,1000,60,70)
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-FontSizes,(100,100,100,100,250)
-TuneFormat,(1,0,F,L,500,500,500,500,L,1,0)
-TuneTempo,84
-
-"Hymn",(T,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-"Abide With Me",(Y,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-"arr. J.J. van Ommen Kloeke",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"23",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"September 8th 2007",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"1ste keer solo, 2e keer hele band, 3e keer met seconds.",(I,L,0,0,Times New Roman,11,400,0,0,18,0,0,0)
-
-& sharpf sharpc 4_4 space
-I!'' 	gg C_2			space		grp C_4			eg B_4
-!	strlg LA_2		space		gg E_2			space
-!	gg F_4			E_4			gg E_4			hvthrd D_4
-!	gg C_1						space						!t
-
-& sharpf sharpc space
-	gg C_2			space		hvthrd D_4	E_4
-!	gg F_2			space		gg E_2			space
-!	hvthrd D_4	B_4				gg C_4			 D_4
-!	gg E_1						space						!t
-
-& sharpf sharpc space
-	gg C_2			space		grp C_4			gg B_4
-!	strlg LA_2		space		gg E_2			space
-!	gg E_4			D_4			gg D_4	C_4
-!	gg B_1						space						!t
-
-& sharpf sharpc space
-	grp B_2			space		gg C_4			hvthrd D_4
-!	gg C_4	 B_4				strlg LA_4			hvthrd D_4
-!	gg C_2			space		gg B_2			space
-!	strlg LA_1					space						''!I
\ No newline at end of file
diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily
index 6db3425..f3411a1 100644
--- a/airs/abide_with_me/config.ily
+++ b/airs/abide_with_me/config.ily
@@ -2,8 +2,10 @@
 %% Globals
 global = {
 	\time 4/4
-	}
-
+}
+confTempo = {
+  	\tempo 4 = 60
+}
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace { s4 } s1 | }
diff --git a/airs/abide_with_me/full.ly b/airs/abide_with_me/full.ly
new file mode 100644
index 0000000..ac36cf6
--- /dev/null
+++ b/airs/abide_with_me/full.ly
@@ -0,0 +1,75 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format" { \line \line
+			  		\break
+				  \line \line
+					\break
+					\bar "|."
+				}%Format
+				\new Voice = "pipes"{
+					\pipes
+				}%Pipes
+			>>
+		}
+		\new Lyrics = "verse1" {
+		  	\lyricsto "pipes" {
+			  	\verseA
+			}
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\repeat unfold 3 { \snareAA }
+			\snareAB
+		}
+%		\new PipeBandDrumStaff = "tenor" {
+%			\tenorglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+%
+%		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/abide_with_me/lyrics.pipes.ly b/airs/abide_with_me/lyrics.pipes.ly
new file mode 100644
index 0000000..2da16c3
--- /dev/null
+++ b/airs/abide_with_me/lyrics.pipes.ly
@@ -0,0 +1,62 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+\include "notes.lyrics.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\absolute {
+			  \line
+			  \line
+			  \break
+			  \line
+			  \line
+			  \bar "|."
+			}%Format
+			{ 
+				\pipes
+			}
+			\addlyrics \verseA
+			\addlyrics \verseB
+		>>
+
+	}
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+		  	\column \right-align {
+			  $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes  ":" } } #} )
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+		  	}
+			\column \right-align {
+			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+			}
+		}
+	}
+}
+\markup {
+	\combine \null \vspace #0.5
+  \fill-line {
+	\column {
+		\verseCblock	
+		\combine \null \vspace #0.5
+		\verseDblock
+	}
+	\column {
+		\verseEblock
+		\combine \null \vspace #0.5
+		\verseFblock
+	}
+	\column {
+		\verseGblock
+		\combine \null \vspace #0.5
+		\verseHblock
+	}
+  }
+}
diff --git a/airs/abide_with_me/notes.lyrics.ily b/airs/abide_with_me/notes.lyrics.ily
new file mode 100644
index 0000000..953ac52
--- /dev/null
+++ b/airs/abide_with_me/notes.lyrics.ily
@@ -0,0 +1,123 @@
+% 4/4 Abide with Me
+% Lyrics
+\version "2.18.2"
+composerLyrics = "H.F. Lyte"
+verseA = \lyricmode {
+	\set stanza = #"1."
+	A- bide with me! Fast falls the e- ven- tide,
+	The dark- ness deep- ens, Lord with me a- bide!
+	When oth- er help- ers fail and com- forts flee,
+	Help of the help- less, oh, a- bide with me!
+}
+verseAblock = \markup { \column {
+	\line{ \bold "1."}
+	\line{Abide with me! Fast falls the eventide,}
+	\line{The darkness deepens, Lord with me a bide!}
+	\line{When other helpers fail and comforts flee,}
+	\line{Help of the helpless, oh, abide with me!}
+}}
+
+verseB = \lyricmode {
+	\set stanza = #"2."
+	Swift to its close ebbs out life’s lit- tle day;
+	Earth’s joys grow dim, its glor- ies pass a- way;
+	Change and de- cay in all ar- ound I see;
+	oh, Thou who chang- est not, a- bide with me.
+}
+verseBblock = \markup { \column {
+	\line{ \bold "2."}
+	\line{Swift to its close ebbs out life’s little day;}
+	\line{Earth’s joys grow dim, its glories pass away;}
+	\line{Change and decay in all around I see;}
+	\line{oh, Thou who changest not, abide with me.}
+}}
+
+verseC = \lyricmode {
+	\set stanza = #"3."
+	Not a brief glance I beg, a passing word;
+    But as Thou dwell’st with Thy disciples, Lord,
+    Familiar, condescending, patient, free.
+    Come not to sojourn, but abide with me.
+}
+verseCblock = \markup { \column {
+	\line{ \bold "3."}
+	\line{not a brief glance i beg, a passing word;}
+	\line{but as thou dwell’st with thy disciples, lord,}
+	\line{familiar, condescending, patient, free.}
+	\line{come not to sojourn, but abide with me.}
+}}
+
+verseD = \lyricmode {
+	\set stanza = #"4."
+	Come not in terrors, as the King of kings,
+	But kind and good, with healing in Thy wings,
+	Tears for all woes, a heart for every plea
+	Come, Friend of sinners, and thus bide with me.
+}
+verseDblock = \markup { \column {
+	\line{\bold "4."}
+	\line{Come not in terrors, as the King of kings,}
+	\line{But kind and good, with healing in Thy wings,}
+	\line{Tears for all woes, a heart for every plea}
+	\line{Come, Friend of sinners, and thus bide with me.}
+}}
+
+verseE = \lyricmode {
+	\set stanza = #"5."
+	Thou on my head in early youth didst smile;
+	And, though rebellious and perverse meanwhile,
+	Thou hast not left me, oft as I left Thee,
+	On to the close, O Lord, abide with me.
+}
+verseEblock = \markup { \column {
+	\line{\bold "5."}
+	\line{Thou on my head in early youth didst smile;}
+	\line{And, though rebellious and perverse meanwhile,}
+	\line{Thou hast not left me, oft as I left Thee,}
+	\line{On to the close, O Lord, abide with me.}
+}}
+
+verseF = \lyricmode {
+	\set stanza = #"6."
+	I need Thy presence every passing hour.
+	What but Thy grace can foil the tempter’s power?
+	Who, like Thyself, my guide and stay can be?
+	Through cloud and sunshine, Lord, abide with me.
+}
+verseFblock = \markup { \column {
+	\line{\bold "6."}
+	\line{I need Thy presence every passing hour.}
+	\line{What but Thy grace can foil the tempter’s power?}
+	\line{Who, like Thyself, my guide and stay can be?}
+	\line{Through cloud and sunshine, Lord, abide with me.}
+}}
+
+verseG = \lyricmode {
+	\set stanza = #"7."
+	I fear no foe, with Thee at hand to bless;
+	Ills have no weight, and tears no bitterness.
+	Where is death’s sting? Where, grave, thy victory?
+	I triumph still, if Thou abide with me.
+}
+verseGblock = \markup { \column {
+	\line{\bold "7."}
+	\line{I fear no foe, with Thee at hand to bless;}
+	\line{Ills have no weight, and tears no bitterness.}
+	\line{Where is death’s sting? Where, grave, thy victory?}
+	\line{I triumph still, if Thou abide with me.}
+}}
+
+verseH = \lyricmode {
+	\set stanza = #"8."
+	Hold Thou Thy cross before my closing eyes;
+	Shine through the gloom and point me to the skies.
+	Heaven’s morning breaks, and earth’s vain shadows flee;
+	In life, in death, O Lord, abide with me.
+}
+verseHblock = \markup { \column {
+	\line{\bold "8."}
+	\line{Hold Thou Thy cross before my closing eyes;}
+	\line{Shine through the gloom and point me to the skies.}
+	\line{Heaven’s morning breaks, and earth’s vain shadows flee;}
+	\line{In life, in death, O Lord, abide with me.}
+}}
diff --git a/airs/abide_with_me/notes.pipes.ily b/airs/abide_with_me/notes.pipes.ily
new file mode 100644
index 0000000..9f0ce2c
--- /dev/null
+++ b/airs/abide_with_me/notes.pipes.ily
@@ -0,0 +1,30 @@
+% 4/4 Abide with Me
+% Pipes
+\version "2.18.2"
+composerPipes = "J.J. van Ommen Kloeke"
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipes = {
+	\grg c2 \grip c4 \gre b4 
+	\grG a2 \grg e2 
+	\grg f4 e4 \grg e4 d4 
+	\grg c1  
+
+	\grg c2 d4 e4 
+	\grg f2 \grg e2 
+	d4 b4 \grg c4 d4 
+	\grg e1  
+
+	\grg c2 \grip c4 \grg b4 
+	\grG a2 \grg e2 
+	\grg e4 d4 \grg d4 c4 
+	\grg b1  
+
+	\grip b2 \grg c4 d4 
+	\grg c4 b4 \grG a4 d4 
+	\grg c2 \grg b2 
+	\grG a1
+
+}
diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily
index b299079..cce5aad 100644
--- a/airs/abide_with_me/notes.side.ily
+++ b/airs/abide_with_me/notes.side.ily
@@ -2,15 +2,16 @@
 % Side
 \version "2.18.2"
 composerSide = "W.H. de Boone, 2014"
+sideglobal = {}
 snareAA = \drummode {
 	\flam  d8->) \! \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 g |
 	\flam  d8-> \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 g |
-	\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam g8 \flam g-> |
+	\flam  d8-> \triplet { d16 g d }	\flam  g8-> \triplet { d16 g d }	\flam  g8-> \triplet { d16 g d }	\flam g8 \flam d-> |
 	d4:32( \<	d4:32)(	d4:32)(	d4:32)( \! \> |
 }
 snareAB = \drummode {
 	\flam  d8->) \! \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 \flam g |
-	\flam  d8->\< \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam g8[ \drag g]->\! |
+	\flam  d8->\< \triplet { d16 g d }	\flam  g8-> \triplet { d16 g d }	\flam  g8-> \triplet { d16 g d }	\flam g8[ \drag d]->\! |
 	d4:32( \>	d4:32)(	d4:32)(	d4:32)( |
-	d4:32)( \<	d4:32)(	d4:32)(	d4:32) \!
-}
\ No newline at end of file
+	d4:32)( \<	d4:32)(	d4:32)(	d4:32)\laissezVibrer \!
+}
diff --git a/airs/abide_with_me/pipes.ly b/airs/abide_with_me/pipes.ly
new file mode 100644
index 0000000..79bfeaf
--- /dev/null
+++ b/airs/abide_with_me/pipes.ly
@@ -0,0 +1,44 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+			  \line
+			  \line
+			  \break
+			  \line
+			  \line
+			  \bar "|."
+			}%Format
+			{ 
+				\pipes
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+			\pipes
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly
index 882b282..dc92426 100644
--- a/airs/abide_with_me/side.ly
+++ b/airs/abide_with_me/side.ly
@@ -8,10 +8,10 @@
         \global
         <<
 			{
-				\repeat volta 2 {\halfline \break}
+				\repeat volta 2 {\line \break}
 					\alternative {
-						{ \halfline \break }
-						{ \halfline \bar "|."}
+						{ \line \break }
+						{ \line \bar "|."}
 					}
 
 			}
@@ -28,4 +28,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}