diff --git a/songs/David Bowie/Ziggy Stardust.tex b/songs/David Bowie/Ziggy Stardust.tex
index 851ae94..1808732 100644
--- a/songs/David Bowie/Ziggy Stardust.tex	
+++ b/songs/David Bowie/Ziggy Stardust.tex	
@@ -53,7 +53,7 @@ He took it ^{Am}all too far, but, boy, could he ^{C}play guitar!
 ^{Am} Making ^{G5}love with his ^{F5}ego, ^{G5†}
 ^{Am} Ziggy ^{G5}sucked up in^{F5}to his mind, ^{G5†} \\
 ^{Am} Like a ^{G5}leper Mess^{F5}iah,
-When ^{G5}the ^{D}kids had killed the ^{D}man I had to ^{E}break up the band!
+When ^{G5†}the ^{D}kids had killed the ^{D}man I had to ^{E}break up the band!
 \end{chorus}
 
 \begin{interlude}
@@ -64,7 +64,7 @@ When ^{G5}the ^{D}kids had killed the ^{D}man I had to ^{E}break up the band!
 
 \begin{outro}
 ^{G} Oh Yeah... ^{D}      ^{Cadd9}     ^{G/B}    ^{G/A}ooo. \\
-^{G} ^{D}        ^{Cadd9} Ziggy played guit^{G}ar!
+^{G} ^{D}        ^{Cadd9*} Ziggy played guit^{G*}ar!
 \end{outro}
 
 \end{song}
diff --git a/songs/Karen O/The Moon Song.tex b/songs/Karen O/The Moon Song.tex
index 40453b3..9318b93 100644
--- a/songs/Karen O/The Moon Song.tex	
+++ b/songs/Karen O/The Moon Song.tex	
@@ -8,7 +8,6 @@
 
 \begin{song}[transpose-capo=true]{title={The Moon Song}, band={Karen O}, year={2014}, key={C}}
 
-
 \begin{intro}
 \begin{tabular}[t]{@{}lllll}
 |_{Dm} & |_{G6} &  |_{C} & |_{C} & |
@@ -18,26 +17,27 @@
 \begin{verse}
 \vf I'm ^-{Dm} lying ^{G6}on the ^{C}moon ^{C} \\
 \vm My ^-{Dm} dear, I'll ^{G6}be there ^{C}soon ^{C} \\
-\vd It's a ^{Dm}quiet ^{G6}starry ^{C}place ^{C} \\
-Time's we're ^-{Dm}  swallowed ^{G6}up
-in ^{F}space, we're here a ^{Fm}million miles a^{C}way ^{C}
+\vf It's a ^{Dm}quiet ^{G6}starry ^{C}place ^{C} \\
+Time's we're ^-{Dm}  swallowed ^{G6}up in ^{F}space, \\
+We're here \vd a ^{Fm}million miles a^{C}way ^{C}
 \end{verse}
 
 \begin{verse}
-There's ^-{Dm} things I ^{G6}wish I ^{C}knew ^{C} \\
-There's no ^-{Dm} thing I ^{G6}keep from ^{C}you ^{C} \\
-It's a ^-{Dm} dark and ^{G6}shiny ^{C}place  ^{C} \\
-But with ^{Dm}you my ^{G6}dear I'm ^{F}safe, and we're a ^{Fm}million miles a^{C}way ^{C}
+\vf There's ^-{Dm} things I ^{G6}wish I ^{C}knew ^{C} \\
+\vm There's no ^-{Dm} thing I ^{G6}keep from ^{C}you ^{C} \\
+\vf It's a \vd ^-{Dm} dark and ^{G6}shiny ^{C}place  ^{C} \\
+\vf But with \vd ^{Dm}you my ^{G6}dear I'm ^{F}safe, \\
+\vf And we're \vd a ^{Fm}million miles a^{C}way ^{C}
 \end{verse}
 
 \begin{verse}
