diff --git a/.gitmodules b/.gitmodules
index 10d2cfc..c777154 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "library/freie_lieder"]
 	path = library/freie_lieder
 	url = ssh://leopoldf@gitea.leopold.fajtak.at:44903/leopold/freie_lieder.git
+[submodule "fonts/EBGaramond12"]
+	path = fonts/EBGaramond12
+	url = https://github.com/octaviopardo/EBGaramond12.git
+[submodule "fonts/dosis-vf"]
+	path = fonts/dosis-vf
+	url = https://github.com/googlefonts/dosis-vf.git
diff --git a/Makefile b/Makefile
index 4e8cccd..838fb59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: all 
-tex_deps = variables.tt library/*/*/*.tt song_choices.csv song_template.tt propers/*.tt purpose_processing.tt
+tex_deps = build variables.tt library/*/*/*.tt song_choices.csv song_template.tt propers/*.tt purpose_processing.tt
 all: build leadsheet_collection.pdf print_a3.pdf print_a4.pdf clean_intermediate
 %.pdf: %.tex
 	cd build && \
diff --git a/fonts/EBGaramond12 b/fonts/EBGaramond12
new file mode 160000
index 0000000..e608414
--- /dev/null
+++ b/fonts/EBGaramond12
@@ -0,0 +1 @@
+Subproject commit e608414f52e532b68e2182f96b4ce9db35335593
diff --git a/fonts/dosis-vf b/fonts/dosis-vf
new file mode 160000
index 0000000..3407d52
--- /dev/null
+++ b/fonts/dosis-vf
@@ -0,0 +1 @@
+Subproject commit 3407d52f1d1b1c36c14e756ad0b36561d8d44a3b
diff --git a/header.tt b/header.tt
index eb5679f..29982ac 100644
--- a/header.tt
+++ b/header.tt
@@ -31,9 +31,23 @@
 \definecolor{hope_white}{HTML}{916836}
 \definecolor{hope_green}{HTML}{36913a}
 \definecolor{hope_red}{HTML}{91363b}
-\setmainfont[Numbers={OldStyle, Proportional},RawFeature={+ss06}]{EB Garamond}
-\newfontfamily\headingfont[]{Dosis}
 \newcommand{\raisedrulefill}[2][0ex]{\leaders\hbox{\rule[#1]{1pt}{#2}}\hfill}
+\setmainfont[
+Path = ../fonts/EBGaramond12/fonts/ttf/,
+Extension = .ttf,
+UprightFont = *-Regular,
+BoldFont = *-Bold,
+ItalicFont = *-Italic,
+BoldItalicFont = *-BoldItalic,
+Numbers = {OldStyle, Proportional},
+RawFeature = {+ss06}
+]{EBGaramond}
+\newfontfamily\headingfont[
+Path=../fonts/dosis-vf/fonts/ttf/,
+Extension = .ttf,
+UprightFont = *-Regular,
+BoldFont = *-Bold
+]{Dosis}
 \titleformat{\section}{\headingfont\color{hope_[% color %]}\bfseries\huge}{\thesection. }{0em}{#1}
 \titleformat{\subsection}{\headingfont\Large}{\thesubsection. }{0em}{\color{black}#1\,\color{hope_[% color %]}\raisedrulefill[0.0ex]{2pt}}
 \newcommand{\song}[3]{%