diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html
index e1578d5..c9b3ca0 100644
--- a/themes/compact/templates/html.html
+++ b/themes/compact/templates/html.html
@@ -25,7 +25,7 @@
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
       <section id="skills">
         <header>
         <h2>Skills</h2><hr>
@@ -38,10 +38,10 @@
             </tr>
           </thead>
           <tbody>
-            {% r.skills.forEach( function( skill, idx, ar) { %}
+            {% r.skills.sets.forEach( function( skillset ) { %}
             <tr>
-              <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{{ skill.level }}</td>
+              <td style="width: 25%;">{{ skillset.name }}</td>
+              <td class="keywords">{{ skillset.skills.join(',') }}</td>
             </tr>
             {% }); %}
           </tbody>
@@ -129,15 +129,15 @@
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <section id="publications">
         <header>
         <h2>Publications</h2><hr>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
             {% } else { %}
               <span class="res-label">{{ pub.title }}</span>,&nbsp;{{ pub.publisher }}
@@ -151,14 +151,14 @@
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <section id="awards">
         <header>
         <h2>Awards</h2><hr>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }} <span class="tenure">{{ award.safeDate.format('YYYY') }}</span></h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }} <span class="tenure">{{ award.safe.date.format('YYYY') }}</span></h4>
           {{ award.summary|md }}
         {% }); %}
       </section>
diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html
index f2b2090..bffec4d 100644
--- a/themes/compact/templates/pdf.html
+++ b/themes/compact/templates/pdf.html
@@ -27,7 +27,7 @@
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
       <section id="skills">
         <header>
         <h2>Skills</h2><hr>
@@ -40,10 +40,10 @@
             </tr>
           </thead>
           <tbody>
-            {% r.skills.forEach( function( skill, idx, ar) { %}
+            {% r.skills.sets.forEach( function( skillset ) { %}
             <tr>
-              <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{{ skill.level }}</td>
+              <td style="width: 25%;">{{ skillset.name }}</td>
+              <td class="keywords">{{ skillset.skills.join(',') }}</td>
             </tr>
             {% }); %}
           </tbody>
@@ -131,15 +131,15 @@
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <section id="publications">
         <header>
         <h2>Publications</h2><hr>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
             {% } else { %}
               <span class="res-label">{{ pub.title }}</span>,&nbsp;{{ pub.publisher }}
@@ -153,14 +153,14 @@
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <section id="awards">
         <header>
         <h2>Awards</h2><hr>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }} <span class="tenure">{{ award.safeDate.format('YYYY') }}</span></h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }} <span class="tenure">{{ award.safe.date.format('YYYY') }}</span></h4>
           {{ award.summary|md }}
         {% }); %}
       </section>
@@ -168,4 +168,3 @@
 
     </main>
   </body>
