diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
index 7743069..933ef29 100644
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@@ -12,21 +12,21 @@
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ RAW.contact.email }}</a></div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
         </div>
       </header>
 
 
-{% if ( r.info.brief && r.info.brief.length ) { %}
+{{#if r.info.brief}}
       <section id="summary">
         {{ r.info.brief }}
       </section>
-{% } %}
+{{/if}}
 
 
-{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
+{{#if r.skills}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2><hr>
@@ -39,121 +39,124 @@
             </tr>
           </thead>
           <tbody>
-            {% r.skills.sets.forEach( function( skillset ) { %}
+            {{#each r.skills.sets}}
             <tr>
-              <td style="width: 25%;">{{ skillset.name }}</td>
-              <td class="keywords">{{ skillset.skills.join(', ') }}</td>
+              <td style="width: 25%;">{{ name }}</td>
+              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
             </tr>
-            {% }); %}
+            {{/each}}
           </tbody>
         </table>
       </section>
-{% } %}
+{{/if}}
 
 
 
-{% if ( r.employment && r.employment.history ) { %}
+{{#if r.employment}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
         </header>
 
-
-
-        {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          {% if( idx < 4 ) { %}
-            <h3><em>{{ proj.position }}</em>, {{ filt.link( proj.employer, proj.url ) }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }} &mdash; {{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-            <p style="clear: both;">{{ proj.summary }}</p>
-            {% if( proj.highlights ) { %}
+        {{#each r.employment.history }}
+          {{#compare @index 4 operator="<"}}
+            <h3><em>{{ position }}</em>,
+              {{#if url }}
+              <a href="{{ url }}">{{ employer }}</a>
+              {{else}}
+              {{ employer }}
+              {{/if}}
+              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+            <p style="clear: both;">{{ summary }}</p>
+            {{#if highlights}}
               <ul>
-              {% proj.highlights.forEach( function( high, idx, ar) { %}
-                <li>{{ high }}</li>
-              {% }); %}
+              {{#each highlights}}
+                <li>{{ this }}</li>
+              {{/each}}
               </ul>
-            {% } %}
-          {% } else { %}
+            {{/if}}
+          {{/compare}}
+          {{#compare @index 4 operator=">="}}
 
-            {% if( idx === 4 ) { %}
-            <h3>Previously... <span class="tenure">{{ r.employment.history[ r.employment.history.length - 1 ].safe.start.format('YYYY') }} &mdash; {{ proj.safe.end.format('YYYY') }}<span></h3>
-            <p style="clear: both;">Prior to {{ r.employment.history[ 3 ].employer }}, I worked on a range of projects for companies large and small.</p>
+            {{#compare @index 4 operator="=="}}
+            <h3>Previously...</h3>
+            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
             <ul>
-            {% } %}
+            {{/compare}}
 
+            <li>{{ position }}, {{ employer }}</li>
 
-            <li>{{ proj.position }}, {{ proj.employer }}</li>
-
-
-            {% if( idx === ar.length - 1 ) { %}
+            {{#if @last}}
             </ul>
-            {% } %}
-
-          {% } %}
-        {% }); %}
-
-
+            {{/if}}
+          {{/compare}}
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-
-
-{% if ( r.education && r.education.history ) { %}
+{{# if r.education}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
         </header>
-        {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.safe.start.format('YYYY') }} &mdash; {{ edu.safe.end.format('YYYY') }}<span></h3>
-        {% }); %}
+        {{#each r.education.history}}
+          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-{% if ( r.service && r.service.history && r.service.history.length ) { %}
+{{#if r.service}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
         </header>
-        {% r.service.history.forEach( function( vol, idx, ar ) { %}
-          <h3><em>{{ vol.position }}</em>, {{ filt.link(vol.organization, vol.url) }} <span class="tenure">{{ vol.safe.start.format('YYYY') }} &mdash; {{ vol.safe.end.format('YYYY') }}<span></h3>
-          <p style="clear: both;">{{ vol.summary }}</p>
-          {% if( vol.highlights ) { %}
+        {{#each r.service.history}}
+          <h3><em>{{ position }}</em>,
+            {{#if url}}
+            <a href="{{ url }}">{{ organization }}</a>
+            {{else}}
+            {{ organization }}
+            {{/if}}
+            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <p style="clear: both;">{{ summary }}</p>
+          {{#if highlights}}
             <ul>
-            {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
+            {{#each highlights}}
+              <li>{{ this }}</li>
+            {{/each}}
             </ul>
-          {% } %}
-        {% }); %}
+          {{/if}}
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-{% if( r.writing && r.writing.length ) { %}
+{{#if r.writing}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> Writing</h2><hr>
         </header>
-        {% r.writing.forEach( function( pub, idx, ar ) { %}
-          <h3><em>{{ filt.link( pub.title, pub.url ) }}</em>, {{ pub.publisher }} <span class="tenure">{{ pub.safe.date.format('YYYY') }}</span></h3>
-
-        {% if (pub.summary) { %}{{ pub.summary }}{% } %}
-
-        {% }); %}
+        {{#each r.writing }}
+          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+        {{# if summary}}{{ summary }}{{/if}}
+        {{/each}}
       </section>
-{% } %}
+{{/if}}
 
-{% if( r.recognition && r.recognition.length ) { %}
+{{# if r.recognition}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
         </header>
-        {% 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 }}
-        {% }); %}
+        {{#each r.recognition}}
+          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+          {{ summary }}
+        {{/each}}
       </section>
-{% } %}
+{{/if}}
 
     </main>
   </body>
diff --git a/themes/compact/src/compact-md.txt b/themes/compact/src/compact-md.txt
index c22301b..6c5bba0 100644
--- a/themes/compact/src/compact-md.txt
+++ b/themes/compact/src/compact-md.txt
@@ -1,54 +1,84 @@
-# {{ r.name }}
+{{ r.name }}
+============
+{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
 
-{% 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 }}}{{/if}}
 
-{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
+{{#if r.skills}}
+## SKILLS
 
-{% if ( r.skills && r.skills.sets ) { %}
-## Skills
-{% r.skills.sets.forEach( function( set, idx, ar) { %}
-- **{{ set.name }}**: {{ set.skills.join(', ') }}
-{% }); } %}
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/if}}
 
-{% 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.employment}}
+## EMPLOYMENT
 
-{% 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 }}
-{% }); } }); } %}
+{{#each r.employment.history }}
+  {{#compare @index 4 operator="<"}}
+### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
 
-{% 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 }}
-{% }); } %}
+  {{/compare}}
+  {{#compare @index 4 operator=">="}}
+    {{#compare @index 4 operator="=="}}
+### Previously...
+Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
+    {{/compare}}
+  - {{{ position }}}, {{{ employer }}}
+  {{/compare}}
+{{/each}}
+{{/if}}
 
-{% 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.education}}
+## EDUCATION
 
-{% 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 }}
-{% }); } %}
+{{#each r.education.history}}
+### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/if}}
+{{#if r.writing}}
+## WRITING
+
+{{#each r.writing}}
+### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
+
+{{#if r.service }}
+## SERVICE
+
+{{#each r.service.history}}
+### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/if}}
+{{#if r.recognition}}
+## RECOGNITION
+
+{{#each r.recognition}}
+### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html
index 44a2c21..cf0c941 100644
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@@ -13,21 +13,21 @@
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email"><a href="mailto:{{ r.contact.email }}">{{ r.contact.email }}</a></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>{% } %}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
         </div>
       </header>
 
 
-{% if ( r.info.brief && r.info.brief.length ) { %}
+{{#if r.info.brief}}
       <section id="summary">
         {{ r.info.brief }}
       </section>
-{% } %}
+{{/if}}
 
 
-{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
+{{#if r.skills}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2><hr>
@@ -40,121 +40,124 @@
             </tr>
           </thead>
           <tbody>
-            {% r.skills.sets.forEach( function( skillset ) { %}
+            {{#each r.skills.sets}}
             <tr>
-              <td style="width: 25%;">{{ skillset.name }}</td>
-              <td class="keywords">{{ skillset.skills.join(', ') }}</td>
+              <td style="width: 25%;">{{ name }}</td>
+              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
             </tr>
-            {% }); %}
+            {{/each}}
           </tbody>
         </table>
       </section>
-{% } %}
+{{/if}}
 
 
 
-{% if ( r.employment && r.employment.history ) { %}
+{{#if r.employment}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
         </header>
 
-
-
-        {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          {% if( idx < 4 ) { %}
-            <h3><em>{{ proj.position }}</em>, {{ filt.link( proj.employer, proj.url ) }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }} &mdash; {{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-            <p style="clear: both;">{{ proj.summary }}</p>
-            {% if( proj.highlights ) { %}
+        {{#each r.employment.history }}
+          {{#compare @index 4 operator="<"}}
+            <h3><em>{{ position }}</em>,
+              {{#if url }}
+              <a href="{{ url }}">{{ employer }}</a>
+              {{else}}
+              {{ employer }}
+              {{/if}}
+              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+            <p style="clear: both;">{{ summary }}</p>
+            {{#if highlights}}
               <ul>
-              {% proj.highlights.forEach( function( high, idx, ar) { %}
-                <li>{{ high }}</li>
-              {% }); %}
+              {{#each highlights}}
+                <li>{{ this }}</li>
+              {{/each}}
               </ul>
-            {% } %}
-          {% } else { %}
+            {{/if}}
+          {{/compare}}
+          {{#compare @index 4 operator=">="}}
 
-            {% if( idx === 4 ) { %}
-            <h3>Previously... <span class="tenure">{{ r.employment.history[ r.employment.history.length - 1 ].safe.start.format('YYYY') }} &mdash; {{ proj.safe.end.format('YYYY') }}<span></h3>
-            <p style="clear: both;">Prior to {{ r.employment.history[ 3 ].employer }}, I worked on a range of projects for companies large and small.</p>
+            {{#compare @index 4 operator="=="}}
+            <h3>Previously...</h3>
+            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
             <ul>
-            {% } %}
+            {{/compare}}
 
+            <li>{{ position }}, {{ employer }}</li>
 
-            <li>{{ proj.position }}, {{ proj.employer }}</li>
-
-
-            {% if( idx === ar.length - 1 ) { %}
+            {{#if @last}}
             </ul>
-            {% } %}
-
-          {% } %}
-        {% }); %}
-
-
+            {{/if}}
+          {{/compare}}
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-
-
-{% if ( r.education && r.education.history ) { %}
+{{# if r.education}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
         </header>
-        {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h3>{{ edu.institution }} <span class="tenure">{{ edu.safe.start.format('YYYY') }} &mdash; {{ edu.safe.end.format('YYYY') }}<span></h3>
-        {% }); %}
+        {{#each r.education.history}}
+          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-{% if ( r.service && r.service.history && r.service.history.length ) { %}
+{{#if r.service}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
         </header>
-        {% r.service.history.forEach( function( vol, idx, ar ) { %}
-          <h3><em>{{ vol.position }}</em>, {{ filt.link(vol.organization, vol.url) }} <span class="tenure">{{ vol.safe.start.format('YYYY') }} &mdash; {{ vol.safe.end.format('YYYY') }}<span></h3>
-          <p style="clear: both;">{{ vol.summary }}</p>
-          {% if( vol.highlights ) { %}
+        {{#each r.service.history}}
+          <h3><em>{{ position }}</em>,
+            {{#if url}}
+            <a href="{{ url }}">{{ organization }}</a>
+            {{else}}
+            {{ organization }}
+            {{/if}}
+            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <p style="clear: both;">{{ summary }}</p>
+          {{#if highlights}}
             <ul>
-            {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
+            {{#each highlights}}
+              <li>{{ this }}</li>
+            {{/each}}
             </ul>
-          {% } %}
-        {% }); %}
+          {{/if}}
+        {{/each}}
 
       </section>
-{% } %}
+{{/if}}
 
-{% if( r.writing && r.writing.length ) { %}
+{{#if r.writing}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> Writing</h2><hr>
         </header>
-        {% r.writing.forEach( function( pub, idx, ar ) { %}
-          <h3><em>{{ filt.link( pub.title, pub.url ) }}</em>, {{ pub.publisher }} <span class="tenure">{{ pub.safe.date.format('YYYY') }}</span></h3>
-
-        {% if (pub.summary) { %}{{ pub.summary }}{% } %}
-
-        {% }); %}
+        {{#each r.writing }}
+          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+        {{# if summary}}{{ summary }}{{/if}}
+        {{/each}}
       </section>
-{% } %}
+{{/if}}
 
-{% if( r.recognition && r.recognition.length ) { %}
+{{# if r.recognition}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
         </header>
-        {% 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 }}
-        {% }); %}
+        {{#each r.recognition}}
+          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+          {{ summary }}
+        {{/each}}
       </section>
-{% } %}
+{{/if}}
 
     </main>
   </body>
diff --git a/themes/compact/src/compact-txt.txt b/themes/compact/src/compact-txt.txt
index a33c4eb..df3991b 100644
--- a/themes/compact/src/compact-txt.txt
+++ b/themes/compact/src/compact-txt.txt
@@ -1,50 +1,90 @@
-{#
+{{!
 
   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 }}{% } %}
-{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
+{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+================================================================================
 
-***
+{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
 
-{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
+{{#if r.skills}}
+SKILLS -------------------------------------------------------------------------
 
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/if}}
 
-{% if ( r.skills && r.skills.length ) { %}SKILLS
-{% r.skills.forEach( function( skill ) { %}
-  - {{ skill.name }}: {{ skill.level }}
-{% }); } %}
+{{#if r.employment}}
+EMPLOYMENT ---------------------------------------------------------------------
 
-{% 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 ) { %}
-  - {{ high }}
-{% }); }  }); } %}
+{{#each r.employment.history }}
+  {{#compare @index 4 operator="<"}}
+{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
 
-{% 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 ) { %}
-  - {{ course }}
-{% }); } }); } %}
+  {{/compare}}
+  {{#compare @index 4 operator=">="}}
+    {{#compare @index 4 operator="=="}}
+Previously...
+Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
+    {{/compare}}
+  - {{{ position }}}, {{{ employer }}}
+  {{/compare}}
+{{/each}}
+{{/if}}
 
-{% 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.education}}
+EDUCATION ----------------------------------------------------------------------
 
-{% if ( r.writing && r.writing.length ) { %}WRITING
-{% r.writing.forEach( function( wri, idx, ar) { %}
-{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
-{{ wri.summary }}
-{% }); } %}
+{{#each r.education.history}}
+{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/if}}
+{{#if r.writing}}
+WRITING ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
+
+{{#if r.service }}
+SERVICE ------------------------------------------------------------------------
+
+{{#each r.service.history}}
+{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/if}}
+{{#if r.recognition}}
+RECOGNITION --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}