diff --git a/headfoot.tex b/headfoot.tex
index 287644a..92c6f62 100644
--- a/headfoot.tex
+++ b/headfoot.tex
@@ -1,6 +1,17 @@
-\fancyhf{}
-\fancyhead[C]{\textbf{Sing-Alongs}}
-\fancyfoot[C]{\thepage }
-\renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\footrulewidth}{0.4pt}
+\setlength{\headheight}{15pt}
+
 \pagestyle{fancy}
+\renewcommand{\chaptermark}[1]{ \markboth{#1}{} }
+\renewcommand{\sectionmark}[1]{ \markright{#1}{} }
+
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{\textit{ \nouppercase{\leftmark}} }
+\fancyhead[LO]{\textit{ \nouppercase{\rightmark}} }
+
+\fancypagestyle{plain}{
+  \fancyhf{}
+  \fancyhead[LE,RO]{\thepage}
+  \fancyhead[RE]{\textit{ \nouppercase{Sing-Alongs}} }
+  \fancyhead[LO]{\textit{ \nouppercase{Sing-Alongs}} }
+}
diff --git a/sheet-music_tinwhistle.lytex b/sheet-music_tinwhistle.lytex
index d67a985..d07515a 100644
--- a/sheet-music_tinwhistle.lytex
+++ b/sheet-music_tinwhistle.lytex
@@ -12,7 +12,7 @@
 
 \begin{document}
   \widowpenalties 1 10000
-  \raggedbottom
+  \raggedbottom  
   \pagenumbering{roman}   
   
   \input{title.tex}
@@ -22,104 +22,87 @@
   \clearpage
   \pagenumbering{arabic} 
     
-  \chapter{All for Me Grog}
-    \thispagestyle{fancy}
+  \chapter{All for Me Grog}    
     \lilypondfile[staffsize=14]{notes/AllForMeGrog.ly}
     ~\\
     \input{lyrics/AllForMeGrog.tex} 
 
-  \chapter{Auld Lang Syne}
-    \thispagestyle{fancy}
+  \chapter{Auld Lang Syne}    
     \lilypondfile[staffsize=14]{notes/AuldLangSyne.ly}
     ~\\
     \input{lyrics/AuldLangSyne.tex}    
     
-  \chapter{The Black Velvet Band}
-    \thispagestyle{fancy}
+  \chapter{The Black Velvet Band}    
     \lilypondfile[staffsize=14]{notes/BlackVelvetBand.ly}
     ~\\
     \input{lyrics/BlackVelvetBand.tex}
 
-  \chapter {Drunken Sailor}
-    \thispagestyle{fancy}
+  \chapter {Drunken Sailor}    
     \lilypondfile[staffsize=14]{notes/DrunkenSailor.ly}
     ~\\
     \input{lyrics/DrunkenSailor.tex} 
 
-  \chapter{Finnegan's Wake}
-    \thispagestyle{fancy}
+  \chapter{Finnegan's Wake}    
     \lilypondfile[staffsize=14]{notes/FinnegansWake.ly}
     ~\\
     \input{lyrics/FinnegansWake.tex}
 
-  \chapter{The Foggy Dew}
-    \thispagestyle{fancy}
+  \chapter{The Foggy Dew}    
     \lilypondfile[staffsize=14]{notes/FoggyDew.ly}
     ~\\
     \input{lyrics/FoggyDew.tex}  
 
-  \chapter{I'm a Rover Seldom Sober}
-    \thispagestyle{fancy}
+  \chapter{I'm a Rover Seldom Sober}    
     \lilypondfile[staffsize=14]{notes/ImARoverSeldomSober.ly}
     ~\\
     \input{lyrics/ImARoverSeldomSober.tex}
 
-  \chapter{Johnny I Hardly Knew Ye}
-    \thispagestyle{fancy}
+  \chapter{Johnny I Hardly Knew Ye}    
     \lilypondfile[staffsize=14]{notes/JohnnyIHardlyKnewYe.ly}
     ~\\
     \input{lyrics/JohnnyIHardlyKnewYe.tex}
 
-  \chapter{MacPherson's Farewell}
-    \thispagestyle{fancy}
+  \chapter{MacPherson's Farewell}    
     \lilypondfile[staffsize=14]{notes/MacPhersonsFarewell.ly}
     ~\\
     \input{lyrics/MacPhersonsFarewell.tex}
 
-  \chapter{Molly Malone}
-    \thispagestyle{fancy}
+  \chapter{Molly Malone}    
     \lilypondfile[staffsize=14]{notes/MollyMalone.ly}
     ~\\
     \input{lyrics/MollyMalone.tex}
 
-  \chapter{Muirsheen Durkin}
-    \thispagestyle{fancy}
+  \chapter{Muirsheen Durkin}    
     \lilypondfile[staffsize=14]{notes/MuirsheenDurkin.ly}
     ~\\
     \input{lyrics/MuirsheenDurkin.tex}
 
-  \chapter {A Nation Once Again}
-    \thispagestyle{fancy}
+  \chapter {A Nation Once Again}    
     \lilypondfile[staffsize=14]{notes/NationOnceAgain.ly}
     ~\\
     \input{lyrics/NationOnceAgain.tex}    
     
-  \chapter{The Parting Glass}
-    \thispagestyle{fancy}
+  \chapter{The Parting Glass}    
     \lilypondfile[staffsize=14]{notes/PartingGlass.ly}
     ~\\
     \input{lyrics/PartingGlass.tex}  
         
-  \chapter {The Rising of the Moon}
-    \thispagestyle{fancy}        
+  \chapter {The Rising of the Moon}          
     \lilypondfile[staffsize=14]{notes/RisingOfTheMoon.ly}
     ~\\
     \input{lyrics/RisingOfTheMoon.tex}
         
-  \chapter{The Star of the County Down}
-    \thispagestyle{fancy}
+  \chapter{The Star of the County Down}    
     \lilypondfile[staffsize=14]{notes/StarOfTheCountyDown.ly}
     ~\\
     \input{lyrics/StarOfTheCountyDown.tex}   
        
-  \chapter{Whiskey in the Jar}
-    \thispagestyle{fancy}
+  \chapter{Whiskey in the Jar}    
     \lilypondfile[staffsize=14]{notes/WhiskeyInTheJar.ly}
     ~\\
     \input{lyrics/WhiskeyInTheJar.tex}
        
-  \chapter{The Wild Rover}
-    \thispagestyle{fancy}
+  \chapter{The Wild Rover}    
     \lilypondfile[staffsize=14]{notes/WildRover.ly}
     ~\\
     \input{lyrics/WildRover.tex}