-</html>
diff --git a/themes/compact/templates/txt.txt b/themes/compact/templates/txt.txt
index 62bcedc..a33c4eb 100644
--- a/themes/compact/templates/txt.txt
+++ b/themes/compact/templates/txt.txt
@@ -1,3 +1,9 @@
+{#
+
+  compact/txt.txt
+  A plain text resume template for FluentCV's "compact" theme.
+
+#}
 {{ r.name }}
 {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
 {% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
@@ -9,7 +15,7 @@
 
 
 {% if ( r.skills && r.skills.length ) { %}SKILLS
-{% r.skills.forEach( function( skill, idx, ar) { %}
+{% r.skills.forEach( function( skill ) { %}
   - {{ skill.name }}: {{ skill.level }}
 {% }); } %}
 
@@ -17,7 +23,7 @@
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
 {{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
 {{ proj.summary }}
-{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
   - {{ high }}
 {% }); }  }); } %}
 
@@ -25,6 +31,20 @@
 {% r.education.history.forEach( function( edu, idx, ar) { %}
 {{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
 {{ edu.summary }}
-{% if( edu.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %}
+{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
   - {{ course }}
 {% }); } }); } %}
+
+{% if ( r.service && r.service.history ) { %}VOLUNTEER
+{% r.service.history.forEach( function( srv, idx, ar) { %}
+{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }})
+{{ srv.summary }}
+{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
+
+{% if ( r.writing && r.writing.length ) { %}WRITING
+{% r.writing.forEach( function( wri, idx, ar) { %}
+{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
+{{ wri.summary }}
+{% }); } %}
diff --git a/themes/minimist/templates/doc.xml b/themes/minimist/templates/doc.xml
index 815d157..11fe7a2 100644
--- a/themes/minimist/templates/doc.xml
+++ b/themes/minimist/templates/doc.xml
@@ -2,7 +2,7 @@
 <!--
 [[[
 title: Minimist (MS Word)
-description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
+description: An HTML-driven MS Word resume template for FluentCV's "minimist" theme.
 engine: Underscore
 ]]]
 -->
@@ -753,8 +753,8 @@ engine: Underscore
             <w:gridCol w:w="4428"/>
           </w:tblGrid>
 
-          {% r.skills.forEach( function( skill, idx, ar) { %}
-          {% var kwords = skill.summary; %}
+          {% r.skills.sets.forEach( function( set, idx, ar) { %}
+          {% var kwords = set.skills.join(', '); %}
 
           <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
             <w:tc>
@@ -764,7 +764,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ skill.name|xml }}:</w:t>
+                  <w:t>{{ set.name|xml }}:</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -1012,7 +1012,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00023F41">
                 <w:r>
-                  <w:t>{% print( edu.summary || '' ) %}</w:t>
+                  <w:t>TODO</w:t>
                 </w:r>
               </w:p>
               {% edu.curriculum.forEach( function( course, idx, ar) { %}
diff --git a/themes/minimist/templates/html.html b/themes/minimist/templates/html.html
index 9522feb..4fb618d 100644
--- a/themes/minimist/templates/html.html
+++ b/themes/minimist/templates/html.html
@@ -1,13 +1,29 @@
 <!DOCTYPE html>
+<!-- [[[
+title: Modern (HTML)
+description: An HTML resume template for FluentCV's "minimist" theme.
+engine: Underscore
+]]] -->
 <html>
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
-    <link href="resume.css" rel="stylesheet" type="text/css">
+    <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 { %}
+    <style>
+    {{ cssInfo.data }}
+    </style>
+    {% } %}
   </head>
   <body>
-    <main>
+    <main id="main">
+      <div id="container">
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
@@ -17,52 +33,69 @@
         </div>
       </header>
 
-
 {% if ( r.info.brief && r.info.brief.length ) { %}
+      <hr>
       <section id="summary">
+        <h3>About</h3>
+        <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief|md }}
       </section>
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
+      <hr>
       <section id="skills">
         <header>
-        <h2>Skills</h2><hr>
+        <h3>Skills</h3>
         </header>
-        <table>
-          <thead>
-            <tr>
-              <th>Skill</th>
-              <th>Keywords</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% r.skills.forEach( function( skill, idx, ar) { %}
-            <tr>
-              <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{{ skill.level }}</td>
-            </tr>
-            {% }); %}
-          </tbody>
-        </table>
+        <span class="fa fa-lg fa-code"></span>
+
+        <ul class="list-unstyled">
+          {% r.skills.sets.forEach( function(set) { %}
+            <li class="card card-nested card-skills">
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
+              </div>
+              <div class="skill-info">
+                <strong>{{ set.name }}</strong>
+                <div class="space-top labels">
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
+                      <span class="label label-keyword">{{ kw }}</span>
+                    {% }); %}
+                  {% } %}
+                </div>
+              </div>
+            </li>
+          {% }); %}
+        </ul>
+
+
       </section>
 {% } %}
 
 
 
-{% if ( r.employment && r.employment.history && r.employment.history.length ) { %}
+{% if ( r.employment.history && r.employment.history.length ) { %}
+      <hr>
       <section id="employment">
         <header>
-        <h2>Employment</h2><hr>
+        <h3>Employment</h3>
         </header>
+        <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          <h3>{{ proj.employer }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-          {% if( proj.summary && proj.summary.length ) { %}<p style="clear: both;">{{ proj.summary|md }}</p>{% } %}
+          {% if( proj.url && proj.url.length ) { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          {% } else { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
+          {% } %}
+          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
+          {{ proj.summary|md }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|md }}</li>
+              <li>{{ high|mdin }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -73,18 +106,85 @@
 
 
 
-{% if ( r.education && r.education.history && r.education.history.length ) { %}
+{% if ( r.education.history && r.education.history.length ) { %}
+      <hr>
       <section id="education">
         <header>
-        <h2>Education</h2><hr>
+        <h3>Education</h3>
         </header>
+        <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}<span></h3>
-          {% if( edu.summary && edu.summary.length ) { %}<p style="clear: both;">{{ edu.summary|md }}</p>{% } %}
-          {% if( edu.curriculum ) { %}
+          <h4>{{ edu.institution }}</h4>
+          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
+          {% if( edu.courses ) { %}
             <ul>
-            {% edu.curriculum.forEach( function( course, idx, ar) { %}
-              <li>{{ course|md }}</li>
+            {% edu.courses.forEach( function( course, idx, ar) { %}
+              <li>{{ course|mdin }}</li>
+            {% }); %}
+            </ul>
+          {% } %}
+        {% }); %}
+
+      </section>
+{% } %}
+
+{% if( r.recognition && r.recognition.length ) { %}
+      <hr>
+      <section id="awards">
+        <header>
+        <h3>Awards</h3>
+        </header>
+        <span class="fa fa-lg fa-trophy"></span>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
+          <span class="tenure">{{ award.date }}</span>
+          {{ award.summary|md }}
+        {% }); %}
+      </section>
+{% } %}
+
+{% if( r.writing && r.writing.length ) { %}
+      <hr>
+      <section id="publications">
+        <header>
+        <h3>Publications</h3>
+        </header>
+        <span class="fa fa-lg fa-trophy"></span>
+        {% r.writing.forEach( function( pub, idx, ar) { %}
+          <h4>
+            {% if( pub.url ) { %}
+              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
+            {% } else { %}
+              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
+            {% } %}
+          </h4>
+        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
+
+
+
+        {% }); %}
+      </section>
+{% } %}
+
+{% if ( r.service.history && r.service.history.length ) { %}
+      <hr>
+      <section id="volunteer">
+        <header>
+        <h3>Volunteer Work</h3>
+        </header>
+        <span class="fa fa-lg fa-child"></span>
+        {% r.service.history.forEach( function( vol, idx, ar) { %}
+          {% if( vol.url && vol.url.length ) { %}
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          {% } else { %}
+          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
+          {% } %}
+          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
+          {{ vol.summary|md }}
+          {% if( vol.highlights ) { %}
+            <ul>
+            {% vol.highlights.forEach( function( high, idx, ar) { %}
+              <li>{{ high|mdin }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -94,6 +194,7 @@
 {% } %}
 
 
+      </div>
     </main>
   </body>
 </html>
diff --git a/themes/minimist/templates/md.txt b/themes/minimist/templates/md.txt
index c31024a..20cd2d0 100644
--- a/themes/minimist/templates/md.txt
+++ b/themes/minimist/templates/md.txt
@@ -1,6 +1,6 @@
 {#
 
-  modern/md.txt
+  minimist/md.txt
   A Markdown resume template for FluentCV's "minimist" theme.
 
 #}
@@ -12,10 +12,10 @@
 
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
 ## Skills
-{% r.skills.forEach( function( skill, idx, ar) { %}
-- **{{ skill.name }}**: {{ skill.level }}
+{% r.skills.sets.forEach( function( set, idx, ar) { %}
+- **{{ set.name }}**: {{ set.level }}
 {% }); } %}
 
 {% if ( r.employment.history && r.employment.history.length ) { %}
@@ -36,9 +36,9 @@
 - {{ course }}
 {% }); } }); } %}
 
-{% if ( r.publications && r.publications.length ) { %}
+{% if ( r.writing && r.writing.length ) { %}
 ## Publications
-{% r.publications.forEach( function( pub, idx, ar) { %}
+{% r.writing.forEach( function( pub, idx, ar) { %}
 ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
 {{ pub.publisher }}
 {{ pub.summary }}
@@ -51,9 +51,9 @@
 {{ vol.summary }}
 {% }); } %}
 
-{% if ( r.awards && r.awards.length ) { %}
-## Awards
-{% r.awards.forEach( function( awd, idx, ar) { %}
-### *{{ awd.title }}*, {{ awd.awarder }} ({{ awd.safeDate.format('MMM YYYY') }})
+{% 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/templates/pdf.html b/themes/minimist/templates/pdf.html
index 4887df4..bc3b90f 100644
--- a/themes/minimist/templates/pdf.html
+++ b/themes/minimist/templates/pdf.html
@@ -1,15 +1,25 @@
 <!DOCTYPE html>
+<!-- [[[
+title: Modern (PDF)
+description: An HTML-driven PDF resume template for FluentCV's "minimist" theme.
+engine: Underscore
+]]] -->
 <html>
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <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 }}
     <style>
     {{ cssInfo.data }}
     </style>
   </head>
   <body>
-    <main>
+    <main id="main">
+      <div id="container">
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
@@ -19,52 +29,69 @@
         </div>
       </header>
 
-
 {% if ( r.info.brief && r.info.brief.length ) { %}
+      <hr>
       <section id="summary">
+        <h3>About</h3>
+        <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief|md }}
       </section>
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
+      <hr>
       <section id="skills">
         <header>
-        <h2>Skills</h2><hr>
+        <h3>Skills</h3>
         </header>
-        <table>
-          <thead>
-            <tr>
-              <th>Skill</th>
-              <th>Keywords</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% r.skills.forEach( function( skill, idx, ar) { %}
-            <tr>
-              <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{{ skill.level }}</td>
-            </tr>
-            {% }); %}
-          </tbody>
-        </table>
+        <span class="fa fa-lg fa-code"></span>
+
+        <ul class="list-unstyled">
+          {% r.skills.sets.forEach( function(set) { %}
+            <li class="card card-nested card-skills">
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
+              </div>
+              <div class="skill-info">
+                <strong>{{ set.name }}</strong>
+                <div class="space-top labels">
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
+                      <span class="label label-keyword">{{ kw }}</span>
+                    {% }); %}
+                  {% } %}
+                </div>
+              </div>
+            </li>
+          {% }); %}
+        </ul>
+
+
       </section>
 {% } %}
 
 
 
-{% if ( r.employment && r.employment.history && r.employment.history.length ) { %}
+{% if ( r.employment.history && r.employment.history.length ) { %}
+      <hr>
       <section id="employment">
         <header>
-        <h2>Employment</h2><hr>
+        <h3>Employment</h3>
         </header>
+        <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          <h3>{{ proj.employer }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-          {% if( proj.summary && proj.summary.length ) { %}<p style="clear: both;">{{ proj.summary|md }}</p>{% } %}
+          {% if( proj.url && proj.url.length ) { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          {% } else { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
+          {% } %}
+          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
+          {{ proj.summary|md }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|md }}</li>
+              <li>{{ high|mdin }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -75,18 +102,85 @@
 
 
 
-{% if ( r.education && r.education.history && r.education.history.length ) { %}
+{% if ( r.education.history && r.education.history.length ) { %}
+      <hr>
       <section id="education">
         <header>
-        <h2>Education</h2><hr>
+        <h3>Education</h3>
         </header>
+        <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}<span></h3>
-          {% if( edu.summary && edu.summary.length ) { %}<p style="clear: both;">{{ edu.summary|md }}</p>{% } %}
-          {% if( edu.curriculum ) { %}
+          <h4>{{ edu.institution }}</h4>
+          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
+          {% if( edu.courses ) { %}
             <ul>
-            {% edu.curriculum.forEach( function( course, idx, ar) { %}
-              <li>{{ course|md }}</li>
+            {% edu.courses.forEach( function( course, idx, ar) { %}
+              <li>{{ course|mdin }}</li>
+            {% }); %}
+            </ul>
+          {% } %}
+        {% }); %}
+
+      </section>
+{% } %}
+
+{% if( r.recognition && r.recognition.length ) { %}
+      <hr>
+      <section id="awards">
+        <header>
+        <h3>Awards</h3>
+        </header>
+        <span class="fa fa-lg fa-trophy"></span>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
+          <span class="tenure">{{ award.date }}</span>
+          {{ award.summary|md }}
+        {% }); %}
+      </section>
+{% } %}
+
+{% if( r.writing && r.writing.length ) { %}
+      <hr>
+      <section id="publications">
+        <header>
+        <h3>Publications</h3>
+        </header>
+        <span class="fa fa-lg fa-trophy"></span>
+        {% r.writing.forEach( function( pub, idx, ar) { %}
+          <h4>
+            {% if( pub.url ) { %}
+              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
+            {% } else { %}
+              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
+            {% } %}
+          </h4>
+        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
+
+
+
+        {% }); %}
+      </section>
+{% } %}
+
+{% if ( r.service.history && r.service.history.length ) { %}
+      <hr>
+      <section id="volunteer">
+        <header>
+        <h3>Volunteer Work</h3>
+        </header>
+        <span class="fa fa-lg fa-child"></span>
+        {% r.service.history.forEach( function( vol, idx, ar) { %}
+          {% if( vol.url && vol.url.length ) { %}
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          {% } else { %}
+          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
+          {% } %}
+          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
+          {{ vol.summary|md }}
+          {% if( vol.highlights ) { %}
+            <ul>
+            {% vol.highlights.forEach( function( high, idx, ar) { %}
+              <li>{{ high|mdin }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -96,6 +190,7 @@
 {% } %}
 
 
+      </div>
     </main>
   </body>
 </html>
diff --git a/themes/minimist/templates/txt.txt b/themes/minimist/templates/txt.txt
index de721ec..cac2da1 100644
--- a/themes/minimist/templates/txt.txt
+++ b/themes/minimist/templates/txt.txt
@@ -14,16 +14,20 @@
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}SKILLS
-{% r.skills.forEach( function( skill, idx, ar) { %}
-  - {{ skill.name }}: {{ skill.level }}
-{% }); } %}
+{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS
+{% r.skills.sets.forEach( function( set ) { %}
+  - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %}
+  {{ set.level }}
+{% }); %}
+{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %}
 
-{% if ( r.employment.history && r.employment.history.length ) { %}EMPLOYMENT
+{% } %}
+
+{% if ( r.employment && r.employment.history ) { %}EMPLOYMENT
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
 {{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
 {{ proj.summary }}
-{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
   - {{ high }}
 {% }); }  }); } %}
 
@@ -31,6 +35,20 @@
 {% r.education.history.forEach( function( edu, idx, ar) { %}
 {{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
 {{ edu.summary }}
-{% if( edu.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %}
+{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
   - {{ course }}
 {% }); } }); } %}
+
+{% if ( r.service && r.service.history ) { %}VOLUNTEER
+{% r.service.history.forEach( function( srv, idx, ar) { %}
+{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }})
+{{ srv.summary }}
+{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
+
+{% if ( r.writing && r.writing.length ) { %}WRITING
+{% r.writing.forEach( function( wri, idx, ar) { %}
+{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
+{{ wri.summary }}
+{% }); } %}
diff --git a/themes/modern/templates/doc.xml b/themes/modern/templates/doc.xml
index 4cba013..d1d10e9 100644
--- a/themes/modern/templates/doc.xml
+++ b/themes/modern/templates/doc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 [[[
-title: Modern (PDF)
-description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
+title: Modern (MS Word)
+description: An HTML-driven MS Word resume template for FluentCV's "modern" theme.
 engine: Underscore
 ]]]
 -->
@@ -753,8 +753,8 @@ engine: Underscore
             <w:gridCol w:w="4428"/>
           </w:tblGrid>
 
-          {% r.skills.forEach( function( skill, idx, ar) { %}
-          {% var kwords = skill.summary; %}
+          {% r.skills.sets.forEach( function( set, idx, ar) { %}
+          {% var kwords = set.skills.join(', '); %}
 
           <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
             <w:tc>
@@ -764,7 +764,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ skill.name|xml }}:</w:t>
+                  <w:t>{{ set.name|xml }}:</w:t>
                 </w:r>
               </w:p>
             </w:tc>
diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html
index 87d22d3..4c27207 100644
--- a/themes/modern/templates/html.html
+++ b/themes/modern/templates/html.html
@@ -43,7 +43,7 @@ engine: Underscore
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
       <hr>
       <section id="skills">
         <header>
@@ -52,16 +52,16 @@ engine: Underscore
         <span class="fa fa-lg fa-code"></span>
 
         <ul class="list-unstyled">
-          {% r.skills.forEach( function(skill) { %}
+          {% r.skills.sets.forEach( function(set) { %}
             <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                <div class="skill-progress {{ skill.level }}"></div>
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
               </div>
               <div class="skill-info">
-                <strong>{{ skill.name }}</strong>
+                <strong>{{ set.name }}</strong>
                 <div class="space-top labels">
-                  {% if( skill.keywords && skill.keywords.length ) { %}
-                    {% skill.keywords.forEach(function(kw) { %}
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
                       <span class="label label-keyword">{{ kw }}</span>
                     {% }); %}
                   {% } %}
@@ -128,31 +128,31 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <hr>
       <section id="awards">
         <header>
         <h3>Awards</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
           {{ award.summary|md }}
         {% }); %}
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <hr>
       <section id="publications">
         <header>
         <h3>Publications</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
             {% } else { %}
               <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
@@ -193,12 +193,6 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.elevatorPitch ) { %}
-      <hr>
-      <section id='elevator-pitch'>
-        {{ r.elevatorPitch }}
-      </section>
-{% } %}
 
       </div>
     </main>
diff --git a/themes/modern/templates/md.txt b/themes/modern/templates/md.txt
index ab875c4..edd2dd3 100644
--- a/themes/modern/templates/md.txt
+++ b/themes/modern/templates/md.txt
@@ -12,10 +12,10 @@
 
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
 ## Skills
-{% r.skills.forEach( function( skill, idx, ar) { %}
-- **{{ skill.name }}**: {{ skill.level }}
+{% r.skills.sets.forEach( function( set, idx, ar) { %}
+- **{{ set.name }}**: {{ set.level }}
 {% }); } %}
 
 {% if ( r.employment.history && r.employment.history.length ) { %}
@@ -36,9 +36,9 @@
 - {{ course }}
 {% }); } }); } %}
 
-{% if ( r.publications && r.publications.length ) { %}
+{% if ( r.writing && r.writing.length ) { %}
 ## Publications
-{% r.publications.forEach( function( pub, idx, ar) { %}
+{% r.writing.forEach( function( pub, idx, ar) { %}
 ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
 {{ pub.publisher }}
 {{ pub.summary }}
@@ -51,9 +51,9 @@
 {{ vol.summary }}
 {% }); } %}
 
-{% if ( r.awards && r.awards.length ) { %}
-## Awards
-{% r.awards.forEach( function( awd, idx, ar) { %}
-### *{{ awd.title }}*, {{ awd.awarder }} ({{ awd.safeDate.format('MMM YYYY') }})
+{% 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/modern/templates/pdf.html b/themes/modern/templates/pdf.html
index 262fe17..c428a7f 100644
--- a/themes/modern/templates/pdf.html
+++ b/themes/modern/templates/pdf.html
@@ -39,7 +39,7 @@ engine: Underscore
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
       <hr>
       <section id="skills">
         <header>
@@ -48,16 +48,16 @@ engine: Underscore
         <span class="fa fa-lg fa-code"></span>
 
         <ul class="list-unstyled">
-          {% r.skills.forEach( function(skill) { %}
+          {% r.skills.sets.forEach( function(set) { %}
             <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                <div class="skill-progress {{ skill.level }}"></div>
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
               </div>
               <div class="skill-info">
-                <strong>{{ skill.name }}</strong>
+                <strong>{{ set.name }}</strong>
                 <div class="space-top labels">
-                  {% if( skill.keywords && skill.keywords.length ) { %}
-                    {% skill.keywords.forEach(function(kw) { %}
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
                       <span class="label label-keyword">{{ kw }}</span>
                     {% }); %}
                   {% } %}
@@ -124,31 +124,31 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <hr>
       <section id="awards">
         <header>
         <h3>Awards</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
           {{ award.summary|md }}
         {% }); %}
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <hr>
       <section id="publications">
         <header>
         <h3>Publications</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
             {% } else { %}
               <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
@@ -189,12 +189,6 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.elevatorPitch ) { %}
-      <hr>
-      <section id='elevator-pitch'>
-        {{ r.elevatorPitch }}
-      </section>
-{% } %}
 
       </div>
     </main>
diff --git a/themes/modern/templates/txt.txt b/themes/modern/templates/txt.txt
index ec4eb1a..572e439 100644
--- a/themes/modern/templates/txt.txt
+++ b/themes/modern/templates/txt.txt
@@ -14,16 +14,20 @@
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}SKILLS
-{% r.skills.forEach( function( skill, idx, ar) { %}
-  - {{ skill.name }}: {{ skill.level }}
-{% }); } %}
+{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS
+{% r.skills.sets.forEach( function( set ) { %}
+  - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %}
+  {{ set.level }}
+{% }); %}
+{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %}
 
-{% if ( r.employment.history && r.employment.history.length ) { %}EMPLOYMENT
+{% } %}
+
+{% if ( r.employment && r.employment.history ) { %}EMPLOYMENT
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
 {{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
 {{ proj.summary }}
-{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
   - {{ high }}
 {% }); }  }); } %}
 
@@ -31,6 +35,20 @@
 {% r.education.history.forEach( function( edu, idx, ar) { %}
 {{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
 {{ edu.summary }}
-{% if( edu.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %}
+{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
   - {{ course }}
 {% }); } }); } %}
+
+{% if ( r.service && r.service.history ) { %}VOLUNTEER
+{% r.service.history.forEach( function( srv, idx, ar) { %}
+{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }})
+{{ srv.summary }}
+{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
+
+{% if ( r.writing && r.writing.length ) { %}WRITING
+{% r.writing.forEach( function( wri, idx, ar) { %}
+{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
+{{ wri.summary }}
+{% }); } %}