diff --git a/partials/doc/section/education.hbs b/partials/doc/section/education.hbs
index 4f08e10..155a135 100644
--- a/partials/doc/section/education.hbs
+++ b/partials/doc/section/education.hbs
@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
+        <w:t>{{dateRange . 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#either area studyType }}
diff --git a/partials/doc/section/recognition.hbs b/partials/doc/section/recognition.hbs
index 1e4299d..abc3a80 100644
--- a/partials/doc/section/recognition.hbs
+++ b/partials/doc/section/recognition.hbs
@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
diff --git a/partials/doc/section/references.hbs b/partials/doc/section/references.hbs
index 66d81e5..c3ad6c1 100644
--- a/partials/doc/section/references.hbs
+++ b/partials/doc/section/references.hbs
@@ -34,7 +34,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
diff --git a/partials/doc/section/speaking.hbs b/partials/doc/section/speaking.hbs
index 00b4930..1e9162d 100644
--- a/partials/doc/section/speaking.hbs
+++ b/partials/doc/section/speaking.hbs
@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
diff --git a/partials/doc/section/writing.hbs b/partials/doc/section/writing.hbs
index 5fdcace..0629b59 100644
--- a/partials/doc/section/writing.hbs
+++ b/partials/doc/section/writing.hbs
@@ -30,7 +30,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
+        <w:t>{{date date 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#if summary}}
diff --git a/partials/html/section/interests.hbs b/partials/html/section/interests.hbs
index fc89378..b100ed5 100644
--- a/partials/html/section/interests.hbs
+++ b/partials/html/section/interests.hbs
@@ -8,7 +8,7 @@
     {{#> body-interests }}
     <div>
     <h3><em>{{{ name }}}</em></h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    <span class="tenure">{{date date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
diff --git a/partials/html/section/reading.hbs b/partials/html/section/reading.hbs
index 143e8c3..a41b710 100644
--- a/partials/html/section/reading.hbs
+++ b/partials/html/section/reading.hbs
@@ -8,7 +8,7 @@
     {{#> body-reading }}
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>{{#if author}}, {{{ author }}}{{/if}}</h3>
-      <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
+      <span class="tenure">{{date date 'YYYY'}}</span>
       {{{ summary }}}
     </div>
     {{/body-reading}}
diff --git a/partials/html/section/recognition.hbs b/partials/html/section/recognition.hbs
index 6430e0c..0556cf2 100644
--- a/partials/html/section/recognition.hbs
+++ b/partials/html/section/recognition.hbs
@@ -8,7 +8,7 @@
     {{#> body-recognition }}
     <div>
     <h3><em>{{ title }}</em>, {{{link from url }}}</h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    <span class="tenure">{{date date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
diff --git a/partials/html/section/samples.hbs b/partials/html/section/samples.hbs
index 9e3c3cb..47a68ab 100644
--- a/partials/html/section/samples.hbs
+++ b/partials/html/section/samples.hbs
@@ -14,7 +14,7 @@
     {{ title }}
     {{/if}}
     </h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span>
+    <span class="tenure">{{date date 'YYYY-MM'}}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
diff --git a/partials/html/section/speaking.hbs b/partials/html/section/speaking.hbs
index ab49ead..cb09640 100644
--- a/partials/html/section/speaking.hbs
+++ b/partials/html/section/speaking.hbs
@@ -8,7 +8,7 @@
     {{#> body-speaking }}
     <div>
     <h3><em>{{{ title }}}</em>, {{{ event }}}</h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    <span class="tenure">{{date date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
diff --git a/partials/html/section/writing.hbs b/partials/html/section/writing.hbs
index 5fc702b..ab09e51 100644
--- a/partials/html/section/writing.hbs
+++ b/partials/html/section/writing.hbs
@@ -9,7 +9,7 @@
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
       {{ publisher.name }}</h3>
-      <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
+      <span class="tenure">{{date date 'YYYY'}}</span>
       {{{ summary }}}
       {{> highlights }}
     </div>
diff --git a/partials/md/section/employment.hbs b/partials/md/section/employment.hbs
index 8e634e6..6ecfd36 100644
--- a/partials/md/section/employment.hbs
+++ b/partials/md/section/employment.hbs
@@ -3,9 +3,9 @@
 
 {{#each r.employment.history }}
 {{#if url}}
-### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{dateRange .}})
 {{else}}
-### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, {{{ employer }}} ({{dateRange .}})
 {{/if}}
 
 {{{ summary }}}
diff --git a/partials/md/section/projects.hbs b/partials/md/section/projects.hbs
index 6274e5f..cfed2a7 100644
--- a/partials/md/section/projects.hbs
+++ b/partials/md/section/projects.hbs
@@ -3,9 +3,9 @@
 
 {{#each r.projects }}
 {{#if url }}
-### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{dateRange .}})
 {{else}}
-### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{camelCase role }}}*, {{{ title }}} ({{dateRange .}})
 {{/if}}
 
 {{{ description }}}
diff --git a/partials/md/section/recognition.hbs b/partials/md/section/recognition.hbs
index 08970d2..08cbb85 100644
--- a/partials/md/section/recognition.hbs
+++ b/partials/md/section/recognition.hbs
@@ -3,7 +3,7 @@
 
 {{#each r.recognition}}
 ### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
-{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
 {{~#if summary}}
 
 {{{ summary }}}{{/if}}
diff --git a/partials/md/section/samples.hbs b/partials/md/section/samples.hbs
index 7069fa9..2e374fa 100644
--- a/partials/md/section/samples.hbs
+++ b/partials/md/section/samples.hbs
@@ -3,9 +3,9 @@
 
 {{#each r.samples }}
 {{#if url}}
-### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
 {{else}}
-### {{{ title }}} ({{formatDate safe.date}})
+### {{{ title }}} ({{date date}})
 {{/if}}
 
 {{{ summary }}}
diff --git a/partials/md/section/speaking.hbs b/partials/md/section/speaking.hbs
index fefac17..e72fd81 100644
--- a/partials/md/section/speaking.hbs
+++ b/partials/md/section/speaking.hbs
@@ -2,7 +2,7 @@
 ## {{{sectionTitle "SPEAKING"}}}
 
 {{#each r.speaking}}
-### *{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})
+### *{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
 
 {{{ summary }}}
 {{#if highlights}}
diff --git a/partials/md/section/writing.hbs b/partials/md/section/writing.hbs
index b1cfb96..4d862a8 100644
--- a/partials/md/section/writing.hbs
+++ b/partials/md/section/writing.hbs
@@ -3,9 +3,9 @@
 
 {{#each r.writing}}
 {{#if url}}
-### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
 {{else}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+### {{{ title }}} ({{date date}})
 {{/if}}
 
 {{{ summary }}}
diff --git a/partials/txt/section/recognition.hbs b/partials/txt/section/recognition.hbs
index b67efd3..7543ce7 100644
--- a/partials/txt/section/recognition.hbs
+++ b/partials/txt/section/recognition.hbs
@@ -3,7 +3,7 @@
 
 {{#each r.recognition}}
 {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
-{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
 {{~#if summary}}
 
 {{{ summary }}}{{/if}}
diff --git a/partials/txt/section/samples.hbs b/partials/txt/section/samples.hbs
index d5822c2..0df6d87 100644
--- a/partials/txt/section/samples.hbs
+++ b/partials/txt/section/samples.hbs
@@ -2,7 +2,7 @@
 {{{sectionTitle "SAMPLES"}}} ------------------------------------------------------------------------
 
 {{#each r.samples }}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM'}})
+{{{ title }}} ({{date date}})
 
 {{{ summary }}}
 {{#if highlights}}
diff --git a/partials/txt/section/skills.hbs b/partials/txt/section/skills.hbs
index 1758b4e..980a547 100644
--- a/partials/txt/section/skills.hbs
+++ b/partials/txt/section/skills.hbs
@@ -2,6 +2,6 @@
 {{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
 
 {{#each r.skills.sets}}
-- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
+- {{{ name }}}: {{#each skills}}{{{ . }}} {{/each}}
 {{/each}}
 {{/section}}
diff --git a/partials/txt/section/speaking.hbs b/partials/txt/section/speaking.hbs
index 9ee3aa0..3b5a560 100644
--- a/partials/txt/section/speaking.hbs
+++ b/partials/txt/section/speaking.hbs
@@ -2,7 +2,7 @@
 ## {{{sectionTitle "SPEAKING"}}} ------------------------------------------------------------------------
 
 {{#each r.speaking}}
-*{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})
+*{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
 
 {{{ summary }}}
 {{#if highlights}}
diff --git a/partials/txt/section/writing.hbs b/partials/txt/section/writing.hbs
index b6420d6..8d76eb3 100644
--- a/partials/txt/section/writing.hbs
+++ b/partials/txt/section/writing.hbs
@@ -2,7 +2,7 @@
 {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
 
 {{#each r.writing}}
-{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{{ title }}}{{#if date}} ({{date date}}){{/if}}
 {{#if summary}}{{{ summary }}}
 {{/if}}