diff --git a/themes/compact/src/compact-md.txt b/themes/compact/src/compact-md.txt
new file mode 100644
index 0000000..c22301b
--- /dev/null
+++ b/themes/compact/src/compact-md.txt
@@ -0,0 +1,54 @@
+# {{ r.name }}
+
+{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
+{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
+{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
+
+{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
+
+{% if ( r.skills && r.skills.sets ) { %}
+## Skills
+{% r.skills.sets.forEach( function( set, idx, ar) { %}
+- **{{ set.name }}**: {{ set.skills.join(', ') }}
+{% }); } %}
+
+{% if ( r.employment.history && r.employment.history.length ) { %}
+## Employment
+{% r.employment.history.forEach( function( proj, idx, ar) { %}
+### *{{ proj.position }}*, {{ proj.employer }}
+<small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
+{{ proj.summary }}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
+- {{ high }}
+{% }); }  }); } %}
+
+{% if ( r.education.history && r.education.history.length ) { %}
+## Education
+{% r.education.history.forEach( function( edu, idx, ar) { %}
+### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }})
+{{ edu.area }}
+{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %}
+- {{ course }}
+{% }); } }); } %}
+
+{% if ( r.writing && r.writing.length ) { %}
+## Publications
+{% r.writing.forEach( function( pub, idx, ar) { %}
+### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
+{{ pub.publisher }}
+{{ pub.summary }}
+{% }); } %}
+
+{% if ( r.service.history && r.service.history.length ) { %}
+## Volunteer
+{% r.service.history.forEach( function( vol, idx, ar) { %}
+### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }})
+{{ vol.summary }}
+{% }); } %}
+
+{% if ( r.recognition && r.recognition.length ) { %}
+## Recognition
+{% r.recognition.forEach( function( awd, idx, ar) { %}
+### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }})
+{{ awd.summary }}
+{% }); } %}
diff --git a/themes/minimist/src/md.txt b/themes/minimist/src/md.txt
index 20cd2d0..c22301b 100644
--- a/themes/minimist/src/md.txt
+++ b/themes/minimist/src/md.txt
@@ -1,9 +1,3 @@
-{#
-
-  minimist/md.txt
-  A Markdown resume template for FluentCV's "minimist" theme.
-
-#}
 # {{ r.name }}
 
 {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
@@ -15,13 +9,14 @@
 {% if ( r.skills && r.skills.sets ) { %}
 ## Skills
 {% r.skills.sets.forEach( function( set, idx, ar) { %}
-- **{{ set.name }}**: {{ set.level }}
+- **{{ set.name }}**: {{ set.skills.join(', ') }}
 {% }); } %}
 
 {% if ( r.employment.history && r.employment.history.length ) { %}
 ## Employment
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
-### *{{ proj.position }}*, {{ proj.employer }} ({{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }})
+### *{{ proj.position }}*, {{ proj.employer }}
+<small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
 {{ proj.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
 - {{ high }}
diff --git a/themes/modern/src/md.txt b/themes/modern/src/md.txt
index edd2dd3..c22301b 100644
--- a/themes/modern/src/md.txt
+++ b/themes/modern/src/md.txt
@@ -1,9 +1,3 @@
-{#
-
-  modern/md.txt
-  A Markdown resume template for FluentCV's "modern" theme.
-
-#}
 # {{ r.name }}
 
 {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
@@ -15,13 +9,14 @@
 {% if ( r.skills && r.skills.sets ) { %}
 ## Skills
 {% r.skills.sets.forEach( function( set, idx, ar) { %}
-- **{{ set.name }}**: {{ set.level }}
+- **{{ set.name }}**: {{ set.skills.join(', ') }}
 {% }); } %}
 
 {% if ( r.employment.history && r.employment.history.length ) { %}
 ## Employment
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
-### *{{ proj.position }}*, {{ proj.employer }} ({{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }})
+### *{{ proj.position }}*, {{ proj.employer }}
+<small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
 {{ proj.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
 - {{ high }}