diff --git a/.gitmodules b/.gitmodules
index 1e1499a..f8e11bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "lilydrum"]
 	path = lilydrum
-	url = ../../git/lilydrumi.git
+	url = /home/ericteunis/public/git/lilydrum.git/
 [submodule "bagpipemusic"]
 	path = bagpipemusic
 	url = https://github.com/svenax/bagpipemusic.git
diff --git a/build b/build
index 25d127e..b3334d9 100644
--- a/build
+++ b/build
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MKDRUMCOMMAND="./lily_files/makedrum"
-MKDRUMOPTIONS="--no-log -i ./lily_files/defs.ly -i ./lily_files/header_default.ily --drumfile ./lily_files/lilydrum/lilydrum.ly --pipefile ./lily_files/bagpipe_new.ly -s 18"
+MKDRUMCOMMAND="./lilydrum/makedrum"
+MKDRUMOPTIONS="--no-log -i ./defs/defs.ly -i ./defs/header_default.ily --drumfile ./lilydrum/lilydrum.ly --pipefile ./bagpipemusic/bagpipe_new.ly -s 18"
 MUSIC_DIR="./music/"
 OUT_DIR="./pdf/"
 MKDRUMOPTIONS="$MKDRUMOPTIONS -d $OUT_DIR"
@@ -43,6 +43,7 @@ elif [ -d "$1" ]; then
 	another_dir "$1"
 fi
 
+# Fix naming
 for f in $OUT_DIR/music-*
 do
 	mv $f ${f/music-/}
diff --git a/defs/defs.ly b/defs/defs.ly
new file mode 100644
index 0000000..c2bb2f9
--- /dev/null
+++ b/defs/defs.ly
@@ -0,0 +1,22 @@
+% ===================================================	%
+% 	*Shorts* for Naming									%
+% ===================================================	%
+
+instrumentSide = "Side"
+instrumentTenor = "Tenor"
+instrumentBass = "Bass"
+instrumentPipes = "Pipes"
+instrumentPipessecnd = "Seconds"
+instrumentPipesthrd = "Thirds"
+shortInstrumentSide = "S.D."
+shortInstrumentTenor = "T.D."
+shortInstrumentBass = "B.D."
+shortInstrumentPipes = "P."
+shortInstrumentPipessecnd = "P.2"
+shortInstrumentPipesthrd = "P.3"
+composerSide  = ""
+composerTenor = ""
+composerBass  = ""
+composerPipes = ""
+composerPipessecnd = ""
+composerPipesthrd = ""
diff --git a/defs/header_book.ily b/defs/header_book.ily
new file mode 100644
index 0000000..1225132
--- /dev/null
+++ b/defs/header_book.ily
@@ -0,0 +1,42 @@
+%{
+    Header formatting for tunes. Customize to get your name in the tag line.
+%}
+
+\version "2.16.0"
+
+today = #(strftime "%B %e, %Y" (localtime (current-time)))
+
+\paper {
+    raggedbottom = ##t
+    tagline = \markup {
+        \line {
+            "ET de Boone, Seaforths of Holland,"
+            \concat { "(rev. " \today ")" }
+        }
+    }
+    bookTitleMarkup = \markup {
+      \override #'(baseline-skip . 3.5)
+      \column {
+        \fill-line { \fromproperty #'header:dedication }
+        \override #'(baseline-skip . 3.5)
+        \column {
+          \huge \larger \bold
+          \fill-line {
+            \larger \fromproperty #'header:title
+          }
+          \fill-line {
+            \large \smaller \bold
+            \larger \fromproperty #'header:subtitle
+          }
+          \fill-line {
+            \smaller \bold
+            \fromproperty #'header:source
+          }
+          \fill-line {
+          \line { \fromproperty #'header:meter }
+          \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
+          }
+        }
+      }
+    }
+}
diff --git a/defs/header_default.ily b/defs/header_default.ily
new file mode 100644
index 0000000..c9a5fd3
--- /dev/null
+++ b/defs/header_default.ily
@@ -0,0 +1,39 @@
+%{
+    Header formatting for tunes. Customize to get your name in the tag line.
+%}
+
+\version "2.16.0"
+
+today = #(strftime "%B %e, %Y" (localtime (current-time)))
+
+\paper {
+    tagline = \markup {
+        \line {
+	"ET de Boone, Seaforths of Holland,"
+            \concat { "(rev. " \today ")" }
+        }
+    }
+    scoreTitleMarkup = \markup {
+        \override #'(baseline-skip . 3)
+        \column {
+            \fill-line {
+                \column {
+                    \large \bold \fromproperty #'header:title
+                    \bold \fromproperty #'header:subtitle
+                }
+                \fromproperty #'header:meter
+                \column \right-align {
+					\fromproperty #'header:instrument
+					\line {
+						\fromproperty #'header:composer
+						$(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger))
+							(markup " "))
+						\italic \fromproperty #'header:arranger }
+				}
+            }
+            $(if (not (ly:get-option 'without-comment))
+                 (markup #:justify-field 'header:comment)
+                 (markup))
+        }
+    }
+}
diff --git a/lilydrum b/lilydrum
new file mode 160000
index 0000000..c6a9c95
--- /dev/null
+++ b/lilydrum
@@ -0,0 +1 @@
+Subproject commit c6a9c956321a175e33e1668cea8e8e3e19cb7a0e