diff --git a/themes/minimist/templates/doc.xml b/themes/minimist/templates/doc.xml
index 9362fa1..4dd28b1 100644
--- a/themes/minimist/templates/doc.xml
+++ b/themes/minimist/templates/doc.xml
@@ -3,8 +3,8 @@
 <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"/>
   <o:DocumentProperties>
-    <o:Author>{{ r.basics.name|xml }}</o:Author>
-    <o:LastAuthor>{{ r.basics.name|xml }}</o:LastAuthor>
+    <o:Author>{{ r.name|xml }}</o:Author>
+    <o:LastAuthor>{{ r.name|xml }}</o:LastAuthor>
     <o:Revision>4</o:Revision>
     <o:TotalTime>14</o:TotalTime>
     <o:Created>2015-08-28T04:22:00Z</o:Created>
@@ -643,7 +643,7 @@
                         <w:sz-cs w:val="16"/>
                       </w:rPr>
                     </w:pPr>
-                    <w:hlink w:dest="mailto:{{ r.basics.email }}">
+                    <w:hlink w:dest="mailto:{{ r.contact.email }}">
                       <w:r wsp:rsidRPr="00D76150">
                         <w:rPr>
                           <w:rStyle w:val="Hyperlink"/>
@@ -651,7 +651,7 @@
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.basics.email|xml }}</w:t>
+                        <w:t>{{ r.contact.email|xml }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -664,7 +664,7 @@
                         <w:sz-cs w:val="16"/>
                       </w:rPr>
                     </w:pPr>
-                    <w:hlink w:dest="{{ r.basics.website }}">
+                    <w:hlink w:dest="{{ r.contact.website }}">
                       <w:r wsp:rsidRPr="00D76150">
                         <w:rPr>
                           <w:rStyle w:val="Hyperlink"/>
@@ -672,7 +672,7 @@
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.basics.website|xml }}</w:t>
+                        <w:t>{{ r.contact.website|xml }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -691,7 +691,7 @@
                         <w:sz-cs w:val="16"/>
                         <w:u w:val="none"/>
                       </w:rPr>
-                      <w:t>{{ r.basics.phone|xml }}</w:t>
+                      <w:t>{{ r.contact.phone|xml }}</w:t>
                     </w:r>
                   </w:p>
                 </w:txbxContent>
@@ -701,7 +701,7 @@
           </w:pict>
         </w:r>
         <w:r wsp:rsidRPr="00C61794">
-          <w:t>{{ r.basics.name|xml }}</w:t>
+          <w:t>{{ r.name|xml }}</w:t>
         </w:r>
       </w:p>
       <w:p wsp:rsidR="00657B14" wsp:rsidRPr="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00657B14">
@@ -714,7 +714,7 @@
           <w:rPr>
             <w:rStyle w:val="IntenseEmphasis"/>
           </w:rPr>
-          <w:t>{{ r.basics.summary|xml }}</w:t>
+          <w:t>{{ r.summary|xml }}</w:t>
         </w:r>
       </w:p>
       <wx:sub-section>
@@ -747,7 +747,6 @@
           </w:tblGrid>
 
           {% r.skills.forEach( function( skill, idx, ar) { %}
-          {% var kwords = skill.keywords.join(', '); %}
 
           <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
             <w:tc>
@@ -768,7 +767,7 @@
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ kwords|xml }}</w:t>
+                  <w:t>{{ skill.level|xml }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -805,7 +804,7 @@
             <w:gridCol w:w="4428"/>
             <w:gridCol w:w="4428"/>
           </w:tblGrid>
-          {% r.work.forEach( function( proj, idx, ar) { %}
+          {% r.employment.history.forEach( function( proj, idx, ar) { %}
           <w:tr wsp:rsidR="00C61794" wsp:rsidTr="00C61794">
             <w:tc>
               <w:tcPr>
@@ -823,7 +822,7 @@
                   <w:pStyle w:val="Heading2"/>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ proj.company|xml }}</w:t>
+                  <w:t>{{ proj.employer|xml }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -860,7 +859,7 @@
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ proj.startDate|xml }} — {{ proj.endDate|xml }}</w:t>
+                  <w:t>{{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -930,7 +929,7 @@
             <w:gridCol w:w="4428"/>
             <w:gridCol w:w="4428"/>
           </w:tblGrid>
-          {% r.education.forEach( function( edu, idx, ar) { %}
+          {% r.education.history.forEach( function( edu, idx, ar) { %}
           <w:tr wsp:rsidR="00C61794" wsp:rsidTr="00C61794">
             <w:tc>
               <w:tcPr>
@@ -985,7 +984,7 @@
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ edu.startDate|xml }} — {{ edu.endDate|xml }}</w:t>
+                  <w:t>{{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -1005,10 +1004,10 @@
               </w:tcPr>
               <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00023F41">
                 <w:r>
-                  <w:t>{{ edu.area|xml }}</w:t>
+                  <w:t>{% print(edu.summary || '') %}</w:t>
                 </w:r>
               </w:p>
-              {% edu.courses.forEach( function( course, idx, ar) { %}
+              {% edu.curriculum.forEach( function( course, idx, ar) { %}
               <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00C61794">
                 <w:pPr>
                   <w:listPr>
diff --git a/themes/minimist/templates/html.html b/themes/minimist/templates/html.html
index 1009f91..6debf76 100644
--- a/themes/minimist/templates/html.html
+++ b/themes/minimist/templates/html.html
@@ -2,25 +2,25 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ r.basics.name }}</title>
+    <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">
   </head>
   <body>
     <main>
       <header>
-        <h1>{{ r.basics.name }}</h1>
+        <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.basics.email) { %}<div class="email">{{ r.basics.email }}</div>{% } %}
-          {% if (r.basics.phone) { %}<div class="phone">{{ r.basics.phone }}</div>{% } %}
-          {% if (r.basics.website) { %}<div class="website"><a href="{{ r.basics.website }}">{{ r.basics.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
 
-{% if ( r.basics.summary && r.basics.summary.length ) { %}
+{% if ( r.summary && r.summary.length ) { %}
       <section id="summary">
-        {{ r.basics.summary|md }}
+        {{ r.summary|md }}
       </section>
 {% } %}
 
@@ -41,7 +41,7 @@
             {% r.skills.forEach( function( skill, idx, ar) { %}
             <tr>
               <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
+              <td class="keywords">{{ skill.level }}</td>
             </tr>
             {% }); %}
           </tbody>
@@ -51,14 +51,14 @@
 
 
 
-{% if ( r.work && r.work.length ) { %}
+{% if ( r.employment && r.employment.history && r.employment.history.length ) { %}
       <section id="employment">
         <header>
         <h2>Employment</h2><hr>
         </header>
-        {% r.work.forEach( function( proj, idx, ar) { %}
-          <h3>{{ proj.company }} <span class="tenure">{{ proj.startDate }}&mdash;{{ proj.endDate }}<span></h3>
-          <p style="clear: both;">{{ proj.summary|md }}</p>
+        {% 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.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
@@ -73,17 +73,17 @@
 
 
 
-{% if ( r.education && r.education.length ) { %}
+{% if ( r.education && r.education.history && r.education.history.length ) { %}
       <section id="education">
         <header>
         <h2>Education</h2><hr>
         </header>
-        {% r.education.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.startDate }}&mdash;{{ edu.endDate }}<span></h3>
-          <p style="clear: both;">{{ edu.area|md }}</p>
-          {% if( edu.courses ) { %}
+        {% 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 ) { %}
             <ul>
-            {% edu.courses.forEach( function( course, idx, ar) { %}
+            {% edu.curriculum.forEach( function( course, idx, ar) { %}
               <li>{{ course|md }}</li>
             {% }); %}
             </ul>
diff --git a/themes/minimist/templates/md.txt b/themes/minimist/templates/md.txt
index 66c89f1..8400a4d 100644
--- a/themes/minimist/templates/md.txt
+++ b/themes/minimist/templates/md.txt
@@ -4,50 +4,50 @@
   A Markdown resume template for FluentCV's "minimist" theme.
 
 #}
-# {{ r.basics.name }}
+# {{ r.name }}
 
-{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %}
-{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %}
-{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %}
+{% 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %}
+{% if ( r.summary && r.summary.length ) { %}{{ r.summary }}{% } %}
 
 {% if ( r.skills && r.skills.length ) { %}
 ## Skills
 {% r.skills.forEach( function( skill, idx, ar) { %}
-- **{{ skill.name }}**: {% print( skill.keywords.join(', ') ); %}
+- **{{ skill.name }}**: {{ skill.level }}
 {% }); } %}
 
-{% if ( r.work && r.work.length ) { %}
+{% if ( r.employment.history && r.employment.history.length ) { %}
 ## Employment
-{% r.work.forEach( function( proj, idx, ar) { %}
-### *{{ proj.position }}*, {{ proj.company }} ({{ proj.safeStartDate.format('MMM YYYY') }} — {{ proj.safeEndDate.format('MMM YYYY') }})
+{% 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.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
 - {{ high }}
 {% }); }  }); } %}
 
-{% if ( r.education && r.education.length ) { %}
+{% if ( r.education.history && r.education.history.length ) { %}
 ## Education
-{% r.education.forEach( function( edu, idx, ar) { %}
-### {{ edu.institution }} ({{ edu.safeStartDate.format('MMM YYYY') }} — {{ edu.safeEndDate.format('MMM YYYY') }})
+{% 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.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %}
+{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %}
 - {{ course }}
 {% }); } }); } %}
 
 {% if ( r.publications && r.publications.length ) { %}
 ## Publications
 {% r.publications.forEach( function( pub, idx, ar) { %}
-### {{ pub.name }} ({{ pub.safeReleaseDate.format('MMM YYYY') }})
+### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
 {{ pub.publisher }}
 {{ pub.summary }}
 {% }); } %}
 
-{% if ( r.volunteer && r.volunteer.length ) { %}
+{% if ( r.service.history && r.service.history.length ) { %}
 ## Volunteer
-{% r.volunteer.forEach( function( vol, idx, ar) { %}
-### {{ vol.organization }} ({{ vol.safeStartDate.format('MMM YYYY') }} — {{ vol.safeEndDate.format('MMM YYYY') }})
+{% r.service.history.forEach( function( vol, idx, ar) { %}
+### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }})
 {{ vol.summary }}
 {% }); } %}
 
diff --git a/themes/minimist/templates/pdf.html b/themes/minimist/templates/pdf.html
index 4168d94..584ff80 100644
--- a/themes/minimist/templates/pdf.html
+++ b/themes/minimist/templates/pdf.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ r.basics.name }}</title>
+    <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'>
     <style>
     {{ cssInfo.data }}
@@ -11,18 +11,18 @@
   <body>
     <main>
       <header>
-        <h1>{{ r.basics.name }}</h1>
+        <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.basics.email) { %}<div class="email">{{ r.basics.email }}</div>{% } %}
-          {% if (r.basics.phone) { %}<div class="phone">{{ r.basics.phone }}</div>{% } %}
-          {% if (r.basics.website) { %}<div class="website"><a href="{{ r.basics.website }}">{{ r.basics.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
 
-{% if ( r.basics.summary && r.basics.summary.length ) { %}
+{% if ( r.summary && r.summary.length ) { %}
       <section id="summary">
-        {{ r.basics.summary|md }}
+        {{ r.summary|md }}
       </section>
 {% } %}
 
@@ -43,7 +43,7 @@
             {% r.skills.forEach( function( skill, idx, ar) { %}
             <tr>
               <td style="width: 25%;">{{ skill.name }}</td>
-              <td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
+              <td class="keywords">{{ skill.level }}</td>
             </tr>
             {% }); %}
           </tbody>
@@ -53,14 +53,14 @@
 
 
 
-{% if ( r.work && r.work.length ) { %}
+{% if ( r.employment && r.employment.history && r.employment.history.length ) { %}
       <section id="employment">
         <header>
         <h2>Employment</h2><hr>
         </header>
-        {% r.work.forEach( function( proj, idx, ar) { %}
-          <h3>{{ proj.company }} <span class="tenure">{{ proj.startDate }}&mdash;{{ proj.endDate }}<span></h3>
-          <p style="clear: both;">{{ proj.summary|md }}</p>
+        {% 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.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
@@ -75,17 +75,17 @@
 
 
 
-{% if ( r.education && r.education.length ) { %}
+{% if ( r.education && r.education.history && r.education.history.length ) { %}
       <section id="education">
         <header>
         <h2>Education</h2><hr>
         </header>
-        {% r.education.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.startDate }}&mdash;{{ edu.endDate }}<span></h3>
-          <p style="clear: both;">{{ edu.area|md }}</p>
-          {% if( edu.courses ) { %}
+        {% 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 ) { %}
             <ul>
-            {% edu.courses.forEach( function( course, idx, ar) { %}
+            {% edu.curriculum.forEach( function( course, idx, ar) { %}
               <li>{{ course|md }}</li>
             {% }); %}
             </ul>
diff --git a/themes/minimist/templates/txt.txt b/themes/minimist/templates/txt.txt
index 922562f..5413c11 100644
--- a/themes/minimist/templates/txt.txt
+++ b/themes/minimist/templates/txt.txt
@@ -1,30 +1,30 @@
-{{ r.basics.name }}
-{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %}
-{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %}
-{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %}
+{{ 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %}
+{% if ( r.summary && r.summary.length ) { %}{{ r.summary }}{% } %}
 
 
 {% if ( r.skills && r.skills.length ) { %}SKILLS
 {% r.skills.forEach( function( skill, idx, ar) { %}
-  - {{ skill.name }}: {% print( skill.keywords.join(', ') ); %}
+  - {{ skill.name }}: {{ skill.level }}
 {% }); } %}
 
-{% if ( r.work && r.work.length ) { %}EMPLOYMENT
-{% r.work.forEach( function( proj, idx, ar) { %}
-{{ proj.company }} ({{ proj.startDate }} — {{ proj.endDate }})
+{% if ( r.employment.history && r.employment.history.length ) { %}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) { %}
   - {{ high }}
 {% }); }  }); } %}
 
-{% if ( r.education && r.education.length ) { %}EDUCATION
-{% r.education.forEach( function( edu, idx, ar) { %}
-{{ edu.institution }} ({{ edu.startDate }} — {{ edu.endDate }})
-{{ edu.area }}
+{% if ( r.education && r.education.history ) { %}EDUCATION
+{% 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) { %}
   - {{ course }}
 {% }); } }); } %}