diff --git a/.gitignore b/.gitignore
index 7309ed1..684b5d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 # It is pitch black. You are likely to be eaten by a grue.
+informatic-new/
diff --git a/themes/hello-world/doc.xml b/themes/hello-world/templates/doc.xml
similarity index 100%
rename from themes/hello-world/doc.xml
rename to themes/hello-world/templates/doc.xml
diff --git a/themes/hello-world/html.css b/themes/hello-world/templates/html.css
similarity index 100%
rename from themes/hello-world/html.css
rename to themes/hello-world/templates/html.css
diff --git a/themes/hello-world/html.html b/themes/hello-world/templates/html.html
similarity index 100%
rename from themes/hello-world/html.html
rename to themes/hello-world/templates/html.html
diff --git a/themes/hello-world/md.txt b/themes/hello-world/templates/md.txt
similarity index 100%
rename from themes/hello-world/md.txt
rename to themes/hello-world/templates/md.txt
diff --git a/themes/hello-world/pdf.html b/themes/hello-world/templates/pdf.html
similarity index 100%
rename from themes/hello-world/pdf.html
rename to themes/hello-world/templates/pdf.html
diff --git a/themes/hello-world/txt.txt b/themes/hello-world/templates/txt.txt
similarity index 100%
rename from themes/hello-world/txt.txt
rename to themes/hello-world/templates/txt.txt
diff --git a/themes/minimist/doc.xml b/themes/minimist/templates/doc.xml
similarity index 100%
rename from themes/minimist/doc.xml
rename to themes/minimist/templates/doc.xml
diff --git a/themes/minimist/html.css b/themes/minimist/templates/html.css
similarity index 100%
rename from themes/minimist/html.css
rename to themes/minimist/templates/html.css
diff --git a/themes/minimist/html.html b/themes/minimist/templates/html.html
similarity index 100%
rename from themes/minimist/html.html
rename to themes/minimist/templates/html.html
diff --git a/themes/minimist/md.txt b/themes/minimist/templates/md.txt
similarity index 100%
rename from themes/minimist/md.txt
rename to themes/minimist/templates/md.txt
diff --git a/themes/minimist/pdf.html b/themes/minimist/templates/pdf.html
similarity index 100%
rename from themes/minimist/pdf.html
rename to themes/minimist/templates/pdf.html
diff --git a/themes/minimist/txt.txt b/themes/minimist/templates/txt.txt
similarity index 100%
rename from themes/minimist/txt.txt
rename to themes/minimist/templates/txt.txt
diff --git a/themes/modern/doc.xml b/themes/modern/templates/doc.xml
similarity index 100%
rename from themes/modern/doc.xml
rename to themes/modern/templates/doc.xml
diff --git a/themes/modern/html.css b/themes/modern/templates/html.css
similarity index 100%
rename from themes/modern/html.css
rename to themes/modern/templates/html.css
diff --git a/themes/modern/html.html b/themes/modern/templates/html.html
similarity index 99%
rename from themes/modern/html.html
rename to themes/modern/templates/html.html
index 825be3c..85c09ed 100644
--- a/themes/modern/html.html
+++ b/themes/modern/templates/html.html
@@ -12,6 +12,7 @@ engine: Underscore
     <title>{{ r.basics.name }}</title>
     <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{ headFragment }}
     {% if( cssInfo.file ) { %}
     <link href="{{ cssInfo.file }}" rel="stylesheet" type="text/css">
     {% } else { %}
diff --git a/themes/modern/md.txt b/themes/modern/templates/md.txt
similarity index 100%
rename from themes/modern/md.txt
rename to themes/modern/templates/md.txt
diff --git a/themes/modern/pdf.html b/themes/modern/templates/pdf.html
similarity index 100%
rename from themes/modern/pdf.html
rename to themes/modern/templates/pdf.html
diff --git a/themes/modern/txt.txt b/themes/modern/templates/txt.txt
similarity index 100%
rename from themes/modern/txt.txt
rename to themes/modern/templates/txt.txt
diff --git a/themes/modern/templates/yml.yml b/themes/modern/templates/yml.yml
new file mode 100644
index 0000000..e69de29