diff --git a/partials/doc/section/affiliation.hbs b/partials/doc/section/affiliation.hbs
index 0ec3b55..0a65830 100644
--- a/partials/doc/section/affiliation.hbs
+++ b/partials/doc/section/affiliation.hbs
@@ -15,7 +15,7 @@
         </w:tabs>
       </w:pPr>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{ role }}, </w:t>
+        <w:t>{{{ role }}}, </w:t>
       </w:r>
       {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
@@ -24,13 +24,16 @@
             <w:rStyle w:val="Hyperlink"/>
           </w:rPr>
           {{/if}}
-          <w:t>{{ organization }}</w:t>
+          <w:t>{{{ organization }}}</w:t>
         </w:r>
       {{#if url}}</w:hlink>{{/if}}
       <w:r wsp:rsidR="00EA0B64">
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/education.hbs b/partials/doc/section/education.hbs
index d7aa635..4f08e10 100644
--- a/partials/doc/section/education.hbs
+++ b/partials/doc/section/education.hbs
@@ -28,6 +28,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/employment.hbs b/partials/doc/section/employment.hbs
index acb6ff6..46054f2 100644
--- a/partials/doc/section/employment.hbs
+++ b/partials/doc/section/employment.hbs
@@ -31,7 +31,10 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <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/governance.hbs b/partials/doc/section/governance.hbs
index 26014c0..483b2ce 100644
--- a/partials/doc/section/governance.hbs
+++ b/partials/doc/section/governance.hbs
@@ -35,6 +35,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{dateRange .}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/projects.hbs b/partials/doc/section/projects.hbs
index 8b2378e..3de44ec 100644
--- a/partials/doc/section/projects.hbs
+++ b/partials/doc/section/projects.hbs
@@ -31,6 +31,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{dateRange .}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/reading.hbs b/partials/doc/section/reading.hbs
index d4bde94..5168832 100644
--- a/partials/doc/section/reading.hbs
+++ b/partials/doc/section/reading.hbs
@@ -9,9 +9,9 @@
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
       <w:pPr>
         <w:pStyle w:val="Heading2"/>
-        <w:tabs>
+        <!-- <w:tabs>
           <w:tab w:val="right" w:pos="9360"/>
-        </w:tabs>
+        </w:tabs> -->
       </w:pPr>
       {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
@@ -23,9 +23,9 @@
           <w:t>{{{ title }}}</w:t>
         </w:r>
       {{#if url}}</w:hlink>{{/if}}
-      <w:r wsp:rsidR="00EA0B64">
+      <!-- <w:r wsp:rsidR="00EA0B64">
         <w:tab/>
-      </w:r>
+      </w:r> -->
       {{#if author}}
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
         <w:t>, {{{ author }}}</w:t>
diff --git a/partials/doc/section/recognition.hbs b/partials/doc/section/recognition.hbs
index ad1fd80..1e4299d 100644
--- a/partials/doc/section/recognition.hbs
+++ b/partials/doc/section/recognition.hbs
@@ -28,6 +28,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/references.hbs b/partials/doc/section/references.hbs
index 9aa9e52..66d81e5 100644
--- a/partials/doc/section/references.hbs
+++ b/partials/doc/section/references.hbs
@@ -31,6 +31,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/service.hbs b/partials/doc/section/service.hbs
index 276915e..455d3df 100644
--- a/partials/doc/section/service.hbs
+++ b/partials/doc/section/service.hbs
@@ -31,7 +31,10 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <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 8181477..00b4930 100644
--- a/partials/doc/section/speaking.hbs
+++ b/partials/doc/section/speaking.hbs
@@ -28,6 +28,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
       </w:r>
     </w:p>
diff --git a/partials/doc/section/writing.hbs b/partials/doc/section/writing.hbs
index b65b10e..5fdcace 100644
--- a/partials/doc/section/writing.hbs
+++ b/partials/doc/section/writing.hbs
@@ -27,6 +27,9 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
         <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
       </w:r>
     </w:p>