-We're ^-{Dm} lying ^{G6}on the ^{C}moon ^{C} \\
-It's a ^-{Dm}perfect ^{G6}after ^{C}noon ^{C} \\
-Your shadow ^-{Dm} follows ^{G6}me all ^{C}day ^{C} \\
-Making ^{Dm*}sure that ^{G6*}I'm o^{F*}kay and
-we're a ^{Fm}million miles ^{C}away \\
-A ^{Fm}million miles ^{C}away \\
-A ^{Fm}million miles ^{C*}away \\
+\vf We're \vd ^-{Dm} lying ^{G6}on the ^{C}moon ^{C} \\
+\vf It's a \vd ^-{Dm}perfect ^{G6}after ^{C}noon ^{C} \\
+\vf Your shadow \vd ^-{Dm} follows ^{G6}me all ^{C}day ^{C} \\
+\vf Making ^{Dm*}sure that ^{G6*}I'm o^{F}kay \\
+And we're \vd a ^{Fm}million miles ^{C}away \\
+\vd A ^{Fm}million miles ^{C}away \\
+\vd A ^{Fm}million miles ^{C*}away \\
 \end{verse}
 
 \end{song}
diff --git a/songs/Oasis/Champagne Supernova.tex b/songs/Oasis/Champagne Supernova.tex
index d075f9b..565c168 100644
--- a/songs/Oasis/Champagne Supernova.tex	
+++ b/songs/Oasis/Champagne Supernova.tex	
@@ -19,76 +19,80 @@
 \begin{chorus}
 Someday you will ^{Asus2}find me caught beneath the ^{Asus2/G}landsliii-hide \\
 In a ^{Asus2/F#}champagne supernova in the ^{Asus2/E}sky \\
-Someday you will ^{Asus2}find me caught beneath the ^{Asus2/G}landslide \\
+Someday you will ^{Asus2}find me caught beneath the ^{Asus2/G}landsliii-hide \\
 In a ^{Asus2/F#}champagne supernova a ^{Asus2/E}champagne supernova in the
 ^{Asus2}sky ^{Asus2/G} ^{Asus2/F#} ^{Asus2/E}
 \end{chorus}
-
+
 \begin{verse}
-^{Asus2}Wake up the dawn and ask her why, a ^{Asus2/G}dreamer dreams she never dies \\
-^{Asus2/F#}Wipe that tear away now from your ^{Asus2/E}eye \\
-^{Asus2}Slowly walking down the hall, ^{Asus2/G}faster than a cannon ball \\
-^{Asus2/F#}Where were you while we were getting ^{Asus2/E}high?
+%^{Asus2}Wake up the dawn and ask her why, a ^{Asus2/G}dreamer dreams she never dies \\
+%^{Asus2/F#}Wipe that tear away now from your ^{Asus2/E}eye \\
+%^{Asus2}Slowly walking down the hall, ^{Asus2/G}faster than a cannon ball \\
+%^{Asus2/F#}Where were you while we were getting ^{Asus2/E}high?
+Wake up the dawn and ask her why, a dreamer dreams she never dies \\
+Wipe that tear away now from your eye \\
+Slowly walking down the hall, faster than a cannon ball \\
+Where were you while we were getting high?
+
 \end{verse}
 
 \begin{chorus}
-Someday you will ^{Asus2}find me caught beneath the ^{G}landslide \\
+Someday you will ^{Asus2}find me caught beneath the ^{G}landsliii-hide \\
 in a ^{Dmaj7/F#}champagne supernova in the ^{E}sky \\
-Someday you will ^{Asus2}find me caught beneath the ^{G}landslide \\
+Someday you will ^{Asus2}find me caught beneath the ^{G}landsliii-hide \\
 in a ^{Dmaj7/F#}champagne supernova a ^{E}champagne supernova
 \end{chorus}
 
 \begin{bridge}
-cos ^{G}people believe that they're ^{D}gonna get away for the ^{Asus2}summer
-but ^{G}you and i we live and die, the ^{D}world's still spinning round
-we don't know ^{E}why, ^{G}why, ^{D}why, why
-^{Asus2}why ^{Asus2/G} ^{Asus2/F#} ^{Asus2/E}
+Cos ^{G}people believe that they're ^{G}gonna get away for the ^{Asus2}summer  ^{Asus2} \\
+But ^{G}you and I we live and die, the ^{D}world's still spinning round
+we don't know ^{E}why, \\
+^{E}Why, why, why ^{Asus2}why ^{Asus2/G} ^{Asus2/F#} ^{Asus2/E}
 \end{bridge}
 
 \begin{interlude}
-Asus2   Asus2/G   Asus2/F#   Asus2/E
+\begin{tabular}[t]{@{}lllll}
+|_{Asus2} & |_{Asus2/G} &  |_{Asus2/F#} & |_{Asus2/E} & | 2x
+\end{tabular}
 \end{interlude}
         
-\begin{verse}
-\instruction{Repeat Verse 1}
-\end{verse}
-
        
-\begin{chorus}
-\instruction{Repeat Chorus}
-\end{chorus}
-
-        
-\begin{bridge}
-\instruction{Repeat Bridge}
-\end{bridge}
-
+\begin{verse*}
+\instruction{Repeat Verse 1} \instruction{Repeat Chorus 2} \instruction{Repeat Bridge}
+\end{verse*}
+
+%\begin{interlude}
+%[Interlude]
+%
+% A    G    F#m    F  G    A    G    F#m    F  G 
+% why                                       Na Na
+% A      G      F#m    F  G      A      G      F#m 
+% Na, Na Na, Na Na,    Na Na     Na, Na Na, Na Na
+%$ F  G   F  G   F  G   A        Asus2/G      Asus2/F#        Asus2/E 
+% Na Na, Na Na, Na Na, Na
+%  A      Asus2/G      Asus2/F#        Asus2/E 
+%\end{interlude}
+
 \begin{interlude}
-[Interlude]
-
- A    G    F#m    F  G    A    G    F#m    F  G 
- why                                       Na Na
- A      G      F#m    F  G      A      G      F#m 
- Na, Na Na, Na Na,    Na Na     Na, Na Na, Na Na
- F  G   F  G   F  G   A        Asus2/G      Asus2/F#        Asus2/E 
- Na Na, Na Na, Na Na, Na
-  A      Asus2/G      Asus2/F#        Asus2/E 
+\begin{tabular}[t]{@{}lllll}
+|_{Asus2} & |_{Asus2/G} &  |_{Asus2/F#} & |_{Asus2/E} & | 2x
+\end{tabular}
 \end{interlude}
-
+	
 \begin{verse}
-^{Asus2}How many special people change? ^{Asus2/G}how many lives are living strange? \\
-^{Asus2/F#}Where were you while we were getting ^{Asus2/E}high? \\
-We were getting ^{Asus2}high, we were getting ^{Asus2/G}high \\
-We were getting ^{Asus2/F#}high, we were getting ^{Asus2/E}high \\
-                A                     Asus2/G 
-We were getting high, we were getting high
-                Asus2/F#                    Asus2/E 
-We were getting high, we were getting high
-                A         Asus2/G       Asus2/F#       F    G    A 
-We were getting high
+%^{Asus2}How many special people change? ^{Asus2/G}how many lives are living strange? \\
+%^{Asus2/F#}Where were you while we were getting ^{Asus2/E}high? \\
+%We were getting ^{Asus2}high, we were getting ^{Asus2/G}high \\
+%We were getting ^{Asus2/F#}high, we were getting ^{Asus2/E}high \instruction{Repeat last two lines three times, fading vocals on thrid}
+How many special people change? How many lives are living strange? \\
+Where were you while we were getting high? \\
+We were getting high, we were getting high \\
+We were getting high, we were getting high \instruction{Repeat last two lines three times, fading vocals on third}
 \end{verse}
 
 \begin{outro}
- F    G    A 
+\begin{tabular}[t]{@{}llll}
+|_{F} & |_{G} &  |_{A*} & |
+\end{tabular}
 \end{outro}
 
 \end{song}
diff --git a/tex/skrul-leadsheet.cls b/tex/skrul-leadsheet.cls
index 938f3bf..81a0a5f 100644
--- a/tex/skrul-leadsheet.cls
+++ b/tex/skrul-leadsheet.cls
@@ -36,14 +36,36 @@
 \hrulefill
 }
 
+\ExplSyntaxOn
+
+\char_set_catcode_other:N \#
+\char_set_catcode_parameter:N \!
+\NewDocumentCommand \xchordname {m} { 
+\chordname{
+  \str_case:nnTF {!1}
+    {
+      {B#}  {C}
+      {F##} {G}
+    }
+    {}
+    {!1}
+  }
+}
+\char_set_catcode_parameter:N \#
+\char_set_catcode_other:N \!
+
+\ExplSyntaxOff
+
 \setleadsheets{
   title-template = leadsheet,
   align-chords=l,
   verse/numbered,
   chords/format = \color{black}\bfseries,
+  chord-cs = \xchordname,
   verses-label-format = \itshape
 }
 
+
 \LeadsheetSurvive
 \provideversetype{prechorus}[name=Prechorus]
 \provideversetype*{prechorus*}[name=Prechorus]