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/package.json b/package.json
index 292b3a8..2d35b7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watermark",
-  "version": "0.2.0-alpha",
+  "version": "0.3.0-alpha",
   "description": "Themes and exemplars for FluentCV.",
   "private": true,
   "repository": {
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 99%
rename from themes/modern/doc.xml
rename to themes/modern/templates/doc.xml
index 232fd96..d755536 100644
--- a/themes/modern/doc.xml
+++ b/themes/modern/templates/doc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-{#
-
-  modern/doc.xml
-  An XML-driven Microsoft Word resume template for FluentCV's "modern" theme.
-  Uses the MS Word 2003 XML format.
-
-#}
+<!--
+[[[
+title: Modern (PDF)
+description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
+engine: Underscore
+]]]
+-->
 <?mso-application progid="Word.Document"?>
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
   <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
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 97%
rename from themes/modern/html.html
rename to themes/modern/templates/html.html
index 4383b66..85c09ed 100644
--- a/themes/modern/html.html
+++ b/themes/modern/templates/html.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
-{#
-
-  modern/md.txt
-  An HTML resume template for FluentCV's "modern" theme.
-
-#}
+<!-- [[[
+title: Modern (HTML)
+description: An HTML resume template for FluentCV's "modern" theme.
+engine: Underscore
+]]] -->
 <html>
   <head>
     <meta charset="utf-8">
@@ -13,6 +12,7 @@
     <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 97%
rename from themes/modern/pdf.html
rename to themes/modern/templates/pdf.html
index 307e9a6..2d17d2a 100644
--- a/themes/modern/pdf.html
+++ b/themes/modern/templates/pdf.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
-{#
-
-  modern/pdf.html
-  An HTML-driven PDF resume template for FluentCV's "modern" theme.
-
-#}
+<!-- [[[
+title: Modern (PDF)
+description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
+engine: Underscore
+]]] -->
 <html>
   <head>
     <meta charset="utf-8">
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