diff --git a/cmpd.sly b/cmpd.sly
index eb91f75..279b704 100644
--- a/cmpd.sly
+++ b/cmpd.sly
@@ -12,14 +12,15 @@
 
 \include "./pipeband.sly"
 
+
 bandname = "Canadian Memorial Pipes and Drums"
 bandnameFull = "Canadian Memorial Pipes and Drums of Holland"
 bandnameTagline = \bandnameFull
 bandnameShort = "CMPD"
-bandUrl = "https://canadianmemorialpipesanddrums.nl"
+bandWebsite = "https://canadianmemorialpipesanddrums.nl"
 
 % Reload the tagline
-\include "./defs/tagline.ily"
+\include "./defs/tagline_band.ily"
 
 % Reset the TitleMarkup
 
diff --git a/defs/tagline.ily b/defs/tagline.ily
index 82754e0..9b94879 100644
--- a/defs/tagline.ily
+++ b/defs/tagline.ily
@@ -1,4 +1,4 @@
-%{
+%{0
     Tagline. Customize to get your name in the tag line.
 %}
 
@@ -7,44 +7,13 @@
 %%% See LSR 567: http://lsr.di.unimi.it/LSR/Item?id=567
 #(use-modules (ice-9 popen))
 #(use-modules (ice-9 rdelim))
-today = #(strftime "%Y-%m-%d" (localtime (current-time)))
-
 commit =
 #(let* ((port (open-pipe* OPEN_READ "git" "rev-parse" "--short" "HEAD"))
         (str  (read-line port)))
    (close-pipe port)
    str)
 
-#(if (eof-object? commit) (set! commit ""))
-
-#(define-once commitUrl "")
-#(define-once bandWebsite "")
-#(define-once bandname "")
-#(define-once bandnameFull bandname)
-#(define-once bandUrl "")
-#(define-once bandnameTagline (if (not (string-null? bandnameFull)) bandnameFull
-								(if (not (string-null? bandname)) bandname
-								  (if (not (string-null? bandUrl)) bandUrl ""))))
-
-
-#(if (and (not (string-null? commitUrl)) (not (string-null? commit)))
-   (set! commitUrl (string-append commitUrl commit)))
-
-#(define (print-bandname-in-tagline layout props)
-	"Whether to print any bandname in the tagline."
-	(and
-		(string?  bandnameTagline)
-		(not (string-null?  bandnameTagline))
-	)
-)
-
-#(define (print-commit-hash-in-tagline layout props)
-	"Whether to print a commit hash in the tagline."
-	(and
-		(string? commit)
-		(not (string-null? commit))
-	)
-)
+today = #(strftime "%Y-%m-%d" (localtime (current-time)))
 
 \paper {
     tagline = \markup {
@@ -52,21 +21,8 @@ commit =
 		    \with-url #"http://lilypond.org" #(format #f "Typeset with LilyPond ~a" (lilypond-version) )
 			", "
 			\with-url #"https://etdeboone.nl" "by ET de Boone"
-			% optionally include a bandname
-			\if \print-bandname-in-tagline
-			{
-				", "
-				\with-url #bandUrl \bandnameTagline
-			}
-			" "
-			"(rev. " \today
-			% optionally include the commit hash
-			\if \print-commit-hash-in-tagline
-			{
-				", "
-				\with-url #commitUrl \concat { "#" #commit }
-			}
-			")"
+			", "
+            \concat { "(rev. " \today ", #" \commit ")" }
         }
     }
 }
diff --git a/defs/tagline_band.ily b/defs/tagline_band.ily
new file mode 100644
index 0000000..8eda310
--- /dev/null
+++ b/defs/tagline_band.ily
@@ -0,0 +1,30 @@
+%{
+    Tagline. Customize to get your name in the tag line.
+%}
+
+\version "2.16.0"
+
+%%% See LSR 567: http://lsr.di.unimi.it/LSR/Item?id=567
+#(use-modules (ice-9 popen))
+#(use-modules (ice-9 rdelim))
+commit =
+#(let* ((port (open-pipe* OPEN_READ "git" "rev-parse" "--short" "HEAD"))
+        (str  (read-line port)))
+   (close-pipe port)
+   str)
+
+today = #(strftime "%Y-%m-%d" (localtime (current-time)))
+
+\paper {
+    tagline = \markup {
+		\concat {
+		    \with-url #"http://lilypond.org" #(format #f "Typeset with LilyPond ~a" (lilypond-version) )
+			", "
+			\with-url #"https://etdeboone.nl" "by ET de Boone"
+			", "
+			\with-url #bandWebsite \bandnameFull
+			", "
+            \concat { "(rev. " \today ", #" \commit ")" }
+        }
+    }
+}
diff --git a/pipeband.sly b/pipeband.sly
index 21c4904..0e47228 100644
--- a/pipeband.sly
+++ b/pipeband.sly
@@ -29,12 +29,12 @@ bagpipeKey = {
 
 bandname = "Seaforth Highlanders of Holland"
 bandnameFull = "Seaforth Highlanders of Holland Memorial Pipes and Drums"
-bandnameTagline = "Seaforth's of Holland"
+bandnameTagline = "Seaforths of Holland"
 bandnameShort = "Seaf"
-bandUrl = "https://seaforth.nl"
+bandWebsite = "https://seaforth.nl"
 
 % Seaforth Tagline
-\include "defs/tagline.ily"
+\include "defs/tagline_band.ily"
 
 \layout {
 	indent = 0.0