diff --git a/lilypond/drowsy_maggie.ly b/lilypond/drowsy_maggie.ly
index b04419d..9b167f6 100644
--- a/lilypond/drowsy_maggie.ly
+++ b/lilypond/drowsy_maggie.ly
@@ -1,15 +1,24 @@
 \include "header"
-\paper{paper-height = 5\cm}
+\paper{paper-height = 12\cm}
 
 {
   
-<<    
+<<
+  \chords {
+    \repeat volta 2 {e1:m s2 d e1:m s2 d
+    e1:m s2 d e1:m s2 d}
+    \repeat volta 2 {d2 a d1 s2 a g d
+    d2 a d1 e4:m d e2:m g d}
+  }
   \relative c'
   { 
     \time 4/4 \key d \major
-    \repeat volta 2 {e4 b'8 e, d'8 e, b' e, e4 b'8 e, a8 fis d fis e4 b'8 e, d'8 e, b' e, b'8 a b cis d8 a fis d}
-    d'4 fis8 d cis4 e8 cis d8 e fis g a8 fis g e d4 fis8 d cis4 e8 cis b8 a b cis d8 a fis a
-    d4 fis8 d cis4 e8 cis d8 e fis g a8 fis g e a8 fis g e fis8 d e cis b8 a b cis d8 a fis d
+    \repeat volta 2 {e4 b'8 e, d'8 e, b' e, e4 b'8 e, a8 fis d fis e4 b'8 e, d'8 e, b' e, b'8 a b cis d8 a fis d
+    e4 b'8 e, d'8 e, b' e, e4 b'8 e, a8 fis d fis e4 b'8 e, d'8 e, b' e, b'8 a b cis d8 a fis a}
+    \repeat volta 2 {d4 fis8 d cis d e cis | d8 e fis d fis a a fis | d4 fis8 d cis d e cis | b8 a b cis d8 a fis d |
+    d'4 fis8 d cis d e cis | d8 e fis d fis a a4 | b8 g a fis g fis e d | b8 a b cis d8 a fis d}
+% Alternativ:    \repeat volta 2 {d4 fis8 d cis4 e8 cis d8 e fis g a8 fis g e d4 fis8 d cis4 e8 cis b8 a b cis d8 a fis a
+%    d4 fis8 d cis4 e8 cis d8 e fis g a8 fis g e a8 fis g e fis8 d e cis b8 a b cis d8 a fis d}
   }
 >>
 
diff --git a/songs/Ewan_McColl/Dirty_Old_Town.sg b/songs/Ewan_McColl/Dirty_Old_Town.sg
index bdbcd55..00cd817 100644
--- a/songs/Ewan_McColl/Dirty_Old_Town.sg
+++ b/songs/Ewan_McColl/Dirty_Old_Town.sg
@@ -2,11 +2,13 @@
 \songcolumns{2}
 \beginsong{Dirty Old Town}[by=Ewan McColl]
 
+\lilypond{dirty_old_town}
+
 \beginverse
-I met my \[Sol]love, by the gas yard wall
-Dreamed a \[Do]dream, by the old \[Sol]canal
-Kissed my \[Mim]girl, by the factory \[Sol]wall
-Dirty old \[Ré]town, dirty old \[Mim]town
+I met my \[C]love, by the \[F]gas yard wall \[C7]
+Dreamed a \[F]dream, by the old \[C]canal
+\[F]Kissed \[C]my \[Am]girl, by the \[F]factory \[C]wall
+Dirty old \[Dm]town, \[G]dirty old \[Am]town
 \endverse
 
 \beginverse
@@ -37,4 +39,4 @@ Kissed my girl, by the factory wall
 Dirty old town, dirty old town
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Jean_Schwartz/My_Irish_Molly_O.sg b/songs/Jean_Schwartz/My_Irish_Molly_O.sg
index 61e91e4..8e26091 100644
--- a/songs/Jean_Schwartz/My_Irish_Molly_O.sg
+++ b/songs/Jean_Schwartz/My_Irish_Molly_O.sg
@@ -3,18 +3,18 @@
 \beginsong{My Irish Molly O}[by=Jean Schwartz]
 
 \beginverse
-\[Mim]Molly dear now did you hear the \[Sol]news that's\[Ré]going \[Mim]round
-Down in a corner of my heart a love is \[Sol]what you've \[Ré]found
-\[Mim]Every time I look into your \[Sol]Irish \[Ré]eyes so \[Mim]blue
-They seem to whisper "Darling boy, my \[Sol]love is \[Ré]all for \[Mim]you"
+\[Em]Molly dear now did you hear the \[G]news that's\[D]going \[Em]round
+Down in a corner of my heart a love is \[G]what you've \[D]found
+\[Em]Every time I look into your \[G]Irish \[D]eyes so \[Em]blue
+They seem to whisper "Darling boy, my \[G]love is \[D]all for \[Em]you"
 \endverse
 
 \beginchorus
-\[Ré]Oh, \[Sol]Molly, my Irish Molly, my sweet achusla \[Lam]dear
-I'm \[Si7]fairly off my \[Mim]trolley, my Irish \[Lam]Molly when you are \[Ré]near
-\[Sol]Springtime you know is \[Ré]ringtime, come dear now don't be \[Si]slow
-\[Mim]Change your name, go out with game, 
-begorrah wouldn't I do the same \[Sol]my Irish \[Ré]Molly \[Sol]O
+\[D]Oh, \[G]Molly, my Irish Molly, my sweet achusla \[Am]dear
+I'm \[B7]fairly off my \[Em]trolley, my Irish \[Am]Molly when you are \[D]near
+\[G]Springtime you know is \[D]ringtime, come dear now don't be \[B]slow
+\[Em]Change your name, go out with game, 
+begorrah wouldn't I do the same \[G]my Irish \[D]Molly \[G]O
 \endchorus
 
 \beginverse
diff --git a/songs/Leon_Rosselson/Don_t_Get_Married_Girls.sg b/songs/Leon_Rosselson/Don_t_Get_Married_Girls.sg
index 08a64a2..f421db3 100644
--- a/songs/Leon_Rosselson/Don_t_Get_Married_Girls.sg
+++ b/songs/Leon_Rosselson/Don_t_Get_Married_Girls.sg
@@ -3,19 +3,19 @@
 \beginsong{Don't Get Married Girls}[by=Leon Rosselson]
 
 \beginverse
-\[Mim]Don't get married, girls. You'll \[La]sign away your \[Mim]life.
-You may \[Sol]start off as a \[Ré]woman, but you'll \[Do]end up \[Ré]as the \[Mim]wife.
-You could be a vestal virgin, take the \[La]veil, or be a \[Mim]nun,
-But \[Sol]don't get \[Ré]married, girls, for \[Do]marriage isn't \[Si7]fun.
+\[Em]Don't get married, girls. You'll \[A]sign away your \[Em]life.
+You may \[G]start off as a \[D]woman, but you'll \[C]end up \[D]as the \[Em]wife.
+You could be a vestal virgin, take the \[A]veil, or be a \[Em]nun,
+But \[G]don't get \[D]married, girls, for \[C]marriage isn't \[B7]fun.
 
-Oh, it's \[Mi]great when you're romancing and he plays the lover's \[Si7]part.
-You're the \[La]flowers in his \[Mi]garden. You're the flame that warms his \[Si7]heart.
-And his \[La]love will last for\[Mi]ever and he'll \[La]promise you the \[Mi]moon,
-But just \[Si7]wait until you're \[Mi]married and he'll \[Si7]sing a different \[Mi]tune.
-You're his \[La]tapioca \[Mi]pudding. You're the \[La]dumplings in his \[Mi]stew,
-But he'll \[La]soon begin to \[Mi]wonder what he ever saw in \[Si7]you.
-Still he \[La]takes without com \[Mi]plaining all the \[La]dishes you pro\[Mi]vide,
-But you \[Si7]know he likes to \[Mi]have a little \[Si7]jam tart on the \[Mi]side.
+Oh, it's \[E]great when you're romancing and he plays the lover's \[B7]part.
+You're the \[A]flowers in his \[E]garden. You're the flame that warms his \[B7]heart.
+And his \[A]love will last for\[E]ever and he'll \[A]promise you the \[E]moon,
+But just \[B7]wait until you're \[E]married and he'll \[B7]sing a different \[E]tune.
+You're his \[A]tapioca \[E]pudding. You're the \[A]dumplings in his \[E]stew,
+But he'll \[A]soon begin to \[E]wonder what he ever saw in \[B7]you.
+Still he \[A]takes without com \[E]plaining all the \[A]dishes you pro\[E]vide,
+But you \[B7]know he likes to \[E]have a little \[B7]jam tart on the \[E]side.
 \endverse
 
 \beginverse
diff --git a/songs/Marc_Gunn/The_Leprechaun.sg b/songs/Marc_Gunn/The_Leprechaun.sg
index 5ec3501..0a99e03 100644
--- a/songs/Marc_Gunn/The_Leprechaun.sg
+++ b/songs/Marc_Gunn/The_Leprechaun.sg
@@ -3,22 +3,22 @@
 \beginsong{The Leprechaun}[by=Marc Gunn]
 
 \beginverse
-There's a \[Ré]Leprechaun in me head, and I \[Sol]wish that I were \[Ré]dead
-For I don't think he'll e'er let me \[La]be.
-Oh, he \[Ré]tempts me with his gold, and \[Sol]if I were e'er \[Ré]so bold,
-I'd strangle him and \[La]leave him in the \[Ré]street.
+There's a \[D]Leprechaun in me head, and I \[G]wish that I were \[D]dead
+For I don't think he'll e'er let me \[A]be.
+Oh, he \[D]tempts me with his gold, and \[G]if I were e'er \[D]so bold,
+I'd strangle him and \[A]leave him in the \[D]street.
 \endverse
 
 \beginchorus
-Well, he \[Sol]says to me, "Ah, \[Ré]you're no Irish Laddie!
-And ye \[Sol]call that thing a \[La]harp?"
-But \[Ré]each time I share the \[Sol]lore that I am \[Ré]learning.
-He hides in shame while \[La]my friends they \[Ré]chant.
+Well, he \[G]says to me, "Ah, \[D]you're no Irish Laddie!
+And ye \[G]call that thing a \[A]harp?"
+But \[D]each time I share the \[G]lore that I am \[D]learning.
+He hides in shame while \[A]my friends they \[D]chant.
 
-La ta tee, da diddley dee, \[Sol]la ta tee ta \[Ré]tee da
-La ta tee, da diddley diddley \[La]dai
-\[Ré]La ta tee, da diddley dee, \[Sol]la ta tee ta \[Ré]tee da
-La ta tee, da \[La]diddley diddley \[Ré]dai
+La ta tee, da diddley dee, \[G]la ta tee ta \[D]tee da
+La ta tee, da diddley diddley \[A]dai
+\[D]La ta tee, da diddley dee, \[G]la ta tee ta \[D]tee da
+La ta tee, da \[A]diddley diddley \[D]dai
 \endchorus
 
 \beginverse
diff --git a/songs/Percy_French/Eileen_Og.sg b/songs/Percy_French/Eileen_Og.sg
index 5151b7b..fe5bebc 100644
--- a/songs/Percy_French/Eileen_Og.sg
+++ b/songs/Percy_French/Eileen_Og.sg
@@ -3,21 +3,21 @@
 \beginsong{Eileen Og}[by=Percy French]
 
 \beginverse
-\[Lam]Eileen Og, and \[Mi7]that the darlin's \[Lam]name is,
-\[Sol]Through the barony her \[Ré]features they were \[Sol]famous
-\[Lam]If we loved her, \[Mi7]who is there to \[Lam]blame us,
-For wasn't she the \[Mi7]pride of Petra\[Lam]vore ?
-\[Fa]But her \[Sol7]beauty \[Do]made us all so shy,
-\[Rém]Not a \[Mi7]man could \[Lam]look her in the eye
-\[F&]Boys, O \[Sol7]boys, sure \[Do]that's reason why
-We're in \[Lam]mourning for the \[Mi7]pride of Petra\[Lam]vore
+\[Am]Eileen Og, and \[E7]that the darlin's \[Am]name is,
+\[G]Through the barony her \[D]features they were \[G]famous
+\[Am]If we loved her, \[E7]who is there to \[Am]blame us,
+For wasn't she the \[E7]pride of Petra\[Am]vore ?
+\[F]But her \[G7]beauty \[C]made us all so shy,
+\[Dm]Not a \[E7]man could \[Am]look her in the eye
+\[F&]Boys, O \[G7]boys, sure \[C]that's reason why
+We're in \[Am]mourning for the \[E7]pride of Petra\[Am]vore
 \endverse
 
 \beginchorus
-\[Fa]Eileen \[Sol7]Og, me \[Do]heart is growing grey
-\[Rém]Ever since the \[Mi7]day, you \[Lam]wandered far away
-\[Fa]Eileen \[Sol7]Og, there's \[Do]good fish in the sea
-But there's \[Lam]none of them like the \[Mi7]pride of Petra\[Lam]vore
+\[F]Eileen \[G7]Og, me \[C]heart is growing grey
+\[Dm]Ever since the \[E7]day, you \[Am]wandered far away
+\[F]Eileen \[G7]Og, there's \[C]good fish in the sea
+But there's \[Am]none of them like the \[E7]pride of Petra\[Am]vore
 \endchorus
 
 \beginverse
@@ -53,4 +53,4 @@ If you want them to run after you just walk the other way
 For they're mostly like the Pride of Petravore
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Sea_Shanty/15_Marins.sg b/songs/Sea_Shanty/15_Marins.sg
index 5cf16c4..dc517e6 100644
--- a/songs/Sea_Shanty/15_Marins.sg
+++ b/songs/Sea_Shanty/15_Marins.sg
@@ -3,10 +3,10 @@
 \beginsong{15 Marins}[by=Sea Shanty]
 
 \beginchorus
-\[Rém]Quinze marins sur le bahut du \[Do]mort
-Hop la ho ! une bouteille de \[Rém]rhum
-A boire et l'diable avait r\'egl\'e leur \[Do]sort
-Hop la \[Rém]ho ! une \[Do]bouteille de \[Rém]rhum
+\[Dm]Quinze marins sur le bahut du \[C]mort
+Hop la ho ! une bouteille de \[Dm]rhum
+A boire et l'diable avait r\'egl\'e leur \[C]sort
+Hop la \[Dm]ho ! une \[C]bouteille de \[Dm]rhum
 \endchorus
 
 \beginverse
diff --git a/songs/Sea_Shanty/Drunken_Sailor.sg b/songs/Sea_Shanty/Drunken_Sailor.sg
index 105061c..8ae3207 100644
--- a/songs/Sea_Shanty/Drunken_Sailor.sg
+++ b/songs/Sea_Shanty/Drunken_Sailor.sg
@@ -3,17 +3,17 @@
 \beginsong{Drunken Sailor}[by=Sea Shanty]
 
 \beginverse
-\[Rém]What shall we do with a drunken sailor
-\[Do]What shall we do with a drunken sailor
-\[Rém]What shall we do with a drunken sailor
-\[Do]Early in the \[Rém]mornin'
+\[Dm]What shall we do with a drunken sailor
+\[C]What shall we do with a drunken sailor
+\[Dm]What shall we do with a drunken sailor
+\[C]Early in the \[Dm]mornin'
 \endverse
 
 \beginchorus
-\[Rém]Wey Hey and Up she rises
-\[Do]Wey Hey and Up she rises
-\[Rém]Wey Hey and Up she rises
-\[Do]Early in the \[Rém]mornin'
+\[Dm]Wey Hey and Up she rises
+\[C]Wey Hey and Up she rises
+\[Dm]Wey Hey and Up she rises
+\[C]Early in the \[Dm]mornin'
 \endchorus
 
 \beginverse
diff --git a/songs/Sea_Shanty/John_Kanak.sg b/songs/Sea_Shanty/John_Kanak.sg
index 7b58db0..de13fd3 100644
--- a/songs/Sea_Shanty/John_Kanak.sg
+++ b/songs/Sea_Shanty/John_Kanak.sg
@@ -3,15 +3,15 @@
 \beginsong{John Kanak}[by=Sea Shanty]
 
 \beginverse
-Sur \[Sol]un baleinier, John s'est \[Do]réveil\[Sol]lé
-   John Kanak Kanak a \[Ré]tou la \[Sol]yé
-Quelqu'\[Sol]un criait paré \[Do]à lar\[Sol]guer
-   John Kanak Kanak a \[Ré]tou la \[Sol]yé
+Sur \[G]un baleinier, John s'est \[C]réveil\[G]lé
+   John Kanak Kanak a \[D]tou la \[G]yé
+Quelqu'\[G]un criait paré \[C]à lar\[G]guer
+   John Kanak Kanak a \[D]tou la \[G]yé
 \endverse
 
 \beginchorus
-Tou la yé oh \[Do]tou la \[Sol]yé
-John Kanak Kanak a \[Ré]tou la \[Sol]yé
+Tou la yé oh \[C]tou la \[G]yé
+John Kanak Kanak a \[D]tou la \[G]yé
 \endchorus
 
 \beginverse
diff --git a/songs/Sea_Shanty/Le_Forban_version_de_mer_.sg b/songs/Sea_Shanty/Le_Forban_version_de_mer_.sg
index c82a212..06ff8e9 100644
--- a/songs/Sea_Shanty/Le_Forban_version_de_mer_.sg
+++ b/songs/Sea_Shanty/Le_Forban_version_de_mer_.sg
@@ -4,21 +4,21 @@
 
 
 \beginverse
-A moi for\[Do]ban que m'importe la gloire
-N\'e fils de \[Sol]roi et de prostitu\[Do]\'ee
+A moi for\[C]ban que m'importe la gloire
+N\'e fils de \[G]roi et de prostitu\[C]\'ee
 Sur des cadavres j'ai chant\'e la victoire
-Et dans un \[Sol]cr\^ane j'ai bu la liber\[Do]t\'e
-Vierge crain\[Fa]tive, toi, ma cap\[Do]tive
-Ce soir je \[Sol]vais d\'evorer tes \[Do]app\^ats
-Encore \[Fa]br\^ulant d'une autre \[Do]amante
-Tes vertus \[Sol]vont expirer dans mes \[Do]bras.
+Et dans un \[G]cr\^ane j'ai bu la liber\[C]t\'e
+Vierge crain\[F]tive, toi, ma cap\[C]tive
+Ce soir je \[G]vais d\'evorer tes \[C]app\^ats
+Encore \[F]br\^ulant d'une autre \[C]amante
+Tes vertus \[G]vont expirer dans mes \[C]bras.
 \endverse
 
 \beginchorus
-Vin qui pé\[Do]tille, femme gentille,
-Sous tes bai\[Sol]sers brûlants d'a\[Do]mour ;
-Plaisirs, \[Fa]batailles, Vive la \[Do]canaille !
-Je bois, je \[Sol]chante, et je tue tour à \[Do]tour
+Vin qui pé\[C]tille, femme gentille,
+Sous tes bai\[G]sers brûlants d'a\[C]mour ;
+Plaisirs, \[F]batailles, Vive la \[C]canaille !
+Je bois, je \[G]chante, et je tue tour à \[C]tour
 \endchorus
 
 \beginverse
diff --git a/songs/Sea_Shanty/Le_Forban_version_de_terre_.sg b/songs/Sea_Shanty/Le_Forban_version_de_terre_.sg
index 5e5d788..7630e45 100644
--- a/songs/Sea_Shanty/Le_Forban_version_de_terre_.sg
+++ b/songs/Sea_Shanty/Le_Forban_version_de_terre_.sg
@@ -3,21 +3,21 @@
 \beginsong{Le Forban (version de terre)}[by=Sea Shanty]
 
 \beginverse
-A moi l'for\[Do]ban, que m'importe la gloire,
-Les lois du \[Sol]monde, et qu'importe la \[Do]mort ? 
+A moi l'for\[C]ban, que m'importe la gloire,
+Les lois du \[G]monde, et qu'importe la \[C]mort ? 
 Sur l'océan j'ai planté ma victoire,
-Et bois mon \[Sol]vin dans une coupe d'\[Do]or. 
-Vivre d'or\[Fa]gie est ma seule espé\[Do]rance, 
-Le seul bon\[Sol]heur que j'aie pu conqué\[Do]rir. 
-C'est sur les \[Fa]flots qu'jai passé mon en\[Do]fance, 
-C'est sur les \[Sol]flots qu'un forban doit mou\[Do]rir
+Et bois mon \[G]vin dans une coupe d'\[C]or. 
+Vivre d'or\[F]gie est ma seule espé\[C]rance, 
+Le seul bon\[G]heur que j'aie pu conqué\[C]rir. 
+C'est sur les \[F]flots qu'jai passé mon en\[C]fance, 
+C'est sur les \[G]flots qu'un forban doit mou\[C]rir
 \endverse
 
 \beginchorus
-Vin qui pé\[Do]tille, femme gentille,
-Sous tes bai\[Sol]sers brûlants d'a\[Do]mour ;
-Plaisirs, \[Fa]batailles, Vive la \[Do]canaille !
-Je bois, je \[Sol]chante, et je tue tour à \[Do]tour
+Vin qui pé\[C]tille, femme gentille,
+Sous tes bai\[G]sers brûlants d'a\[C]mour ;
+Plaisirs, \[F]batailles, Vive la \[C]canaille !
+Je bois, je \[G]chante, et je tue tour à \[C]tour
 \endchorus
 
 \beginverse
diff --git a/songs/Sea_Shanty/The_Mermaid.sg b/songs/Sea_Shanty/The_Mermaid.sg
index 50427c9..69e0002 100644
--- a/songs/Sea_Shanty/The_Mermaid.sg
+++ b/songs/Sea_Shanty/The_Mermaid.sg
@@ -3,18 +3,18 @@
 \beginsong{The Mermaid}[by=Sea Shanty]
 
 \beginverse
-Twas \[Sol]Friday morn when \[Do]we set \[Sol]sail
-And \[Do]we were not \[Ré7]far from the \[Sol]land
-When the captain, he spied a \[Do]lovely \[Sol]mermaid
-With a \[Do]comb and a \[Ré7]glass in her \[Sol]hand
+Twas \[G]Friday morn when \[C]we set \[G]sail
+And \[C]we were not \[D7]far from the \[G]land
+When the captain, he spied a \[C]lovely \[G]mermaid
+With a \[C]comb and a \[D7]glass in her \[G]hand
 \endverse
 
 \beginchorus
 O the ocean's waves will roll
-And the stormy winds will \[Ré7]blow
-While \[Sol]we poor sailors go \[Do]skipping to the \[Sol]top
-And the \[Do]landlubbers \[Ré7]lie down \[Sol]below (below, below)
-And the \[Do]landlubbers \[Ré7]lie down \[Sol]below
+And the stormy winds will \[D7]blow
+While \[G]we poor sailors go \[C]skipping to the \[G]top
+And the \[C]landlubbers \[D7]lie down \[G]below (below, below)
+And the \[C]landlubbers \[D7]lie down \[G]below
 \endchorus
 
 \beginverse
diff --git a/songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg b/songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg
index cef165d..dff78da 100644
--- a/songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg
+++ b/songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg
@@ -3,17 +3,17 @@
 \beginsong{Kilkelly, Ireland}[by=Steven and Peter Jones]
 
 \beginverse
-\[Mim]Kilkelly, Ireland, \[Sol]18 and 60, my \[Ré]dear and loving son \[Mim]John
-Your good friend the schoolmaster \[Sol]Pat McNamara's
-so \[Ré]good as to write these words \[Mim]down.
-Your \[Sol]brothers have all gone to \[Ré]find work in England,
-the \[Do]house is so empty and \[Ré]sad \[Si7]~
-The \[Mim]crop of potatoes is \[Sol]sorely infected,
-a \[Ré]third to a half of them \[Mim]bad.
-And your \[Sol]sister Brigid and \[Ré]Patrick O'Donnell
-are \[Do]going to be married in \[Ré]June. \[Si7]~
-Your \[Mim]mother says not to \[Sol]work on the railroad
-and \[Ré]be sure to come on \[Mim]home soon.
+\[Em]Kilkelly, Ireland, \[G]18 and 60, my \[D]dear and loving son \[Em]John
+Your good friend the schoolmaster \[G]Pat McNamara's
+so \[D]good as to write these words \[Em]down.
+Your \[G]brothers have all gone to \[D]find work in England,
+the \[C]house is so empty and \[D]sad \[B7]~
+The \[Em]crop of potatoes is \[G]sorely infected,
+a \[D]third to a half of them \[Em]bad.
+And your \[G]sister Brigid and \[D]Patrick O'Donnell
+are \[C]going to be married in \[D]June. \[B7]~
+Your \[Em]mother says not to \[G]work on the railroad
+and \[D]be sure to come on \[Em]home soon.
 \endverse
 
 \beginverse
diff --git a/songs/Traditional/Black_Velvet_Band.sg b/songs/Traditional/Black_Velvet_Band.sg
index 50f82a1..c37f6dd 100644
--- a/songs/Traditional/Black_Velvet_Band.sg
+++ b/songs/Traditional/Black_Velvet_Band.sg
@@ -2,46 +2,68 @@
 \songcolumns{2}
 \beginsong{Black Velvet Band}[by=Traditional]
 
+\lilypond{black_velvet_band}
+
 \beginverse
-Well, in a \[Sol]neat little town they call Belfast, apprentice to trade I was \[Ré]bound
-\[Sol]Many an hours sweet \[Mim]happiness, have I \[Do]spent in that \[Ré]neat little \[Sol]town
-A \[Sol]sad misfortune came over me, which caused me to stray from the \[Ré]land
-Far \[Sol]away from my friends and re\[Mim]lations, be\[Do]trayed by the \[Ré]black velvet \[Sol]band 
+Well, in a \[G]neat little town they call Belfast,
+ apprentice to trade I was \[D]bound
+\[G]Many an hours sweet \[Em]happiness,
+ have I \[C]spent in that \[D]neat little \[G]town
+A \[G]sad misfortune came over me,
+ which caused me to stray from the \[D]land
+Far \[G]away from my friends and re\[Em]lations,
+ be\[C]trayed by the \[D]black velvet \[G]band 
 \endverse
 
 \beginchorus
-Her \[Sol]eyes they shone like diamonds
-I thought her the queen of the \[Ré]land
-And her \[Sol]hair it hung over her sh\[Mim]oulder
-Tied \[Do]up with a \[Ré]black velvet \[Sol]band 
+Her \[G]eyes they shone like diamonds
+I thought her the queen of the \[D]land
+And her \[G]hair it hung over her sh\[Em]oulder
+Tied \[C]up with a \[D]black velvet \[G]band 
 \endchorus
 
 \beginverse
-I took a stroll down Broadway, meaning not long for to stay
-When who should I meet but this pretty fair maid comes a tripping along the highway
-She was both fair and handsome, her neck it was just like a swans
-And her hair it hung over her shoulder, tied up with a black velvet band 
+I took a stroll down Broadway,
+ meaning not long for to stay
+When who should I meet but this pretty fair maid
+ comes a tripping along the highway
+She was both fair and handsome,
+ her neck it was just like a swans
+And her hair it hung over her shoulder,
+ tied up with a black velvet band 
 \endverse 
 
 \beginverse 
-I took a stroll with this pretty fair maid, and a gentleman passing us by
-Well I knew she meant the doing of him, by the look in her roguish black eye
-A goldwatch she took from his pocket and placed it right in to my hand
-And the very first thing that I said was bad luck to the black velvet band 
+I took a stroll with this pretty fair maid,
+ and a gentleman passing us by
+Well I knew she meant the doing of him,
+ by the look in her roguish black eye
+A goldwatch she took from his pocket
+ and placed it right in to my hand
+And the very first thing that I said was bad
+ luck to the black velvet band 
 \endverse 
 
 \beginverse
-Before the judge and the jury, next morning I had to appear
-The judge he says to me: "Young man, your case it is proven clear
-We'll give you seven years penal servitude, to be spent faraway from the land
-Far away from your friends and companions, betrayed by the black velvet band" 
+Before the judge and the jury,
+ next morning I had to appear
+The judge he says to me: "Young man,
+ your case it is proven clear
+We'll give you seven years penal servitude,
+ to be spent faraway from the land
+Far away from your friends and companions,
+ betrayed by the black velvet band" 
 \endverse 
 
 \beginverse 
-So come all you jolly young fellows a warning take by me
-When you are out on the town me lads, beware of them pretty colleens
-For they feed you with strong drink, "Oh yeah", 'til you are unable to stand
-And the very next thing that you'll know is you've landed in Van Diemens Land
+So come all you jolly young fellows
+ a warning take by me
+When you are out on the town me lads,
+ beware of them pretty colleens
+For they feed you with strong drink,
+ "Oh yeah", 'til you are unable to stand
+And the very next thing that you'll know
+ is you've landed in Van Diemens Land
 \endverse 
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Fields_of_Athenrye.sg b/songs/Traditional/Fields_of_Athenrye.sg
index 391a9ee..ec51f26 100644
--- a/songs/Traditional/Fields_of_Athenrye.sg
+++ b/songs/Traditional/Fields_of_Athenrye.sg
@@ -3,16 +3,16 @@
 \beginsong{Fields of Athenrye}[by=Traditional]
 
 \beginverse
-By\[Sol] a lonely prison wall,I\[Do] heard a young man\[Sol] call\[Ré]ing,
-\[Sol]Michael they are\[Do] taken you a\[Ré]way,
-For you\[Sol] stole trevelyne\[Do] corn,so the\[Sol] young might see the\[Ré] morn,
-Now a prison ship lies waiting in the\[Sol] bay.
+By\[G] a lonely prison wall,I\[C] heard a young man\[G] call\[D]ing,
+\[G]Michael they are\[C] taken you a\[D]way,
+For you\[G] stole trevelyne\[C] corn,so the\[G] young might see the\[D] morn,
+Now a prison ship lies waiting in the\[G] bay.
 \endverse
 
 \beginchorus
-\[sol]Low\[Do] lie the\[Sol] fields of athenry,where once we watched the small free birds\[Ré] fly,
-Our\[Sol] love was on the\[Do] wing,we had\[Sol] dreams and songs to\[Ré] sing,
-It's so lonely round the fields of Athen\[Sol]ry.
+\[sol]Low\[C] lie the\[G] fields of athenry,where once we watched the small free birds\[D] fly,
+Our\[G] love was on the\[C] wing,we had\[G] dreams and songs to\[D] sing,
+It's so lonely round the fields of Athen\[G]ry.
 \endchorus
 
 \beginverse
diff --git a/songs/Traditional/Finnegan_s_Wake.sg b/songs/Traditional/Finnegan_s_Wake.sg
index 5cd3c9e..72c52f7 100644
--- a/songs/Traditional/Finnegan_s_Wake.sg
+++ b/songs/Traditional/Finnegan_s_Wake.sg
@@ -3,12 +3,12 @@
 \beginsong{Finnegan's Wake}[by=Traditional]
 
 \beginverse
-Tim\[Do] Finnegan lived in\[Lam] Walkin Street, a\[Fa] gentle Irishman\[Sol] mighty odd
-He\[Do] had a brogue both\[Lam] rich and sweet, an' to\[Fa] rise in the \[Sol]world he carried a\[Do] hod
-You see he'd a sort of a\[Lam] tipplers way but the\[Do] love for the\[Lam] liquor poor Tim was\[Do] born
-To help him on his\[Lam] way each day, he'd a\[Fa] drop of the\[Sol] craythur every\[Do] morn
-\[Do]Whack fol the dah now\[Lam] dance to yer\[Fa] partner around the flure yer\[Sol] trotters shake
-\[Do]Wasn't it the\[Lam] truth  I told you?\[Fa] Lots of fun at \[Sol]Finnegan's\[Do] Wake
+Tim\[C] Finnegan lived in\[Am] Walkin Street, a\[F] gentle Irishman\[G] mighty odd
+He\[C] had a brogue both\[Am] rich and sweet, an' to\[F] rise in the \[G]world he carried a\[C] hod
+You see he'd a sort of a\[Am] tipplers way but the\[C] love for the\[Am] liquor poor Tim was\[C] born
+To help him on his\[Am] way each day, he'd a\[F] drop of the\[G] craythur every\[C] morn
+\[C]Whack fol the dah now\[Am] dance to yer\[F] partner around the flure yer\[G] trotters shake
+\[C]Wasn't it the\[Am] truth  I told you?\[F] Lots of fun at \[G]Finnegan's\[C] Wake
 \endverse
                                                
 \beginverse
diff --git a/songs/Traditional/Galway_Races.sg b/songs/Traditional/Galway_Races.sg
index 9095ff2..e18f5a0 100644
--- a/songs/Traditional/Galway_Races.sg
+++ b/songs/Traditional/Galway_Races.sg
@@ -3,19 +3,19 @@
 \beginsong{Galway Races}[by=Traditional]
 
 \beginverse
-\[Do]As I went down to Galway Town
+\[C]As I went down to Galway Town
 To seek for recreation
-On the\[Lam] seventeenth of August
-Me\[Sol] mind being eleva\[Do]ted
-There were passengers assem\[Sol]bled
-With their\[Lam] tickets at the\[Do] station
-And me eyes began to\[Mim] dazzle
-And they\[Lam] off to see the races
+On the\[Am] seventeenth of August
+Me\[G] mind being eleva\[C]ted
+There were passengers assem\[G]bled
+With their\[Am] tickets at the\[C] station
+And me eyes began to\[Em] dazzle
+And they\[Am] off to see the races
 \endverse
 
 \beginchorus
-With me\[Do] wack fol the\[Sol] do fol
-The\[Lam] diddle idle day
+With me\[C] wack fol the\[G] do fol
+The\[Am] diddle idle day
 \endchorus
 
 \beginverse
diff --git a/songs/Traditional/Irish_Rover.sg b/songs/Traditional/Irish_Rover.sg
index d0538fe..d0a3acc 100644
--- a/songs/Traditional/Irish_Rover.sg
+++ b/songs/Traditional/Irish_Rover.sg
@@ -3,15 +3,15 @@
 \beginsong{Irish Rover}[by=Traditional]
 
 \beginverse
-On the \[Sol]Fourth of July, \[Do]1806
-We set \[Sol]sail from the sweet Cobh of \[Ré]Cork
-We were \[Sol]sailing away with a \[Do]cargo of bricks
-For the \[Sol]Grand City \[Ré]Hall in New \[Sol]York
+On the \[G]Fourth of July, \[C]1806
+We set \[G]sail from the sweet Cobh of \[D]Cork
+We were \[G]sailing away with a \[C]cargo of bricks
+For the \[G]Grand City \[D]Hall in New \[G]York
 
-'Twas a \[Sol]wonderful craft, She was \[Ré]rigged 'fore and aft'
-And \[Sol]oh, how the wild wind \[Ré]drove her
-She stood \[Sol]several blasts, She had \[Do]twenty seven masts
-And they \[Sol]called her The \[Ré]Irish \[Sol]Rover
+'Twas a \[G]wonderful craft, She was \[D]rigged 'fore and aft'
+And \[G]oh, how the wild wind \[D]drove her
+She stood \[G]several blasts, She had \[C]twenty seven masts
+And they \[G]called her The \[D]Irish \[G]Rover
 \endverse
 
 \beginverse
diff --git a/songs/Traditional/Johnny_I_Harldy_Knew_Ye_.sg b/songs/Traditional/Johnny_I_Harldy_Knew_Ye_.sg
index f99c92c..0809c41 100644
--- a/songs/Traditional/Johnny_I_Harldy_Knew_Ye_.sg
+++ b/songs/Traditional/Johnny_I_Harldy_Knew_Ye_.sg
@@ -2,13 +2,15 @@
 \songcolumns{2}
 \beginsong{Johnny, I Harldy Knew Ye !}[by=Traditional]
 
+\lilypond{johnny_i_hardly_knew_ye}
+
 \beginverse
-While \[Mim]goin' the road to sweet Athy, \[Sol]Hurroo! Hurroo !
-While \[Mim]goin' the road to sweet Athy, \[Sol]Hurroo! \[Si7]Hurroo !
-While \[Mim]goin' the road to \[Lam]sweet Athy,
-A \[Sol]stick in the hand and a \[Si7]drop in the eye
-A \[Mim]doleful \[Lam]damsel \[Sol]I heard \[Si7]cry,
-\[Mim]Johnny I \[Ré]hardly \[Mim]knew ye !
+While goin' the road to sweet Athy, Hurroo! Hurroo !
+While goin' the road to sweet Athy, Hurroo! Hurroo !
+While goin' the road to sweet Athy,
+A stick in the hand and a drop in the eye
+A doleful damsel I heard cry,
+Johnny I hardly knew ye!
 \endverse
 
 \beginchorus
@@ -51,4 +53,4 @@ So low in flesh, so high in bone
 Oh Johnny I hardly knew ye.
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Leaving_of_Liverpool.sg b/songs/Traditional/Leaving_of_Liverpool.sg
index 83b8b35..cd36b92 100644
--- a/songs/Traditional/Leaving_of_Liverpool.sg
+++ b/songs/Traditional/Leaving_of_Liverpool.sg
@@ -2,11 +2,13 @@
 \songcolumns{2}
 \beginsong{Leaving of Liverpool}[by=Traditional]
 
+\lilypond{leaving_of_liverpool}
+
 \beginverse
-\[La]Farewell to you my\[Ré] own true\[La] love,
-I am going far,far a\[Mi]way,
-I am\[La] bound for Cali\[Ré]forni\[La]a,
-And I know that I'll re\[Mi]turn some\[La] day.
+\[A]Farewell to you my\[D] own true\[A] love,
+I am going far,far a\[E]way,
+I am\[A] bound for Cali\[D]forni\[A]a,
+And I know that I'll re\[E]turn some\[A] day.
 \endverse
 
 \beginchorus
@@ -37,4 +39,4 @@ For I know it will be a long,long time,
 Before I see you again.
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Les_Prisons_de_Nantes.sg b/songs/Traditional/Les_Prisons_de_Nantes.sg
index 167e503..8e8b8e8 100644
--- a/songs/Traditional/Les_Prisons_de_Nantes.sg
+++ b/songs/Traditional/Les_Prisons_de_Nantes.sg
@@ -3,8 +3,8 @@
 \beginsong{Les Prisons de Nantes}[by=Traditional]
 
 \beginverse
-\[Lam]Dans les prisons de Nantes \[Sol] (bis)
-Y avait un \[Sol]prison\[Lam]nier
+\[Am]Dans les prisons de Nantes \[G] (bis)
+Y avait un \[G]prison\[Am]nier
 \endverse
 
 \beginverse
diff --git a/songs/Traditional/Molly_Maguires.sg b/songs/Traditional/Molly_Maguires.sg
index a3b514a..c3f7428 100644
--- a/songs/Traditional/Molly_Maguires.sg
+++ b/songs/Traditional/Molly_Maguires.sg
@@ -3,14 +3,14 @@
 \beginsong{Molly Maguires}[by=Traditional]
 
 \beginchorus
-Make\[Do] way for the\[Sol] Molly Maguires,thet're \[Fa]drinkers,they're\[Sol] liars but they're\[Do] men,
-Make\[Do] way for the\[Sol] Molly Maguires,you'll\[Fa] never see the\[Sol] likes of them\[Do] again.
+Make\[C] way for the\[G] Molly Maguires,thet're \[F]drinkers,they're\[G] liars but they're\[C] men,
+Make\[C] way for the\[G] Molly Maguires,you'll\[F] never see the\[G] likes of them\[C] again.
 \endchorus
 
 \beginverse
-\[Lam]Down the mine no\[Mim] sunlight shines,thoes\[Do] pits are black as\[Lam] hell,
-In\[Do] mud and slime they\[Fa] do thier time,it's\[Sol] Paddy's prison\[Do] cell.
-And they\[Fa] coursed the day they\[Do] sailed away,and \[Fa]drowned their tears with a\[Sol] jar.
+\[Am]Down the mine no\[Em] sunlight shines,thoes\[C] pits are black as\[Am] hell,
+In\[C] mud and slime they\[F] do thier time,it's\[G] Paddy's prison\[C] cell.
+And they\[F] coursed the day they\[C] sailed away,and \[F]drowned their tears with a\[G] jar.
 \endverse
 
 \beginverse
diff --git a/songs/Traditional/Rare_Old_Times.sg b/songs/Traditional/Rare_Old_Times.sg
index cf4e81c..6900ffd 100644
--- a/songs/Traditional/Rare_Old_Times.sg
+++ b/songs/Traditional/Rare_Old_Times.sg
@@ -3,21 +3,21 @@
 \beginsong{Rare Old Times}[by=Traditional]
 
 \beginverse
-\[Sol]Raised on songs and \[Do]stor\[Sol]ies
-\[Mim]Heroes of re\[Do]nown
-The\[Sol] passing tales and \[Do]glor\[Sol]ies
-That once was Dublin\[Ré] Town
-The\[Sol] hallowed halls and\[Do] hous\[Sol]es
-The\[Mim] haunting children's\[Do] rhymes
-That\[Sol] once was Dublin\[Do] Ci\[Sol]ty
-In the\[Ré] rare ould\[Sol] times.
+\[G]Raised on songs and \[C]stor\[G]ies
+\[Em]Heroes of re\[C]nown
+The\[G] passing tales and \[C]glor\[G]ies
+That once was Dublin\[D] Town
+The\[G] hallowed halls and\[C] hous\[G]es
+The\[Em] haunting children's\[C] rhymes
+That\[G] once was Dublin\[C] Ci\[G]ty
+In the\[D] rare ould\[G] times.
 \endverse
 
 \beginchorus
-\[Sol]Ringa Ringa\[Do] Ros\[Sol]ey
-As the\[Mim] light de\[Do]clines
-I'll\[Sol] remember Dublin\[Do] Ci\[Sol]ty
-In the\[Ré] rare ould \[Sol]Times.
+\[G]Ringa Ringa\[C] Ros\[G]ey
+As the\[Em] light de\[C]clines
+I'll\[G] remember Dublin\[C] Ci\[G]ty
+In the\[D] rare ould \[G]Times.
 \endchorus
 
 \beginverse
diff --git a/songs/Traditional/Rocky_Road_To_Dublin.sg b/songs/Traditional/Rocky_Road_To_Dublin.sg
index 02bc847..3c5cae8 100644
--- a/songs/Traditional/Rocky_Road_To_Dublin.sg
+++ b/songs/Traditional/Rocky_Road_To_Dublin.sg
@@ -2,23 +2,25 @@
 \songcolumns{2}
 \beginsong{Rocky Road To Dublin}[by=Traditional]
 
+\lilypond{rocky_road_to_dublin}
+
 \beginverse
-In the \[Rém]merry \[Do]month of \[Rém]May, From my home I started,
-Left the \[Do]girls of \[Rém]Tuam, Nearly \[Do]broken hearted,
-\[Rém]Saluted \[Do]father \[Rém]dear, Kissed my darlin' mother,
-Drank a \[Do]pint of \[Rém]beer, My grief and \[Do]tears to smother,
-Then \[Rém]off to reap the \[Do]corn, And \[Rém]leave where I was \[Do]born,
-I \[Rém]cut a stout \[Do]blackthorn, To banish ghost and goblin,
-In a \[Rém]brand new pair of \[Do]brogues, I \[Rém]rattled o'er the \[Do]bogs,
-And \[Rém]frightened all the \[Do]dogs, On the rocky road to Dublin.
+In the \[Dm]merry \[C]month of \[Dm]May, From my home I started,
+Left the \[C]girls of \[Dm]Tuam, Nearly \[C]broken hearted,
+\[Dm]Saluted \[C]father \[Dm]dear, Kissed my darlin' mother,
+Drank a \[C]pint of \[Dm]beer, My grief and \[C]tears to smother,
+Then \[Dm]off to reap the \[C]corn, And \[Dm]leave where I was \[C]born,
+I \[Dm]cut a stout \[C]blackthorn, To banish ghost and goblin,
+In a \[Dm]brand new pair of \[C]brogues, I \[Dm]rattled o'er the \[C]bogs,
+And \[Dm]frightened all the \[C]dogs, On the rocky road to Dublin.
 \endverse
 
 \beginchorus
-\[Lam]One, two, \[Do]three, four \[Rém]five,
+\[Am]One, two, \[C]three, four \[Dm]five,
 Hunt the hare and turn her
 Down the rocky road
-And all the \[Do]ways to Dublin,
-\[Am]Whack-fol-\[Do]lol-de-\[Rém]ra.
+And all the \[C]ways to Dublin,
+\[Am]Whack-fol-\[C]lol-de-\[Dm]ra.
 \endchorus
 
 \beginverse
@@ -65,4 +67,4 @@ Then with a loud hurray, They joined in the affray.
 We quickly cleared the way, For the rocky road to Dublin.
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Sally_Brown.sg b/songs/Traditional/Sally_Brown.sg
index c8055c2..79241d3 100644
--- a/songs/Traditional/Sally_Brown.sg
+++ b/songs/Traditional/Sally_Brown.sg
@@ -3,14 +3,14 @@
 \beginsong{Sally Brown}[by=Traditional]
 
 \beginverse
-\[La]I Shipped on board off a \[Mi]Liverpool \[La]liner
+\[A]I Shipped on board off a \[E]Liverpool \[A]liner
 \endverse
 
 \beginchorus
-Way \[Mi]hey \[La]roll \[Mi7]and \[La]go
-And we rolled all \[Ré]night
-And we \[Mi]rolled all\[La] day
-To\[La] spend my money along with \[Mi]Sally \[La]Brown
+Way \[E]hey \[A]roll \[E7]and \[A]go
+And we rolled all \[D]night
+And we \[E]rolled all\[A] day
+To\[A] spend my money along with \[E]Sally \[A]Brown
 \endchorus
 
 \beginverse
diff --git a/songs/Traditional/Star_of_The_County_Down.sg b/songs/Traditional/Star_of_The_County_Down.sg
index 514970f..154df59 100644
--- a/songs/Traditional/Star_of_The_County_Down.sg
+++ b/songs/Traditional/Star_of_The_County_Down.sg
@@ -2,22 +2,24 @@
 \songcolumns{2}
 \beginsong{Star of The County Down}[by=Traditional]
 
+\lilypond{star_of_the_county_down}
+
 \beginverse
-In \[Mim]Banbridge Town in the \[Sol]County \[Ré]Down
-One \[Sol]morning \[Em]last \[Ré]July,
-From a \[Mim]boreen green came a \[Sol]sweet \[Ré]colleen
-And she \[Sol]smiled as she \[Do]passed \[Ré]me \[Mim]by.
-She \[Sol]looked so sweet from her \[Lam]two bare feet
-To the \[Sol]sheen of her \[Mim]nut brown \[Ré]hair.
-Such a \[Mim]coaxing elf, sure I \[Sol]shook \[Ré]myself
-\[Mim]For to see \[Do]I was \[Ré]really \[Mim]there.
+In \[Dm]Banbridge Town in the \[F]County \[C]Down
+One \[Dm]morning last \[C]July,
+From a \[Dm]boreen green came a \[F]sweet \[C]colleen
+And she \[Dm]smiled as she passed \[C]me \[Dm]by.
+She \[F]looked so sweet from her \[C]two bare feet
+To the \[Dm]sheen of her nut brown \[C]hair.
+Such a \[Dm]coaxing elf, sure I \[F]shook \[C]myself
+For to \[Dm]see I was \[C]really \[Dm]there.
 \endverse
  
 \beginchorus
-From \[Sol]Bantry Bay up to \[Lam]Derry Quay and
-From \[Sol]Galway to \[Mim]Dublin \[Ré]Town,
-No \[Mim]maid I've seen like the \[Sol]sweet \[Ré]colleen
-That I \[Mim]met in the \[Sol]Coun\[Ré]ty \[Mim]Down.
+From \[F]Bantry Bay up to \[C]Derry Quay and
+From \[Dm]Galway to Dublin \[C]Town,
+No \[Dm]maid I've seen like the \[F]sweet \[C]colleen
+That I \[Dm]met in the Coun\[C]ty \[Dm]Down.
 \endchorus
 
 \beginverse
@@ -42,4 +44,4 @@ Till a smiling bride by my own fireside
 Sits the star of the County Down.
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/The_Foggy_Dew.sg b/songs/Traditional/The_Foggy_Dew.sg
index 59c5480..8723c81 100644
--- a/songs/Traditional/The_Foggy_Dew.sg
+++ b/songs/Traditional/The_Foggy_Dew.sg
@@ -1,40 +1,62 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{The Foggy Dew}[by=Traditional]
+\beginsong{Foggy Dew}[by=Traditional]
+
+\lilypond{the_foggy_dew}
 
 \beginverse
-As\[Mim] down the glen one Easter\[Ré] morn to a\[Sol] city \[Mim]fair rode I
-There\[Mim] Armed lines of marching\[Ré] men in \[Sol]squadrons\[Mim] passed me by
-No\[Sol] fife did hum nor\[Ré] battle\[Sim] drum did\[Sol] sound it's \[Mim]dread tatoo
-But the\[Mim] Angelus bell o'er the Liffey\[Ré] swell rang\[Sol] out through the\[Mim] foggy dew
+As \[Am]down the glen one \[G]Easter \[Em]morn
+ to a \[Am]city \[G]fair rode \[Am]I
+There \[Am]Armed lines of \[G]marching \[Em]men
+ in \[Am]squadrons \[Dm]passed me \[Am]by
+No \[C]pipe did hum no \[G]battle \[C]drum
+ did \[Am]sound it's \[Em]dread \[F]ta\[G]too
+But the \[Am]Angelus bell o'er the \[G]Liffey \[Em]swell
+ rang \[Am]out through the \[Dm]foggy \[Am]dew
 \endverse
 
 \beginverse
-Right proudly high over Dublin Town they hung out the flag of war
-'Twas better to die 'neath an Irish sky than at Sulva or Sud El Bar
-And from the plains of Royal Meath strong  men came hurrying through
-While Britannia's Huns, with their long range guns sailed in through the foggy dew
+Right proudly high over Dublin Town
+ they hung out the flag of war
+'Twas better to die 'neath an Irish sky
+ than at Sulva or Sud El Bar
+And from the plains of Royal Meath
+ strong men came hurrying through
+While Britannia's Huns, with their long range guns
+ sailed in through the foggy dew
 \endverse
 
 \beginverse
-'Twas Britannia bade our Wild Geese go that small nations might be free
-But their lonely graves are by Sulva's waves or the shore of the Great North Sea
-Oh, had they died by Pearse's side or fought with Cathal Brugha
-Their names we will keep where the fenians sleep 'neath the shroud of the foggy dew
+'Twas Britannia bade our Wild Geese
+ go that small nations might be free
+But their lonely graves are by Sulva's waves
+ or the shore of the Great North Sea
+Oh, had they died by Pearse's side
+ or fought with Cathal Brugha
+Their names we will keep where the fenians sleep
+ 'neath the shroud of the foggy dew
 \endverse
 
 \beginverse
-But the bravest fell, and the requiem bell rang mournfully and clear
-For those who died that Eastertide in the springing of the year
-And the world did gaze, in deep amaze, at those fearless men, but few
-Who bore the fight that freedom's light might shine through the foggy dew
+But the bravest fell, and the requiem bell
+ rang mournfully and clear
+For those who died that Eastertide
+ in the springing of the year
+And the world did gaze, in deep amaze,
+ at those fearless men, but few
+Who bore the fight that freedom's light
+ might shine through the foggy dew
 \endverse
 
 \beginverse
-Ah, back through the glen I rode again and my heart with grief was sore
-For I parted then with valiant men whom I never shall see more
-But to and fro in my dreams I go and I'd kneel and pray for you,
-For slavery fled, O glorious dead, When you fell in the foggy dew    
+Ah, back through the glen I rode again
+ and my heart with grief was sore
+For I parted then with valiant men
+ whom I never shall see more
+But to and fro in my dreams
+ I go and I'd kneel and pray for you,
+For slavery fled, O glorious dead,
+ When you fell in the foggy dew    
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/The_Jug_of_Punch.sg b/songs/Traditional/The_Jug_of_Punch.sg
index b63180d..ec24de3 100644
--- a/songs/Traditional/The_Jug_of_Punch.sg
+++ b/songs/Traditional/The_Jug_of_Punch.sg
@@ -1,17 +1,17 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{The Jug of Punch}[by=Traditional]
+\beginsong{Jug of Punch}[by=Traditional]
 
 \beginverse
-One \[Ré]pleasent evening in the month of June,
-As \[La]I was sleeping \[Ré]in my room,
-A small bird sat on an \[Sol]ivy \[La]bunch,
-And the \[Ré]song he \[Sol]sang was The \[La7]Jug Of \[Ré]Punch.
+One \[D]pleasent evening in the month of June,
+As \[A]I was sleeping \[D]in my room,
+A small bird sat on an \[G]ivy \[A]bunch,
+And the \[D]song he \[G]sang was The \[A7]Jug Of \[D]Punch.
 
-\textbf{Too-ra \[Ré]loo-ra loo, too-ra \[Mim]loo-ra lay,}
-\textbf{Too-ra \[La]loo-ra loo, too-ra \[Ré]loo-ra lay,}
-\textbf{A small bird sat on an \[Sol]ivy \[La]bunch,}
-\textbf{And the \[Ré]song he \[Sol]sang was the \[La7]jug of \[Ré]punch.}
+\textbf{Too-ra \[D]loo-ra loo, too-ra \[Em]loo-ra lay,}
+\textbf{Too-ra \[A]loo-ra loo, too-ra \[D]loo-ra lay,}
+\textbf{A small bird sat on an \[G]ivy \[A]bunch,}
+\textbf{And the \[D]song he \[G]sang was the \[A7]jug of \[D]punch.}
 \endverse
 
 \beginverse
@@ -62,4 +62,4 @@ With a jug of punch at me head and feet.
 \textbf{With a jug of punch at me head and feet.}
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/The_Wild_Rover.sg b/songs/Traditional/The_Wild_Rover.sg
index 816df04..0236e08 100644
--- a/songs/Traditional/The_Wild_Rover.sg
+++ b/songs/Traditional/The_Wild_Rover.sg
@@ -1,17 +1,19 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{The Wild Rover}[by=Traditional]
+\beginsong{Wild Rover}[by=Traditional]
+
+\lilypond{wild_rover}
 
 \beginverse
-I've\[Sol] been a wild rover for many a\[Do] year
-And I've\[Sol] spent all me\[Ré] money on whiskey and\[Sol] beer
-But\[Sol] now im returning with gold in great\[Do] store
-And I\[Sol] never will\[Ré] play the wild rover no\[Sol] more
+I've\[G] been a wild rover for many a\[C] year
+And I've\[G] spent all me\[D] money on whiskey and\[G] beer
+But\[G] now im returning with gold in great\[C] store
+And I\[G] never will\[D] play the wild rover no\[G] more
 \endverse
 
 \beginchorus
-And it's\[Ré] no nay never\[Sol] no nay never no\[Do] more
-Will I\[Sol] play the wild\[Do] rover,no\[Sol] never\[Ré] no\[Sol] more
+And it's\[D] no nay never\[G] no nay never no\[C] more
+Will I\[G] play the wild\[C] rover,no\[G] never\[D] no\[G] more
 \endchorus
 
 \beginverse
@@ -35,4 +37,4 @@ And when they forgive me as oft times before
 Sure I never will play the wild rover no more
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Weile_Weile_Waile.sg b/songs/Traditional/Weile_Weile_Waile.sg
index 1b00454..3d66dde 100644
--- a/songs/Traditional/Weile_Weile_Waile.sg
+++ b/songs/Traditional/Weile_Weile_Waile.sg
@@ -3,8 +3,8 @@
 \beginsong{Weile Weile Waile}[by=Traditional]
 
 \beginverse
-There \[La]was an old woman and she lived in the woods, weile weile \[Ré]wai\[La]le
-There \[Mi]was an old woman and she lived in the woods, down by the river \[Mi7]Sai\[La]le
+There \[A]was an old woman and she lived in the woods, weile weile \[D]wai\[A]le
+There \[E]was an old woman and she lived in the woods, down by the river \[E7]Sai\[A]le
 \endverse
 
 \beginverse
diff --git a/songs/Traditional/Whiskey_In_The_Jar.sg b/songs/Traditional/Whiskey_In_The_Jar.sg
index 002a328..997e6ee 100644
--- a/songs/Traditional/Whiskey_In_The_Jar.sg
+++ b/songs/Traditional/Whiskey_In_The_Jar.sg
@@ -2,46 +2,48 @@
 \songcolumns{2}
 \beginsong{Whiskey In The Jar}[by=Traditional]
 
+\lilypond{whiskey_in_the_jar}
+
 \beginverse
-As \[Sol]I was a goin' over the \[Mim]far famed Kerry mountains
-I \[Do]met with captain Farrell and his \[Sol]money he was counting
-I first produced me pistol and \[Mim]then produced me rapier
-Saying \[Do]"Stand and deliver" for I \[Sol]am a bold deceiver
+As \[G]I was a goin' over the \[Em]far famed Kerry mountains,
+I \[C]met with Captain Farrell and his \[G]money he was \[D]counting.
+I \[G]first produced me pistol and I \[Em]then produced me rapier,
+Saying \[C]"Stand and deliver" for I \[G]am a bold deceiver.
 \endverse
 
 \beginchorus
-Musha \[Ré]ring dumma do damma da
-\[Sol] whack fol' the daddy 'ol
-\[Do] whack fol' the daddy 'ol
-there's \[Ré]whiskey \[Sol]in the \[Ré]jar
+Musha \[D]ring dumma do damma dah
+\[G] Whack fol' the daddy -o,
+\[C] Whack fol' the daddy -o,
+There's \[G]whiskey \[D]in the \[G]jar.
 \endchorus
 
 \beginverse
 I counted out his money and it made a pretty penny
-I put it in me pocket and I took it home to Jenny
-She said and she swore that she never would deceive me
-But the devil take the women for they never can be easy
+I put it in me pocket and I took it home to Jenny.
+She sighed and she swore that she never would deceive me,
+But the devil take the women for they never can be easy.
 \endverse
 
 \beginverse
-I went up in my chamber, all for to take a slumber
+I went into my chamber all for to take a slumber
 I dreamt of gold and jewels and for sure 't was no wonder
 But Jenny drew my charges and she filled them up with water
-And sent for captain Farrell to be ready for the slaughter
+And sent for Captain Farrell to be ready for the slaughter.
 \endverse
 
 \beginverse
-'t was early in the morning, as I rose to travel
-The guards were all around me likewise captain Farrell
+'twas early in the morning just before I rose to travel
+Up comes a band of footmen and likewise Captain Farrell
 I first produced me pistol for she stole away me rapier
-I couldn't shoot the water, so a prisoner I was taken
+But I couldn't shoot the water so a prisoner I was taken.
 \endverse
 
 \beginverse
-If anyone can aid me it's my brother in the army
-If I knew his station down in Cork or in Killarney
+If anyone can aid me 'tis my brother in the army
+If I can find his station down in Cork or in Killarney
 And if he'll come and join me, we'll go rovin' near Killkenny
-And sure he'll treat me better than this fuckin' cunt of Jenny
+And sure he'll treat me better than my only sporting Jenny.
 \endverse
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Traditional/Whiskey_You_re_the_Devil.sg b/songs/Traditional/Whiskey_You_re_the_Devil.sg
index 09b1750..5d95cab 100644
--- a/songs/Traditional/Whiskey_You_re_the_Devil.sg
+++ b/songs/Traditional/Whiskey_You_re_the_Devil.sg
@@ -3,21 +3,21 @@
 \beginsong{Whiskey, You're the Devil}[by=Traditional]
 
 \beginchorus
-Oh, \[Sol]whiskey you're the devil, You're \[Do]leading me \[Sol]astray
-O'er hills and mountains and to \[Ré]Americae
-You're \[Sol]sweeter, stronger, decenter, You're \[Do]spunkier than \[Sol]tea
-Oh, \[Sol]whiskey you're me darling drunk or \[Ré]so\[Sol]ber
+Oh, \[G]whiskey you're the devil, You're \[C]leading me \[G]astray
+O'er hills and mountains and to \[D]Americae
+You're \[G]sweeter, stronger, decenter, You're \[C]spunkier than \[G]tea
+Oh, \[G]whiskey you're me darling drunk or \[D]so\[G]ber
 \endchorus
 
 \beginverse
-Now \[Sol]brave boys, we're on the march
-\[Ré]Off to Portu\[Do]gal and Spain
-\[Sol]Drums a'beating, banners a'waving
-\[Do]Devil a'home will \[Ré]come tonight
-Lo' fare thee well With me thitery doodelum the \[Ré]da
-Me \[Lam]thitery doodelum the \[Do]da
-Me \[Sol]right fol' tur-a laddie-o
-There's \[Ré]whiskey in the \[Sol]jar
+Now \[G]brave boys, we're on the march
+\[D]Off to Portu\[C]gal and Spain
+\[G]Drums a'beating, banners a'waving
+\[C]Devil a'home will \[D]come tonight
+Lo' fare thee well With me thitery doodelum the \[D]da
+Me \[Am]thitery doodelum the \[C]da
+Me \[G]right fol' tur-a laddie-o
+There's \[D]whiskey in the \[G]jar
 \endverse
 
 \beginverse
diff --git a/songs/Traditionnel/Les_Filles_des_Forges.sg b/songs/Traditionnel/Les_Filles_des_Forges.sg
index 07debcf..06a6077 100644
--- a/songs/Traditionnel/Les_Filles_des_Forges.sg
+++ b/songs/Traditionnel/Les_Filles_des_Forges.sg
@@ -3,7 +3,7 @@
 \beginsong{Les Filles des Forges}[by=Traditionnel]
 
 \beginverse
-\[Lam]Digue, ding don, don, \[Sol]ce sont les filles des forges
+\[Am]Digue, ding don, don, \[G]ce sont les filles des forges
 Des forges de Paimpont, digue ding dondaine
 Des forges de Paimpont, dingue ding dondon
 \endverse
diff --git a/songs/Unknown/Bugger_Off.sg b/songs/Unknown/Bugger_Off.sg
index bce13fe..2c47b3d 100644
--- a/songs/Unknown/Bugger_Off.sg
+++ b/songs/Unknown/Bugger_Off.sg
@@ -3,17 +3,17 @@
 \beginsong{Bugger Off}[by=Unknown]
 
 \beginchorus
-So bugger \[Sol]off, you \[Do]bastards bugger \[Sol]off! (Fuck You!)
-Bugger \[Em]off, you \[Do]bastards bugger \[Ré]off! (Fuck You!)
-Like a \[Sol]herd of bloody swine that \[Em]refuse to leave the \[Do]trough
-You'll \[Sol]get no more this \[Do]evening so you \[Ré]bastards bugger \[Sol]off
+So bugger \[G]off, you \[C]bastards bugger \[G]off! (Fuck You!)
+Bugger \[Em]off, you \[C]bastards bugger \[D]off! (Fuck You!)
+Like a \[G]herd of bloody swine that \[Em]refuse to leave the \[C]trough
+You'll \[G]get no more this \[C]evening so you \[D]bastards bugger \[G]off
 \endchorus
 
 \beginverse
-Well you've \[Sol]been a lovely audience, but \[Ré]oh the time does \[Sol]pass.
-So don't you all be \[Em]lettin' the door \[Do]hit you in the \[Ré]ass.
-You've been a \[Do]splendid audience, but \[Sol]enough is \[Ré]enough.
-We'd \[Sol]take it very \[Do]kindly if you'd \[Ré]all just bugger \[Sol]off!
+Well you've \[G]been a lovely audience, but \[D]oh the time does \[G]pass.
+So don't you all be \[Em]lettin' the door \[C]hit you in the \[D]ass.
+You've been a \[C]splendid audience, but \[G]enough is \[D]enough.
+We'd \[G]take it very \[C]kindly if you'd \[D]all just bugger \[G]off!
 \endverse
 
 \beginverse