Adjust header-icon.

Continue templatizing styles.
Themes: Compact: Improve coverage and formatting.
2025-07-06 18:21:06 +01:00 · 2016-01-24 04:49:05 -05:00 · 2016-01-23 23:30:10 -05:00 · 2016-01-23 23:22:31 -05:00 · 2016-01-23 23:21:56 -05:00 · 2016-01-23 23:21:26 -05:00
120 changed files with 1680 additions and 3247 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +1,7 @@
 The MIT License
 ===============

-Copyright (c) 2015 Sir Hacksalot (https://github.com/hacksalot)
+Copyright (c) 2016 hacksalot (https://github.com/hacksalot)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -50,8 +50,6 @@ GitHub and NPM.
 - [modern][t-modern]: A middle of the road theme with a modern look 'n feel.
 - [compact][t-compact]: A visually dense/compact theme.
 - [awesome][t-awesome]: A technical resume theme based on [Awesome-CV][awe].
- [underscore][t-underscore]: An unstyled barebones theme.
- [hello-world][t-hello]: A simple-as-possible example theme.
 - New themes weekly.

 All FRESH themes in this repo are MIT licensed. You're free to change, modify,
@ -121,7 +119,7 @@ MIT. See [LICENSE.md][1] for details.
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
 [t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
-[t-underscore]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/minimist
+[t-underscore]: https://github.com/fluentdesk/fresh-themes-underscore
 [t-modern]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/modern
 [t-hello]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/hello-world
 [t-compact]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/compact
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "fresh-themes",
-  "version": "0.13.0-beta",
-  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
+  "version": "0.14.0-beta",
+  "description": "Multiformat themes and templates for your résumé / CV.",
  "repository": {
    "type": "git",
    "url": "https://github.com/fluentdesk/fresh-themes.git"
@ -11,21 +11,25 @@
    "résumé",
    "resume",
    "CV",
+    "employment",
    "portfolio",
    "Handlebars",
    "Underscore",
    "Markdown",
    "LaTeX",
    "HTML",
+    "Word",
    "Microsoft Word",
    "PDF",
    "Acrobat",
+    "Adobe",
    "JSON",
    "YAML"
  ],
  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
  "contributors": [
    "Brett Hardin (https://github.com/bhardin)",
+    "Evan Plaice <evanplaice@gmail.com> (https://github.com/evanplaice)",
    "Ya Zhuang (https://github.com/zhuangya)",
    "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)"
  ],
--- a/partials/README.md
+++ b/partials/README.md
@ -1,35 +0,0 @@
-fresh-themes/assets/partials
-============================
-This folder contains global partials available to all FRESH themes. A global
-partial is a reusable fragment of HTML, XML, or other markup that can be
-injected into your theme.
-
-## Use
-
-To load a global partial, use the following syntax in your theme:
-
-```hbs
-{{> section/[section-name] }}
-```
-
-For example:
-
-```hbs
-{{> section/employment }}
-{{> section/projects }}
-{{> section/employment }}
-```
-
-Currently two types of global partials are available:
-
- Section partials (DOC and HTML formats) that represent a specific resume
-section.
- Icon partials for DOC formats that make it a bit easier to embed images in
-the MS Word resume format.
-
-Many more will be supported in the future.
-
-## Overriding
-
-Themes can also declare theme-specific partials located in the theme's
-`/partials` folder (if any).
--- a/partials/doc/doc-fonts.hbs
+++ b/partials/doc/doc-fonts.hbs
@ -0,0 +1,48 @@
+{{!
+  The w:fonts node contains font setup information for the Word document,
+  including the default font as well as optional descriptions of fonts via
+  the <w:font> element.
+
+  This node is optional, but if omitted, Word will create a default <w:fonts>
+  section on save, with defaults (like Times New Roman) that are probably not
+  ideal for a specific use case. So we include this section by default, and set
+  the fonts to the theme's declared typography settings.
+}}
+
+<w:fonts>
+  {{!
+    The defaultFonts element defines the font to use when no other font or
+    formatting is specified. It's optional, but if not specified, Word will
+    fill it in to a default value. (Usually, it sets all four font families
+    to "Times New Roman").
+  }}
+  <w:defaultFonts w:ascii="{{{fontFace 'default' 'Calibri'}}}" w:fareast="{{{fontFace 'default' 'Calibri'}}}" w:h-ansi="{{{fontFace 'default' 'Calibri'}}}" w:cs="{{{fontFace 'default' 'Calibri'}}}"/>
+
+  {{!
+    Here go individual <w:font> entries. These are not required to actually use
+    any fonts, but are used by Word when it has to reconstruct a missing font.
+    Since fonts are not embedded into Word documents, this allows Word to
+    display the document without losing too much visual fidelity.
+
+    In a standard Word document, this first entry would also be set to Times
+    New Roman.
+  }}
+
+  <w:font w:name="{{{fontFace 'default' 'Calibri'}}}">
+    <w:panose-1 w:val="02020603050405020304"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Roman"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
+  </w:font>
+
+
+  <w:font w:name="Calibri">
+    <w:panose-1 w:val="020F0502020204030204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
+  </w:font>
+
+</w:fonts>
--- a/partials/doc/doc-fonts.xml
+++ b/partials/doc/doc-fonts.xml
@ -1,17 +0,0 @@
-<w:fonts>
-  <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
-  <w:font w:name="Times New Roman">
-    <w:panose-1 w:val="02020603050405020304"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="Roman"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
-  </w:font>
-  <w:font w:name="Calibri">
-    <w:panose-1 w:val="020F0502020204030204"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="Swiss"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
-  </w:font>
-</w:fonts>
--- a/partials/doc/doc-lists.hbs
+++ b/partials/doc/doc-lists.hbs
--- a/partials/doc/doc-pr.hbs
+++ b/partials/doc/doc-pr.hbs
--- a/partials/doc/doc-properties.hbs
+++ b/partials/doc/doc-properties.hbs
--- a/partials/doc/doc-styles.hbs
+++ b/partials/doc/doc-styles.hbs
@ -3,8 +3,8 @@
    <w:name w:val="Normal"/>
    <w:rsid w:val="002743C8"/>
    <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-      <wx:font wx:val="Calibri"/>
+      <w:rFonts w:ascii="{{{fontFace 'default' 'Calibri'}}}" w:h-ansi="{{{fontFace 'default' 'Calibri'}}}"/>
+      <wx:font wx:val="{{{fontFace 'default' 'Calibri'}}}"/>
      <w:sz-cs w:val="24"/>
      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
    </w:rPr>
@ -22,15 +22,16 @@
      <w:spacing w:before="100" w:before-autospacing="on"/>
      <w:outlineLvl w:val="0"/>
      <w:pBdr>
-        <w:top w:val="single" w:sz="6" w:space="1" w:color="#EEEEEE" />
+        <w:top w:val="single" w:sz="6" w:space="1" w:color="{{{color 'heading-border' 'EEEEEE'}}}" />
      </w:pBdr>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
-      <w:color w:val="AEAAAA"/>
+      <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'heading1' 'AEAAAA'}}}"/>
      <w:kern w:val="36"/>
-      <w:sz w:val="40"/>
-      <w:sz-cs w:val="40"/>
+      <w:sz w:val="{{{fontSize 'heading1' 40 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'heading1' 40 'half-point'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="paragraph" w:styleId="Heading2">
@ -44,7 +45,8 @@
      <w:outlineLvl w:val="1"/>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
      <w:b/>
      <w:b-cs/>
      <w:caps/>
@ -62,7 +64,7 @@
      <w:outlineLvl w:val="2"/>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{fontFace 'heading3'}}"/>
      <w:b/>
      <w:b-cs/>
    </w:rPr>
@ -74,7 +76,7 @@
    <w:name w:val="Normal Table"/>
    <wx:uiName wx:val="Table Normal"/>
    <w:rPr>
-      <wx:font wx:val="Times New Roman"/>
+      <wx:font wx:val="{{{fontFace 'table' 'Calibri'}}}"/>
      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
    </w:rPr>
    <w:tblPr>
@ -96,7 +98,7 @@
    <w:rPr>
      <w:strike w:val="off"/>
      <w:dstrike w:val="off"/>
-      <w:color w:val="0064BD"/>
+      <w:color w:val="{{{color 'hyperlink' '0064BD'}}}"/>
      <w:u w:val="none"/>
      <w:effect w:val="none"/>
    </w:rPr>
@ -107,7 +109,7 @@
    <w:rPr>
      <w:strike w:val="off"/>
      <w:dstrike w:val="off"/>
-      <w:color w:val="7B0796"/>
+      <w:color w:val="{{{color 'visited' '7B0796'}}}"/>
      <w:u w:val="none"/>
      <w:effect w:val="none"/>
    </w:rPr>
@ -117,11 +119,12 @@
    <w:link w:val="Heading2"/>
    <w:rsid w:val="00505903"/>
    <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
      <w:b/>
      <w:b-cs/>
      <w:caps/>
-      <w:sz-cs w:val="36"/>
+      <w:sz-cs w:val="{{{fontSize 'heading2' 36 'half-point'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="character" w:styleId="Heading3Char">
@ -129,10 +132,10 @@
    <w:link w:val="Heading3"/>
    <w:rsid w:val="001B7422"/>
    <w:rPr>
-      <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading3' 'Calibri'}}}" w:fareast="{{{fontFace 'heading3' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading3' 'Calibri'}}}" w:cs="{{{fontFace 'heading3' 'Calibri'}}}"/>
      <w:color w:val="1F4D78"/>
-      <w:sz w:val="24"/>
-      <w:sz-cs w:val="24"/>
+      <w:sz w:val="{{{fontSize 'heading3' 24 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'heading3' 24 'half-point'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="paragraph" w:styleId="NormalWeb">
@ -144,7 +147,7 @@
      <w:jc w:val="both"/>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'default-view-web' 'Calibri' }}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="character" w:styleId="Heading1Char">
@ -152,11 +155,12 @@
    <w:link w:val="Heading1"/>
    <w:rsid w:val="00505903"/>
    <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-      <w:color w:val="AEAAAA"/>
+      <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'heading1' 'AEAAAA'}}}"/>
      <w:kern w:val="36"/>
-      <w:sz w:val="40"/>
-      <w:sz-cs w:val="40"/>
+      <w:sz w:val="{{fontSize 'heading1' 40 'half-point'}}"/>
+      <w:sz-cs w:val="{{fontSize 'heading1' 40 'half-point'}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="character" w:styleId="Strong">
@ -190,13 +194,13 @@
      <w:contextualSpacing/>
    </w:pPr>
    <w:rPr>
-      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
-      <wx:font wx:val="Segoe UI"/>
+      <w:rFonts w:ascii="{{{fontFace 'title'}}}" w:h-ansi="{{{fontFace 'title'}}}"/>
+      <wx:font wx:val="{{{fontFace 'title'}}}"/>
      <w:b/>
      <w:spacing w:val="-10"/>
      <w:kern w:val="28"/>
-      <w:sz w:val="48"/>
-      <w:sz-cs w:val="56"/>
+      <w:sz w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="character" w:styleId="TitleChar">
@ -204,11 +208,11 @@
    <w:link w:val="Title"/>
    <w:rsid w:val="002D3B7B"/>
    <w:rPr>
-      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+      <w:rFonts w:ascii="{{{fontFace 'title'}}}" w:h-ansi="{{{fontFace 'title'}}}"/>
      <w:spacing w:val="-10"/>
      <w:kern w:val="28"/>
-      <w:sz w:val="48"/>
-      <w:sz-cs w:val="56"/>
+      <w:sz w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="paragraph" w:styleId="ListParagraph">
@ -220,7 +224,7 @@
      <w:contextualSpacing/>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'list-paragraph' 'Calibri' }}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="paragraph" w:styleId="Summary">
@ -232,8 +236,8 @@
      <w:spacing w:before="120"/>
    </w:pPr>
    <w:rPr>
-      <wx:font wx:val="Calibri"/>
-      <w:color w:val="767171"/>
+      <wx:font wx:val="{{{fontFace 'summary' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'summary' '767171'}}}"/>
    </w:rPr>
  </w:style>
  <w:style w:type="character" w:styleId="SummaryChar">
@ -241,8 +245,9 @@
    <w:link w:val="Summary"/>
    <w:rsid w:val="00A210E1"/>
    <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-      <w:sz-cs w:val="24"/>
+      <w:rFonts w:ascii="{{{fontFace 'summary' 'Calibri'}}}" w:h-ansi="{{{fontFace 'summary' 'Calibri'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'summary' 24 'half-point'}}}"/>
+      <w:sz w:val="{{{fontSize 'summary' 24 'half-point'}}}"/>
    </w:rPr>
  </w:style>
 </w:styles>
--- a/partials/doc/header-icon.hbs
+++ b/partials/doc/header-icon.hbs
@ -6,6 +6,7 @@
  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
    <w:pPr>
      <w:pStyle w:val="Heading1"/>
+      <w:ind w:left="-720"/>      
    </w:pPr>
    <w:r>
      {{> (lookup . '_icon') }}
--- a/partials/doc/header-simple.hbs
+++ b/partials/doc/header-simple.hbs
--- a/partials/doc/pict/arrow.hbs
+++ b/partials/doc/pict/arrow.hbs
--- a/partials/doc/pict/bicycle.hbs
+++ b/partials/doc/pict/bicycle.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000015.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABEpJREFUeNrsV2tz2kYUXQmBBQghZDAYZFsmxo/4VbfOtNPp3+9MmzpxqF8EAyYEbCxjLITEQwipuwIMxIChqSeZqTT6sivp7rnnnj13hRmGAb6nCwff2WUBsgBZgCxAFiALkAXIAmQBsgBZgCxA/zNAxFdHkEppQdL7Y4c7EA578W8GKJ0+LSjDU3cS/uZ1iHhZQHpNqqlf/nTjDrcr4POXGqLapUg3DB20hXQi5N9h/xUkbLp/+9vz3y+F9pezDt/Gr7uB4QKmjuJF2YCPYr/sBvEXE7WHoewEhvXuR94aslgZuvVA1D8Hn6gPmURRezmGBi/t+vjPZHWKr2zM3s8zF25mUhvpk1R1uhzaYuLiVv+vGNLKheyna0FudqSMYzaSmo8GtVSq3IBDz8pvB0v4CLjHbwuKDjDK7agpTR3Y2KBXFytSs91BhtudLBuOvlp0ETMAUktn8fP75tjk7MzemxG10IunfyRFFXQU7cz/dZKpj+ESc3Jb+2t+YpptLxXjF4lKy8zGHYqEwzSJUpcgYWXZjE+Q1Ij8tNvEFUID4W5uBXEpU2r00Ng966t8J4z4OZ97qKtGPX/+Tl3/6aldEU84TycRGsw1H/1xe/HxMXGfqfXia9XC6SV7GKMH08jFUwL6zhndhuQ9JC+upUd2WjURuMMMDOalmCAnFU7PrkqtlnB5xvj3w8QkUd+kilABgPDyhwNoQDnxASkDSofb9NoAMGThU2k4jawC18focGyZBvpVrthEzCys73LIBJBVlh9NgI7sbIdp6B1GNffxYeIuy5dE5H7OcCyCD9Ti/GOpYdZiZ5cPxQIUWkIq5vvSeW/CdfjWfngFadPy5aqJPrgZ8q5thSjsyY6jo+us3SxhQZxQMrnaQGnMeTjXgOucmLWA6xGtXPw4B3QVJWeIheMPt+YWaCh96aCJBxnBBxTNoyG9thOqvL2pm1Y5/ygaat7tuBfVdksCgBnHkKaZtBKEo1+M7HXPddS6IirwrneMQGt2hkoNkoq5Tel0XlRURLON9HRjkLEY70QsCYV8fzGWdDzbXAkCDtsQF9q63WB8NKjkZH2oz9YQJmLOTXW/xsng6nJf4m4HlFm73agCsNCt0PIGX0uXXUtcP0y5oT4LiPKQxF1Ta1bzNRDtVo1gN/bZwZdqqaOjugowJnKww400GR9FAkEBspTVAY/3hLx5EBmSx71ZaJudniRqzs/A5ED9+rIwxhU14fJORoHoEDf2SMOxHhhXr96O7a9SJllGwiSZCDOxly2uhdxwSqtkj85utBEOfpyoIMlQCyv+CQ1ydTmEdjt0mpOc+CQM8iHTpTDP8obv2dYxzqlv8oWSaG43wsMdHvDkMyfbzPt4xxsx0hOILgVNc+85Nei41AinnrWXYS4fv7cbIac6bWf/PsmX27P1smm7PcBsLmqeX+EXWMcspwlVTCczQkVuGV/T7b/l9Y8AAwCSXjehR+kgEQAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000015.png" o:title="fa-bicycle"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/book.hbs
+++ b/partials/doc/pict/book.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000013.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArtJREFUeNrsmP1v0kAYx1soxZW2YOl4s8xkvkyJMZop/380JkuMLpmOxSkvQQasdNCWUks5Wq8WZP4waG9HMpPeL/SSK/e553m+z/NcSdd1ibs0YsQdGxFQBBQBRUARUAQUAUVAEVAE9J8BUUhv2er3by2TpJ2Z7QTahS3u7ZfSQU5PItw67Prx0cXECfkWk39ZPeC34bJRQw5NA4dpKFuJIavekmdI0RpLbCOGBo3+dfOQFLl+vQsWEUHymeI2gJx/w+J19YBZt7p+/O5i4q8VynCvka5wvEjhA5IH6vzvJM7szAxVu3k16CqTxeMOV4BbqZe12g/x1dvHPB4gIPfG9mo6V1pflIAS40s0QRi9sUVM9QFB8DiC2mqenmtzpLyVzOShZ82+PoXBRCfxxJDVVcZgNU0UKofP1kUDaH88avzyebhSBvJ0VY+HFSQ8sp+C6wGdTEtrY5MAnaG1eKSZLAsDvDc24H6sUMKjMvPSO98KT/n8/sOa0ziuu+SP89ldCNjXTThh+SIe2RvNkXnjluuLE5vzbNKTDZiRUuJDCkem1s9rV0jp2fNRJgd/2kMd8iRThU0WCAY0mJiI3QTJZ8te/hoZ0JxMRqKx1DLVtFDbG0ZY+csXPwagXkefI/Kk0hL0kXzl/YEv/tsD2fX+EJWHYQtwA2MwsZfivzWQ2fjaRel+/GQllKGPtK4BBRHP5Hdx9EPK2ED+jp3kCswygZGsmMPS5M8cB1lf4h70kf1TgwqleCEYz6bEqFqL6h4jyTDNJcUIUuUR4yVo44997j/Ac+ugYh4GW6y+eUKjmAm0vY5okaxxuIzNc/egTOSzjmKG952tnA10T2xcIXDN3HgNAsPTTyeodcNvVHJPDyuBiYLcy4DZPDvpaBaK3BLi/vMXEh9CC8EvisDQLBCqriYYngl7z/otwABxHQzMzw8ozAAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000013.png" o:title="fa-book"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/code.hbs
+++ b/partials/doc/pict/code.hbs
--- a/partials/doc/pict/edu.hbs
+++ b/partials/doc/pict/edu.hbs
--- a/partials/doc/pict/emp.hbs
+++ b/partials/doc/pict/emp.hbs
--- a/partials/doc/pict/group.hbs
+++ b/partials/doc/pict/group.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000014.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA5hJREFUeNrsmPtT2kAQx0M4DhJeAZFGqohBGdHal9PWdvrX94dOO1Pta2gtICLFgBQhhhDgOJLGii8khZBMpz9kh58y2c3n9na/e4dDVVXifzKS+M/MBrKBbCAbyAaygWwgG+gfG5jqLfSr/IOvyjImPb4AyyUXaDBlfCQcZEuNjoRJmvYvLnMRZoKnY+KJUaln977XpJtvOf2prUexwCQYfJLdzfO9m54uNrW9zgIzW/Yrm7tNo9mglc8V0CScWqZwm0azfjWX4bGZGipX6/1xaWufFoW/e1Z4cTDmsdoqH8gmaqiHddaD8WWKFFls1GtiT1sdFb43z/jgRTIUnVrAqE0Q9KxALlLLoTLOEWjfRZX9z8Vq5zoTpeND4Aom0ulFRj8H0Gtiy2KRsHPcc7c/Rhb23h/cpBkmoH+W/7K7X11k/Y5xnlRkiTYBBO5vJBk42ppeLj1XzvCiboOeF6+ylIi4Rj0D99c4eva2x0hWIA0V4Wc2x9e7WjmR0Def2lylj3bfVjoT1hJMvt6E5e/FsjD0ZFfSXBQqCBEQksaBcOPr7pdmH7iDieVkjKUvQ2AFE+WP7wqdSYrhCj9+lgoAQF5HPC4elsrtAemNPd/mPMaKWi4Wmucdj3tn+exePusAf0pCUUF0g1PQFCrd74mgVHhTkYe1pGL1SjVOCjVuI2qohurt23KhhTv/KYan09AR39qJgdSUjRU16iBFT4G6IR+cgsTlDsh6MnahRkaAZKQXShWbTZahJs9tOkQft/RUGaGWZccPJPD1lTjr+vvU9ibWPIV6x2hwXSAajq93SAVjrB+I/vXNWMChu1vs2tYigXyRaNTrHhsIAMoYEEzeyYHTv/pw5/kyQ8hn/GGuhOJPXyRZalTItdGx+nA75ans/+DrEvIspF7tJFm3YyR/8ZWFGYQRdasnfKt3gR64F0EHmWzralY46FD8QXrJg0aGKyHkMt8q7StlAO7IxpN5dDTsK0iFouyczgZMcUC7MiHz/tPp3bOIk6Z8DEP9ia90xbNGu3e3HTQl3NnmpmnNqYHk/IcPVWn2s7IzsvryQcy6Q7501DRBc66EjZOfFt465KrYM3mdUCShZh3QqYQIs6Z2RdkqIKHdteDfbIxEq4AQVszzEINu275K/yugMO2x4Ftu35xVQCCeCLnMLt07l2As2zIQ3kqvh9xgVhroZR8/snZ0DDtXlqW+0Y4DdNADp335twADAHYlmV3HkUP7AAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000014.png" o:title="fa-group"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/justice-scales.hbs
+++ b/partials/doc/pict/justice-scales.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000011.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA8dJREFUeNrsl+1v2lYUhy8GLo6xsQHjuEA9MI4hTatG2qR+2D8/aR8mVVOytlrLO65DKLOT4DcoOMYMGqlbi7GdJlOjyVf+4mv76Dlvv3scW61W4CGtWAQUAUVAEVAEFAFFQBFQBHQ3IEcft6ShMQdomi2JZQZ+XyC1+VtrfP35NsmIPz5hE/81kNo/HRquZ3jm2mIJkqR4wEG1/VZduPEUhXoDoYV6g8MCgcJ4Y2rm1Nj9GKfrRRoCOo+rI2O50KYLz9cgnAJwP0AERaSR3RGyLlqj7DpCl9Z6xydCZPp/W0PAsfQ52MNx6N1lf75t6ksQ2+Pqz3jPLnNmM8uFFB6GFAl+xWifnLz5/eRV17OOEiSLo58spXLePT8bvjp9+fqPl29UcB9AzqinzomySNij3pl7+xS4w540RTmeAhOpa9wdSGlKJizWKsVaATWHTeW2PJPuuY5kOb7cqIRzyR/I6A40kK0IGQAyopgFyqA9vw2O3ZPGNlE5LKxTW/whD0O45AfkyoORnS7XCje3VG0/Y6tN2QnN86E9nqJMtXhTzDmBJ4NdQvxa+syEdOUfdcV4kYbaWVMLhzNvDS8AJdYzn+ufOQh2CdltTlIAyR9kvxDlgyINtHYrRHE6Z03FzrDrYv7XCuES4muuxnwlHYmSyKbnymAUlDft3VCDebH29Vlx41K3M7sd0C5zmyOpVmGhKb1T/aWrPQF0ScA9dKsk0ClL6SlOeKBZv6+51CMvc5uVFR4RjjaUZ77Sld4XyzsOtXqFAXq/MwkJ5CidvwxYaHA7hR7hqkU4lTvn3qJy1ZZNyFb53aNaofGYsC9kz7xvAc0kWQdMVUT9UpIRqhSij6WZV3jeT2yCFXK+vb1xyZRbk+DxQxtcWkksp3f7un/VonhSGw8u+aP8l/vy2ETwwkLqdAMEEEvZ2loXsrQ/EAYT4NqUP5hhlAaHe1t7SSS21NSxEeb7FIEGpgxWWToeTvjiJFfdbsPHlVwy5OSToTk8uIYSpSdHZSqQKU4IR4eMV91TR4cNMpAphhWEYy9Z8TCJUJXjF8zVoNNVzNly6+l6SGW4RnUf7uzCDPv8Ba302+/Vi4/XW50Yx4g8X+VpKvFNE6NtWVcTxdzM7ShRyOVIdLube6e/nE9BnDr++Sm19f1cM43LieVuKoahCCyDIXca8iGOs+vrm0dkiFL59cWE/gABD2w9OKAwfx3S61/PfXVl5XyygcRiPv6hzNOf6uS9/Ci6zmoVZkx0Vyufkdm27fuK0LpTPjp3zkUC8+rQrfW3AAMAaZzVLhuUv2EAAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000011.png" o:title="fa-justice-scales"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/quote.hbs
+++ b/partials/doc/pict/quote.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000012.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrsl89PwjAUgOksMMgEMuJCRqKRqBkOI1f9/w9e1INEjXAwxB/LwIEKiKxbJfHAEqPSt6KEvJddtnzN+177tq6Ec55YplASSxYohEIohEIohEIohEIohEIotGJCVHQA8+6dTs8b+OG0GtXYs8uqJPgzyPznMua2Gk2nH0SfrRnW0b4RFwbM0KR7cd7o+QuAIT3EPIEEQjBohsK7q8svCRRCpqVQtVjS4TBMaHT7+MyiA9bNul3RUvFhmFC/7b5F6Pz28WFZkQLDeijsDMezu4y5+1MCIRgo9DKeRF7btJ6VBq/k1hEMHxy2EBi6dfjuzUm3SSJFKCltwzrYydGYcIwlCzlnsysYvTpnp9cDGbC8Hnp/arWlwVKamoe+NBh/0FAIhf5ZiNJ5PuVESQrDQCFtq5gjv6VI5jdNYRi6ZNlKvVoqfF8TzRQsu6ZTcTj+Mehv4kOAAQCDHsVN5IYqHwAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000012.png" o:title="fa-quote"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/rec.hbs
+++ b/partials/doc/pict/rec.hbs
--- a/partials/doc/pict/share-alt.hbs
+++ b/partials/doc/pict/share-alt.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000010.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAihJREFUeNrsl+1P2lAUxukLFyxaEULFrjNoAFGMiW7OZPv3TZYlbkEbNkSsCghYIWCVIqWUFXUfxKa9k0vF5J6vTc759Z7nnPtcYjAYeKYpSM+UBQbCQBgIA2EgDISBMBAGwkDvDIieSFatKV9c1pSeQXpnw5FlfhFA1yFQvzp05fjw6KqjPyvi4xPbySj9Bi27PxUzIzRmDLqV/M+c7L6GVOl3pW1Yf+vVLgqay0BG9Uax6X+nWVTdBVLUe3t5aXcuAhmtUkU1pmLsTZT8SbnW6TsNNBPkUAHpjaIoFW+7T+ND+UJcbCMRISFRHgKEeB7NHlLOM2K59aIoTVF6v28pgpedIwP8l0+rfhQtUwp/LGiGpzZKQ/jnFlPpeNBzLYlSud37h+Vlw8JG+oMfTgBOJ1QR9ws3ulOSJxTwfKaUtk4HGIZGKepWU7WlIYCJshYLWVSlATsP0E+ZYT/JZHApHmJctB+s3/4n+3L++69s6U5DBuSkIbVwcFCDWLCUqdxk4uMsmLz9aGV/ZBo9uGxDLAHU89X2q+0HjB/S6tnDXKM7UiPKh/V6td6FtFPeaGovxaEBerwfquclWdFMjZOA5WIrS4+DpctS7gwOayb6dTcOUAE5XC1QWD7h826cGW/KYJcHt7q5921rgZoi+zHMRZIT30P/FcF522sCzn4g9dSCwPnGtR9oXx0LyXWeJazKBPiddORN3mXm2pqo/RhjFbzOfvwVYACXgQOVsrGQ2gAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000010.png" o:title="fa-share-alt"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/srv.hbs
+++ b/partials/doc/pict/srv.hbs
--- a/partials/doc/pict/star.hbs
+++ b/partials/doc/pict/star.hbs
--- a/partials/doc/pict/thumbs-up.hbs
+++ b/partials/doc/pict/thumbs-up.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000016.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArlJREFUeNrsl91T2kAQwEMIIYQQPhoDWlBaYDogOD7UGTu2//9THS3WMopQNUoIUSEkIcZ8NJcp0I44ggTIQ+7lcpvM3i+7e7t7PtM0ITcNGHLZ8IA8IA/IA/KAPCAPyAPygFw2EKcUGXz9tHknGAiORTYyWTqBvk2Pz5meWmgcHt8KY00+fC3/uZiEV+Wy7mUb0Pgj6WQsFvBBkCl3GjVuZTHU42TdmnCqkP9U3v1SSQetlX7fulkRkNYRHq3JT0Rxe02mSECkqQNjJUDGtSTbYRNL/ZUQqH1WVEVYAZDWrrF9yxIwEU2NQkpWwIRi5NKBhPr3c+7JMk84m8sOdT2wom7zROHl5iHtvvqLAdEToAuVzaE1DIbhn4CQjKNitwd+Gg3jOLJwIOWievIAjEO+L5ZSIz0a2xE08PDEN6r86Gt/iN4qlNLkolym3Z4c3kggdMLrpdy/27Q4cVKm1Qdco3p0ITuRqbW7+vEZI+kTXgViO3vlxGtWNuR242edGZiQP1o+qFBzWkht/p5IgwSpaWjAHngyv70GcpQuctzcMSQr6jNZKL1b/EjiM/gbR5BFHnsYnYnG8lqzL4IZIxJu6IeUxtG1nTwjVBpxAxC2SYXs+EAwGHIDkBWpU++zFCDhjJXs8kvEXQFk3A3sYkvQHxBXAMEhvw1iGM66DPb53oSvce0+SGXBUMxJoCC9/+3gayYyMxNbq/d0UIOpTcJJIFVi+B4vyLbZDbUrarMdG5zO4c60Hzhm3bAGkCldnVaHsgHz44gB5SxCr6eyG0n0ZTViRwL+CgSJ6fjnq/bjQhtOxCg6GSUJcgynivzlea0lWbbE3m3vb8cdAnrBhQrbvmqxXP/xdd8FEjt7pQQCLRTof7I21xUVWX+uyk/E06ViZuoO1qmr9LgXE2TVHLYEM7TSo/FHgAEAC/8S0Mwjye0AAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000016.png" o:title="fa-bicycle"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/wri.hbs
+++ b/partials/doc/pict/wri.hbs
--- a/partials/doc/section/affiliation.hbs
+++ b/partials/doc/section/affiliation.hbs
@ -0,0 +1,71 @@
+<wx:sub-section>
+
+  {{#> header-affiliation }}
+  {{> header-simple _title="AFFILIATION" _section="affiliation" }}
+  {{/header-affiliation}}
+
+  {{#each r.affiliation.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ role }}}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <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>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- 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>
--- 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">
--- a/partials/doc/section/governance.hbs
+++ b/partials/doc/section/governance.hbs
@ -0,0 +1,78 @@
+<wx:sub-section>
+
+  {{#> header-governance }}
+  {{> header-simple _title="GOVERNANCE" _section="governance" }}
+  {{/header-governance}}
+
+  {{#each r.governance}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+
+      {{#if role}}
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ role }}, </w:t>
+      </w:r>
+      {{/if}}
+
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <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 .}}</w:t>
+      </w:r>
+    </w:p>
+
+    {{#if summary }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- a/partials/doc/section/info.hbs
+++ b/partials/doc/section/info.hbs
--- a/partials/doc/section/interests.hbs
+++ b/partials/doc/section/interests.hbs
@ -0,0 +1,32 @@
+<wx:sub-section>
+
+  {{#> header-interests }}
+  {{> header-simple _title="INTERESTS" _section="interests" }}
+  {{/header-interests}}
+
+  <wx:sub-section>
+
+    {{#each r.interests}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ name }}}</w:t>
+      </w:r>
+      {{#if keywords}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{#each keywords}}{{#unless @first}}, {{/unless}}{{{ . }}}{{/each}}</w:t>
+      </w:r>
+      {{/if}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+</wx:sub-section>
--- 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>
--- a/partials/doc/section/reading.hbs
+++ b/partials/doc/section/reading.hbs
@ -0,0 +1,68 @@
+<wx:sub-section>
+
+  {{#> header-reading }}
+  {{> header-simple _title="READING" _section="reading" }}
+  {{/header-reading}}
+
+  {{#each r.reading}}
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <!-- <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs> -->
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{{ title }}}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <!-- <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r> -->
+      {{#if author}}
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>, {{{ author }}}</w:t>
+      </w:r>
+      {{/if}}
+    </w:p>
+    {{#if summary}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- 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>
--- a/partials/doc/section/references.hbs
+++ b/partials/doc/section/references.hbs
@ -0,0 +1,52 @@
+<wx:sub-section>
+
+  {{#> header-references }}
+  {{> header-simple _title="REFERENCES" _section="references" }}
+  {{/header-references}}
+
+  {{#each r.references}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ name }}}</w:t>
+      </w:r>
+      {{#if role}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          <w:t>, {{{ role }}}</w:t>
+        </w:r>
+      {{/if}}
+      {{#if category}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          <w:t> ({{{ category }}})</w:t>
+        </w:r>
+      {{/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>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- 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">
--- a/partials/doc/section/skills.hbs
+++ b/partials/doc/section/skills.hbs
--- 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>
--- a/partials/doc/section/writing.hbs
+++ b/partials/doc/section/writing.hbs
@ -20,13 +20,16 @@
            <w:rStyle w:val="Hyperlink"/>
          </w:rPr>
          {{/if}}
-          <w:t>{{ title }}</w:t>
+          <w:t>{{{ title }}}</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>{{formatDate safe.date 'YYYY'}}</w:t>
      </w:r>
    </w:p>
--- a/partials/html/header-icon.html
+++ b/partials/html/header-icon.html
--- a/partials/html/header-simple.html
+++ b/partials/html/header-simple.html
--- a/partials/html/highlights.html
+++ b/partials/html/highlights.html
--- a/partials/html/section/affiliation.hbs
+++ b/partials/html/section/affiliation.hbs
@ -0,0 +1,26 @@
+{{#section "affiliation"}}
+<hr>
+<section id="affiliation">
+  {{#> header-affiliation }}
+    {{> header-icon _title="AFFILIATION" _section="affiliation" _hdricon=(lookup . '_icon') }}
+  {{/header-affiliation}}
+
+  {{#each r.affiliation.history}}
+    {{#> body-affiliation }}
+    <div>
+      <h3><em>{{{ role }}}</em>,
+        {{#if url }}
+        <a href="{{{ url }}}">{{{ organization }}}</a>
+        {{else}}
+        {{{ organization }}}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-affiliation}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/education.html
+++ b/partials/html/section/education.html
@ -11,6 +11,7 @@
      <span class="tenure">{{dateRange .}}</span>
      {{{ summary }}}
      {{> highlights }}
+      {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
    </div>
    {{/body-education}}
  {{/each}}
--- a/partials/html/section/employment.html
+++ b/partials/html/section/employment.html
--- a/partials/html/section/governance.hbs
+++ b/partials/html/section/governance.hbs
@ -0,0 +1,26 @@
+{{#section "governance"}}
+<hr>
+<section id="governance">
+  {{#> header-governance }}
+    {{> header-icon _title="GOVERNANCE" _section="governance" _hdricon=(lookup . '_icon') }}
+  {{/header-governance}}
+
+  {{#each r.governance}}
+    {{#> body-governance }}
+    <div>
+      <h3>{{#if position}}<em>{{ position }}</em>,
+        {{/if}}{{#if url }}
+        <a href="{{{ url }}}">{{ organization }}</a>
+        {{else}}
+        {{ organization }}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>
+      <p>{{{ summary }}}</p>
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-governance}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/info.hbs
+++ b/partials/html/section/info.hbs
@ -0,0 +1,11 @@
+{{#has 'info.brief'}}
+<hr>
+<section id="summary">
+  {{#> header-info }}
+    {{> header-icon _title="About" _section="info" _hdricon=(lookup . '_icon') }}
+  {{/header-info}}
+  {{#> body-info }}
+    {{{ r.info.brief }}}
+  {{/body-info}}
+</section>
+{{/has}}
--- a/partials/html/section/interests.hbs
+++ b/partials/html/section/interests.hbs
@ -0,0 +1,18 @@
+{{#section "interests"}}
+<hr>
+<section id="interests">
+  {{#> header-interests }}
+    {{> header-icon _title="INTERESTS" _section="interests" _hdricon=(lookup . '_icon') }}
+  {{/header-interests}}
+  {{#each r.interests}}
+    {{#> body-interests }}
+    <div>
+    <h3><em>{{{ name }}}</em></h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-interests}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/projects.html
+++ b/partials/html/section/projects.html
--- a/partials/html/section/reading.hbs
+++ b/partials/html/section/reading.hbs
@ -0,0 +1,17 @@
+{{#section "reading"}}
+<hr>
+<section id="reading">
+  {{#> header-reading }}
+    {{> header-icon _title="READING" _section="reading" _hdricon=(lookup . '_icon') }}
+  {{/header-reading}}
+  {{#each r.reading }}
+    {{#> 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>
+      {{{ summary }}}
+    </div>
+    {{/body-reading}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/recognition.html
+++ b/partials/html/section/recognition.html
@ -7,9 +7,9 @@
  {{#each r.recognition}}
    {{#> body-recognition }}
    <div>
-    <h3><em>{{ title }}</em>, {{ from }}</h3>
+    <h3><em>{{ title }}</em>, {{{link from url }}}</h3>
    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
-    {{ summary }}
+    {{{ summary }}}
    {{> highlights }}
    </div>
    {{/body-recognition}}
--- a/partials/html/section/references.html
+++ b/partials/html/section/references.html
@ -7,8 +7,8 @@
  {{#each r.references}}
    {{#> body-references }}
    <div>
-    <h3><em>{{ name }}</em></h3>
-    {{ summary }}
+    <h3><em>{{ name }}</em>{{#if role}}, {{{ role }}}{{/if}}</h3>
+    {{{ summary }}}
    </div>
    {{/body-references}}
  {{/each}}
--- a/partials/html/section/samples.html
+++ b/partials/html/section/samples.html
--- a/partials/html/section/service.html
+++ b/partials/html/section/service.html
@ -15,7 +15,7 @@
      {{/if}}
    </h3>
    <span class="tenure">{{dateRange .}}</span>
-    <p style="clear: both;">{{{ summary }}}</p>
+    <p>{{{ summary }}}</p>
    {{> highlights }}
    </div>
    {{/body-service }}
--- a/partials/html/section/skills.html
+++ b/partials/html/section/skills.html
--- a/partials/html/section/speaking.html
+++ b/partials/html/section/speaking.html
@ -7,7 +7,7 @@
  {{#each r.speaking}}
    {{#> body-speaking }}
    <div>
-    <h3><em>{{ title }}</em>, {{ from }}</h3>
+    <h3><em>{{{ title }}}</em>, {{{ event }}}</h3>
    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
    {{{ summary }}}
    {{> highlights }}
--- a/partials/html/section/testimonials.html
+++ b/partials/html/section/testimonials.html
--- a/partials/html/section/writing.html
+++ b/partials/html/section/writing.html
--- a/partials/md/section/affiliation.hbs
+++ b/partials/md/section/affiliation.hbs
@ -0,0 +1,19 @@
+{{#section "affiliation"}}
+## {{{sectionTitle "AFFILIATION"}}}
+
+{{#each r.affiliation.history }}
+{{#if url}}
+### *{{{ role }}}*, [{{{ organization }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### *{{{ role }}}*, {{{ organization }}} ({{dateRange .}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/governance.hbs
+++ b/partials/md/section/governance.hbs
@ -0,0 +1,21 @@
+{{#section "governance" }}
+## {{{sectionTitle "GOVERNANCE"}}}
+
+{{#each r.governance }}
+{{#if url}}
+### {{#if role}}*{{{ role }}}*, {{/if}}[{{{ organization }}}]({{{ url }}}) {{#has 'start'}} ({{dateRange .}}){{/has}}
+{{else}}
+### {{#if role}}*{{{ role }}}*, {{/if}}{{{ organization }}}{{#has 'start'}} ({{dateRange .}}){{/has}}
+{{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{~#if highlights}}
+
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/info.hbs
+++ b/partials/md/section/info.hbs
@ -0,0 +1 @@
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
--- a/partials/md/section/interests.hbs
+++ b/partials/md/section/interests.hbs
@ -0,0 +1,12 @@
+{{#section "interests"}}
+## {{{sectionTitle "INTERESTS"}}}
+
+{{#each r.interests}}
+- {{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}}
+{{#if summary}}
+{{{ summary }}}
+{{/if}}
+
+{{/each}}
+
+{{/section}}
--- a/partials/md/section/reading.hbs
+++ b/partials/md/section/reading.hbs
@ -0,0 +1,12 @@
+{{#section "reading"}}
+## {{{sectionTitle "READING"}}}
+
+{{#each r.reading}}
+{{#if url}}### [*{{{ title }}}*]({{{url}}}){{#if author}}, {{{ author }}}{{/if}}
+{{else}}### *{{{ title }}}*{{#if author}}, {{{ author }}}{{/if}}
+{{/if}}
+{{#if summary}}{{{ summary }}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/recognition.hbs
+++ b/partials/md/section/recognition.hbs
@ -1,10 +1,12 @@
-{{#section 'recognition'}}
+{{#section "recognition"}}
 ## {{{sectionTitle "RECOGNITION"}}}

 {{#each r.recognition}}
-### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
+{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if summary}}

-{{{ summary }}}
+{{{ summary }}}{{/if}}

 {{/each}}
 {{/section}}
--- a/partials/md/section/references.hbs
+++ b/partials/md/section/references.hbs
@ -0,0 +1,14 @@
+{{#section "references"}}
+## {{{sectionTitle "REFERENCES"}}}
+
+{{#each r.references }}
+### *{{{ name }}}*{{#if role}}, {{{ role }}}{{/if}}{{#if category}} ({{{ category }}}){{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if contact}}{{#each contact }}{{{ label }}}: {{{ value }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/speaking.hbs
+++ b/partials/md/section/speaking.hbs
@ -2,7 +2,7 @@
 ## {{{sectionTitle "SPEAKING"}}}

 {{#each r.speaking}}
-### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+### *{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})

 {{{ summary }}}
 {{#if highlights}}
--- a/partials/txt/section/affiliation.hbs
+++ b/partials/txt/section/affiliation.hbs
@ -0,0 +1,14 @@
+{{#section "affiliation"}}
+{{{sectionTitle "AFFILIATION"}}} --------------------------------------------------------------------
+
+{{#each r.affiliation.history }}
+{{#if role}}{{{ role }}}, {{/if}}{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/governance.hbs
+++ b/partials/txt/section/governance.hbs
@ -0,0 +1,17 @@
+{{#section "governance" }}
+{{{sectionTitle "GOVERNANCE"}}} ---------------------------------------------------------------------
+
+{{#each r.governance }}
+{{#if role}}{{{ role }}}, {{/if}}{{{ organization }}}{{#has 'start'}} ({{dateRange .}}){{/has}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{~#if highlights}}
+
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/info.hbs
+++ b/partials/txt/section/info.hbs
@ -0,0 +1 @@
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
--- a/partials/txt/section/interests.hbs
+++ b/partials/txt/section/interests.hbs
@ -0,0 +1,12 @@
+{{#section "interests"}}
+{{{sectionTitle "INTERESTS"}}} ----------------------------------------------------------------------
+
+{{#each r.interests}}
+{{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{/each}}
+
+{{/section}}
--- a/partials/txt/section/reading.hbs
+++ b/partials/txt/section/reading.hbs
@ -0,0 +1,14 @@
+{{#section "reading"}}
+{{{sectionTitle "READING"}}} ------------------------------------------------------------------------
+
+{{#each r.reading}}
+"{{{ title }}}"{{#if author}}, {{{ author }}}{{/if}}
+{{#if url}}{{{ url }}}
+{{/if}}
+{{#if summary }}{{{ summary }}}
+{{/if}}
+{{#if date}}{{{ date }}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/recognition.hbs
+++ b/partials/txt/section/recognition.hbs
@ -2,8 +2,11 @@
 {{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------

 {{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
+{{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
+{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}

 {{/each}}
 {{/section}}
--- a/partials/txt/section/references.hbs
+++ b/partials/txt/section/references.hbs
@ -0,0 +1,14 @@
+{{#section "references"}}
+{{{sectionTitle "REFERENCES"}}} ---------------------------------------------------------------------
+
+{{#each r.references }}
+{{{ name }}}{{#if role}}, {{{ role }}}{{/if}}{{#if category}} ({{{ category }}}){{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if contact}}{{#each contact }}{{{ label }}}: {{{ value }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/speaking.hbs
+++ b/partials/txt/section/speaking.hbs
@ -0,0 +1,15 @@
+{{#section 'speaking'}}
+## {{{sectionTitle "SPEAKING"}}} ------------------------------------------------------------------------
+
+{{#each r.speaking}}
+*{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/writing.hbs
+++ b/partials/txt/section/writing.hbs
@ -3,7 +3,8 @@

 {{#each r.writing}}
 {{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
-{{{ summary }}}
+{{#if summary}}{{{ summary }}}
+{{/if}}

 {{/each}}
 {{/section}}
--- a/themes/README.md
+++ b/themes/README.md
@ -7,6 +7,3 @@ FRESH resume themes live here, one per folder.
 - [`compact`](compact): A compact theme.
 - [`positive`](positive): A theme that partakes of that which is positive.
 - [`awesome`][awesome]: A LaTeX theme based on Awesome-CV.
- [`underscore`](underscore): An unstyled starter theme illustrating the use of Underscore.js (instead of Handlebars) as a template engine.
- [`basis`](minimist): An unstyled starter theme.
- [`hello-world`](hello-world): A simple-as-possible example theme.
--- a/themes/basis/src/html.html
+++ b/themes/basis/src/html.html
@ -39,18 +39,28 @@

 {{> section/projects }}

+{{> section/governance }}
+
 {{> section/education }}

+{{> section/affiliation }}
+
 {{> section/service }}

 {{> section/samples }}

 {{> section/writing }}

+{{> section/reading }}
+
 {{> section/recognition }}

 {{> section/speaking }}

+{{> section/references }}
+
+{{> section/interests }}
+


    </main>
--- a/themes/basis/src/md.txt
+++ b/themes/basis/src/md.txt
@ -4,7 +4,7 @@
 {{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
 {{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}

-{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}}
+{{> section/info }}

 {{> section/skills }}

@ -12,14 +12,24 @@

 {{> section/projects }}

+{{> section/governance }}
+
 {{> section/education }}

+{{> section/affiliation }}
+
 {{> section/samples }}

 {{> section/writing }}

+{{> section/reading }}
+
 {{> section/service }}

 {{> section/recognition }}

 {{> section/speaking }}
+
+{{> section/references }}
+
+{{> section/interests }}
--- a/themes/basis/src/pdf.html
+++ b/themes/basis/src/pdf.html
@ -39,18 +39,28 @@

 {{> section/projects }}

+{{> section/governance }}
+
 {{> section/education }}

+{{> section/affiliation }}
+
 {{> section/service }}

 {{> section/samples }}

 {{> section/writing }}

+{{> section/reading }}
+
 {{> section/recognition }}

 {{> section/speaking }}

+{{> section/references }}
+
+{{> section/interests }}
+


    </main>
--- a/themes/basis/src/txt.txt
+++ b/themes/basis/src/txt.txt
@ -4,7 +4,7 @@
 {{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
 ================================================================================

-{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
+{{> section/info }}

 {{> section/skills }}

@ -12,12 +12,22 @@

 {{> section/projects }}

+{{> section/governance }}
+
 {{> section/education }}

+{{> section/affiliation }}
+
 {{> section/samples }}

 {{> section/writing }}

+{{> section/reading }}
+
 {{> section/service }}

 {{> section/recognition }}
+
+{{> section/references }}
+
+{{> section/interests }}
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@ -5,300 +5,8 @@
  {{> doc-properties }}
  {{> doc-fonts }}
  {{> doc-lists }}
-  <w:styles>
-    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
-      <w:name w:val="Normal"/>
-      <w:rsid w:val="002743C8"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <wx:font wx:val="Calibri"/>
-        <w:sz-cs w:val="20"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-      <w:pPr>
-        <w:jc w:val="both"/>
-      </w:pPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Heading1">
-      <w:name w:val="heading 1"/>
-      <wx:uiName wx:val="Heading 1"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="Heading1Char"/>
-      <w:rsid w:val="00505903"/>
-      <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="off"/>
-        <w:outlineLvl w:val="0"/>
-        <w:pBdr>
-          <w:bottom w:val="single" w:sz="6" w:space="1" w:color="auto" />
-        </w:pBdr>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <!-- <w:color w:val="AEAAAA"/> -->
-        <w:kern w:val="20"/>
-        <w:sz w:val="20"/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Heading2">
-      <w:name w:val="heading 2"/>
-      <wx:uiName wx:val="Heading 2"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="Heading2Char"/>
-      <w:rsid w:val="00505903"/>
-      <w:pPr>
-        <w:spacing w:before="60"/>
-        <w:outlineLvl w:val="1"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <w:caps/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Heading3">
-      <w:name w:val="heading 3"/>
-      <wx:uiName wx:val="Heading 3"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="Heading3Char"/>
-      <w:rsid w:val="001B7422"/>
-      <w:pPr>
-        <w:spacing w:before="240" w:after="100" w:after-autospacing="on"/>
-        <w:outlineLvl w:val="2"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
-      <w:name w:val="Default Paragraph Font"/>
-    </w:style>
-    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
-      <w:name w:val="Normal Table"/>
-      <wx:uiName wx:val="Table Normal"/>
-      <w:rPr>
-        <wx:font wx:val="Times New Roman"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-      <w:tblPr>
-        <w:tblInd w:w="0" w:type="dxa"/>
-        <w:tblCellMar>
-          <w:top w:w="0" w:type="dxa"/>
-          <w:left w:w="108" w:type="dxa"/>
-          <w:bottom w:w="0" w:type="dxa"/>
-          <w:right w:w="108" w:type="dxa"/>
-        </w:tblCellMar>
-      </w:tblPr>
-    </w:style>
-    <w:style w:type="list" w:default="on" w:styleId="NoList">
-      <w:name w:val="No List"/>
-    </w:style>
-    <w:style w:type="character" w:styleId="Hyperlink">
-      <w:name w:val="Hyperlink"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:strike w:val="off"/>
-        <w:dstrike w:val="off"/>
-        <w:color w:val="0064BD"/>
-        <w:u w:val="none"/>
-        <w:effect w:val="none"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="FollowedHyperlink">
-      <w:name w:val="FollowedHyperlink"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:strike w:val="off"/>
-        <w:dstrike w:val="off"/>
-        <w:color w:val="7B0796"/>
-        <w:u w:val="none"/>
-        <w:effect w:val="none"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading2Char">
-      <w:name w:val="Heading 2 Char"/>
-      <w:link w:val="Heading2"/>
-      <w:rsid w:val="00505903"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <w:caps/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading3Char">
-      <w:name w:val="Heading 3 Char"/>
-      <w:link w:val="Heading3"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
-        <w:color w:val="1F4D78"/>
-        <w:sz w:val="20"/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="NormalWeb">
-      <w:name w:val="Normal (Web)"/>
-      <w:basedOn w:val="Normal"/>
-      <w:rsid w:val="001B7422"/>
-      <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
-        <w:jc w:val="both"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading1Char">
-      <w:name w:val="Heading 1 Char"/>
-      <w:link w:val="Heading1"/>
-      <w:rsid w:val="00505903"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <w:color w:val="AEAAAA"/>
-        <w:kern w:val="36"/>
-        <w:sz w:val="20"/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Strong">
-      <w:name w:val="Strong"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:b/>
-        <w:b-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Emphasis">
-      <w:name w:val="Emphasis"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:i/>
-        <w:i-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="tenure">
-      <w:name w:val="tenure"/>
-      <w:basedOn w:val="DefaultParagraphFont"/>
-      <w:rsid w:val="001B7422"/>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Title">
-      <w:name w:val="Title"/>
-      <w:basedOn w:val="Normal"/>
-      <w:next w:val="Normal"/>
-      <w:link w:val="TitleChar"/>
-      <w:rsid w:val="002D3B7B"/>
-      <w:pPr>
-        <w:contextualSpacing/>
-      </w:pPr>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
-        <wx:font wx:val="Calibri Light"/>
-        <!-- <w:caps/> -->
-        <w:spacing w:val="-10"/>
-        <w:kern w:val="28"/>
-        <w:sz w:val="20"/>
-        <w:sz-cs w:val="20"/>
-        <w:caps/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="TitleChar">
-      <w:name w:val="Title Char"/>
-      <w:link w:val="Title"/>
-      <w:rsid w:val="002D3B7B"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
-        <!-- <w:caps/> -->
-        <w:spacing w:val="-10"/>
-        <w:kern w:val="28"/>
-        <w:sz w:val="20"/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="ListParagraph">
-      <w:name w:val="List Paragraph"/>
-      <w:basedOn w:val="Normal"/>
-      <w:rsid w:val="00C146CA"/>
-      <w:pPr>
-        <w:ind w:left="720"/>
-        <w:contextualSpacing/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Summary">
-      <w:name w:val="Summary"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="SummaryChar"/>
-      <w:rsid w:val="00A210E1"/>
-      <w:pPr>
-        <w:spacing w:before="120"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="SummaryChar">
-      <w:name w:val="Summary Char"/>
-      <w:link w:val="Summary"/>
-      <w:rsid w:val="00A210E1"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:sz-cs w:val="20"/>
-      </w:rPr>
-    </w:style>
-  </w:styles>
-  <w:docPr>
-    <w:view w:val="print"/>
-    <w:zoom w:percent="98"/>
-    <w:doNotEmbedSystemFonts/>
-    <w:defaultTabStop w:val="720"/>
-    <w:characterSpacingControl w:val="DontCompress"/>
-    <w:webPageEncoding w:val="unicode"/>
-    <w:optimizeForBrowser/>
-    <w:allowPNG/>
-    <w:validateAgainstSchema/>
-    <w:saveInvalidXML w:val="off"/>
-    <w:ignoreMixedContent w:val="off"/>
-    <w:alwaysShowPlaceholderText w:val="off"/>
-    <w:compat>
-      <w:breakWrappedTables/>
-    </w:compat>
-    <wsp:rsids>
-      <wsp:rsidRoot wsp:val="00C146CA"/>
-      <wsp:rsid wsp:val="000A3AF0"/>
-      <wsp:rsid wsp:val="001B7422"/>
-      <wsp:rsid wsp:val="002743C8"/>
-      <wsp:rsid wsp:val="002865F0"/>
-      <wsp:rsid wsp:val="002D3B7B"/>
-      <wsp:rsid wsp:val="00397D4D"/>
-      <wsp:rsid wsp:val="00437135"/>
-      <wsp:rsid wsp:val="00505903"/>
-      <wsp:rsid wsp:val="00606071"/>
-      <wsp:rsid wsp:val="006C2CFB"/>
-      <wsp:rsid wsp:val="00771B3E"/>
-      <wsp:rsid wsp:val="007D096C"/>
-      <wsp:rsid wsp:val="009452CA"/>
-      <wsp:rsid wsp:val="00A210E1"/>
-      <wsp:rsid wsp:val="00B43FDC"/>
-      <wsp:rsid wsp:val="00C146CA"/>
-      <wsp:rsid wsp:val="00C77315"/>
-      <wsp:rsid wsp:val="00CD3781"/>
-      <wsp:rsid wsp:val="00E578D4"/>
-      <wsp:rsid wsp:val="00EA0B64"/>
-      <wsp:rsid wsp:val="00FE101B"/>
-    </wsp:rsids>
-  </w:docPr>
+  {{> doc-styles }}
+  {{> doc-pr }}
  <w:body>
    <wx:sect>
      <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="007D096C" wsp:rsidP="00C146CA">
@ -309,11 +17,7 @@
          </w:tabs>
        </w:pPr>
        <w:r>
-          <w:rPr>
-            <w:sz w:val="28"/>
-            <w:b/>
-          </w:rPr>
-          <w:t>{{ r.name }}</w:t>
+          <w:t>{{{ r.name }}}</w:t>
        </w:r>
        <w:r>
          <w:tab/>
@ -324,7 +28,7 @@
              <w:rStyle w:val="Hyperlink"/>
              <w:sz-cs w:val="20"/>
            </w:rPr>
-            <w:t>{{ r.contact.email }}</w:t>
+            <w:t>{{{ r.contact.email }}}</w:t>
          </w:r>
        </w:hlink>
        <w:r>
@ -337,7 +41,7 @@
          <w:rPr>
            <w:sz-cs w:val="20"/>
          </w:rPr>
-          <w:t>{{ r.contact.phone }}</w:t>
+          <w:t>{{{ r.contact.phone }}}</w:t>
        </w:r>
        <w:r>
          <w:rPr>
@ -359,10 +63,16 @@
      {{#section "skills"}}{{> skills }}{{/section}}
      {{#section "employment"}}{{> section/employment }}{{/section}}
      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "governance"}}{{> section/governance }}{{/section}}
+      {{#section "affiliation"}}{{> section/affiliation }}{{/section}}
      {{#section "education"}}{{> section/education }}{{/section}}
      {{#section "service"}}{{> section/service }}{{/section}}
      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "speaking"}}{{> section/speaking }}{{/section}}
+      {{#section "reading"}}{{> section/reading }}{{/section}}
      {{#section "recognition"}}{{> section/recognition }}{{/section}}
+      {{#section "references"}}{{> section/references }}{{/section}}
+      {{#section "interests"}}{{> section/interests }}{{/section}}
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/compact/src/compact-html.css
+++ b/themes/compact/src/compact-html.css
@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
+  font-family: {{{fontList 'default'}}};
  font-size: 12px;
  margin: 0; padding: 0;
  display: block;
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@ -3,8 +3,8 @@
  <head>
    <meta charset="utf-8">
    <title>{{ RAW.name }}</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{{styleSheet "html.css"}}}
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+    {{{styleSheet "compact-html.css"}}}
  </head>
  <body>
    <main>
@ -26,14 +26,18 @@
 {{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
 {{#*inline "icon-employment"}}<span class="fa fa-building"></span>{{/inline}}
 {{#*inline "icon-projects"}}<span class="fa fa-star"></span>{{/inline}}
+{{#*inline "icon-governance"}}<span class="fa fa-balance-scale"></span>{{/inline}}
 {{#*inline "icon-education"}}<span class="fa fa-mortar-board"></span>{{/inline}}
 {{#*inline "icon-service"}}<span class="fa fa-child"></span>{{/inline}}
+{{#*inline "icon-affiliation"}}<span class="fa fa-share-alt"></span>{{/inline}}
 {{#*inline "icon-samples"}}<span class="fa fa-share"></span>{{/inline}}
 {{#*inline "icon-writing"}}<span class="fa fa-pencil"></span>{{/inline}}
+{{#*inline "icon-reading"}}<span class="fa fa-book"></span>{{/inline}}
 {{#*inline "icon-recognition"}}<span class="fa fa-trophy"></span>{{/inline}}
 {{#*inline "icon-speaking"}}<span class="fa fa-users"></span>{{/inline}}
-{{#*inline "icon-testimonials"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-testimonials"}}<span class="fa fa-quote-right"></span>{{/inline}}
 {{#*inline "icon-references"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-interests"}}<span class="fa fa-bicycle"></span>{{/inline}}

 {{#*inline "body-employment" }}
 <div>
@ -77,23 +81,23 @@

 -->}}

-{{#has "info.brief"}}
-<section id="summary">
-  {{{ r.info.brief }}}
-</section>
-{{/has}}
-
+{{#*inline "header-info"}}{{/inline}}
+{{> section/info }}
 {{> section/skills _icon="icon-skills"}}
 {{> section/employment _icon="icon-employment"}}
 {{> section/projects _icon="icon-projects"}}
+{{> section/governance _icon="icon-governance"}}
 {{> section/education _icon="icon-education"}}
 {{> section/service _icon="icon-service"}}
+{{> section/affiliation _icon="icon-affiliation"}}
 {{> section/samples _icon="icon-samples"}}
 {{> section/writing _icon="icon-writing"}}
+{{> section/reading _icon="icon-reading"}}
 {{> section/recognition _icon="icon-recognition"}}
 {{> section/speaking _icon="icon-speaking"}}
 {{> section/testimonials _icon="icon-testimonials"}}
 {{> section/references _icon="icon-references"}}
+{{> section/interests _icon="icon-interests"}}

    </main>
  </body>
--- a/themes/compact/src/compact-pdf.css
+++ b/themes/compact/src/compact-pdf.css
@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
+  font-family: {{{fontList 'default'}}};
  font-size: 12px;
  margin: 0; padding: 0;
  display: block;
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@ -2,10 +2,9 @@
 <html>
  <head>
    <meta charset="utf-8">
-    <title>{{ r.name }}</title>
-    <style>
-    {{{ cssInfo.data }}}
-    </style>
+    <title>{{ RAW.name }}</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{{styleSheet "compact-html.css"}}}
  </head>
  <body>
    <main>
@ -18,7 +17,67 @@
        </div>
      </header>

+{{!<!--

+  INLINE TEMPLATE DEFINITIONS
+
+-->}}
+
+{{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
+{{#*inline "icon-employment"}}<span class="fa fa-building"></span>{{/inline}}
+{{#*inline "icon-projects"}}<span class="fa fa-star"></span>{{/inline}}
+{{#*inline "icon-education"}}<span class="fa fa-mortar-board"></span>{{/inline}}
+{{#*inline "icon-service"}}<span class="fa fa-child"></span>{{/inline}}
+{{#*inline "icon-samples"}}<span class="fa fa-share"></span>{{/inline}}
+{{#*inline "icon-writing"}}<span class="fa fa-pencil"></span>{{/inline}}
+{{#*inline "icon-reading"}}<span class="fa fa-book"></span>{{/inline}}
+{{#*inline "icon-recognition"}}<span class="fa fa-trophy"></span>{{/inline}}
+{{#*inline "icon-speaking"}}<span class="fa fa-users"></span>{{/inline}}
+{{#*inline "icon-testimonials"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-references"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-interests"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+
+{{#*inline "body-employment" }}
+<div>
+  <h3><em>{{ position }}</em>,
+    {{#if url }}
+    <a href="{{{ url }}}">{{ employer }}</a>
+    {{else}}
+    {{ employer }}
+    {{/if}}
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+  <p>{{{ summary }}}</p>
+  {{> highlights }}
+  {{#if keywords}}
+  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+  {{/if}}
+</div>
+{{/inline}}
+
+{{#*inline "body-projects" }}
+<div>
+  <h3><em>{{ role }}</em>,
+    {{#if url }}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+  <p>{{{ summary }}}</p>
+  {{> highlights }}
+  {{#if keywords}}
+  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+  {{/if}}
+</div>
+{{/inline}}
+
+{{!<!--
+
+  RESUME SECTIONS
+
+-->}}

 {{#has "info.brief"}}
 <section id="summary">
@ -26,49 +85,19 @@
 </section>
 {{/has}}

-
-
-{{!<!--
-  Use predefined global partials for the other sections.
-
-  The "inline" bit before each section allows us to pass a custom heading
-  icon into the global partial. For this theme, we're using Font Awesome.
-->}}
-
-{{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-{{> section/skills }}
-
-{{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-{{> section/employment }}
-
-{{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-{{> section/projects }}
-
-{{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-{{> section/education }}
-
-{{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
-{{> section/service }}
-
-{{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
-{{> section/samples }}
-
-{{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
-{{> section/writing }}
-
-{{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
-{{> section/recognition }}
-
-{{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
-{{> section/speaking }}
-
-{{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-{{> section/testimonials }}
-
-{{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-{{> section/references }}
-
-
+{{> section/skills _icon="icon-skills"}}
+{{> section/employment _icon="icon-employment"}}
+{{> section/projects _icon="icon-projects"}}
+{{> section/education _icon="icon-education"}}
+{{> section/service _icon="icon-service"}}
+{{> section/samples _icon="icon-samples"}}
+{{> section/writing _icon="icon-writing"}}
+{{> section/reading _icon="icon-reading"}}
+{{> section/recognition _icon="icon-recognition"}}
+{{> section/speaking _icon="icon-speaking"}}
+{{> section/testimonials _icon="icon-testimonials"}}
+{{> section/references _icon="icon-references"}}
+{{> section/interests _icon="icon-interests"}}

    </main>
  </body>
--- a/themes/compact/theme.json
+++ b/themes/compact/theme.json
@ -6,5 +6,30 @@
  "inherits": {
    "txt": "basis",
    "md": "basis"
+  },
+  "fonts": {
+    "all": {
+      "default": ["Calibri", "Helvetica Neue", "Helvetica", "Segoe UI", "sans-serif"],
+      "title": [ "Calibri" ],
+      "heading3": [ "Calibri" ]
+    },
+    "doc": {
+      "default": {
+        "name": "Calibri",
+        "size": 20
+      },
+      "heading1": {
+        "name": "Calibri",
+        "size": 20
+      },
+      "heading3": {
+        "name": "Calibri",
+        "size": 20
+      },
+      "title": {
+        "name": "Calibri",
+        "size": 20
+      }
+    }
  }
 }
--- a/themes/hello-world/README.md
+++ b/themes/hello-world/README.md
@ -1,9 +0,0 @@
-Theme: Hello-World
-==================
-A simple résumé theme for example purposes.
-
-## License
-
-MIT. See [LICENSE.md][lic] for details.
-
-[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/hello-world/src/doc.xml
+++ b/themes/hello-world/src/doc.xml
@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-{{!
-A simple-as-possible WORD/DOC template for the "Hello World" theme.
-Uses the MS Word 2003 XML format.
-}}
-<?mso-application progid="Word.Document"?>
-<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.name }}</o:Author>
-    <o:LastAuthor>{{ r.name }}</o:LastAuthor>
-    <o:Revision>1</o:Revision>
-    <o:TotalTime>2</o:TotalTime>
-    <o:Created>2015-10-08T04:10:00Z</o:Created>
-    <o:LastSaved>2015-10-08T04:12:00Z</o:LastSaved>
-    <o:Pages>1</o:Pages>
-    <o:Words>5</o:Words>
-    <o:Characters>34</o:Characters>
-    <o:Lines>1</o:Lines>
-    <o:Paragraphs>1</o:Paragraphs>
-    <o:CharactersWithSpaces>38</o:CharactersWithSpaces>
-    <o:Version>15</o:Version>
-  </o:DocumentProperties>
-  <w:fonts>
-    <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
-    <w:font w:name="Times New Roman">
-      <w:panose-1 w:val="02020603050405020304"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Roman"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
-    </w:font>
-    <w:font w:name="Cambria Math">
-      <w:panose-1 w:val="02040503050406030204"/>
-      <w:charset w:val="01"/>
-      <w:family w:val="Roman"/>
-      <w:notTrueType/>
-      <w:pitch w:val="variable"/>
-    </w:font>
-    <w:font w:name="Segoe UI">
-      <w:panose-1 w:val="020B0502040204020203"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Swiss"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="E10022FF" w:usb-1="C000E47F" w:usb-2="00000029" w:usb-3="00000000" w:csb-0="000001DF" w:csb-1="00000000"/>
-    </w:font>
-  </w:fonts>
-  <w:styles>
-    <w:versionOfBuiltInStylenames w:val="7"/>
-    <w:latentStyles w:defLockedState="off" w:latentStyleCount="371">
-      <w:lsdException w:name="Normal"/>
-      <w:lsdException w:name="heading 1"/>
-      <w:lsdException w:name="heading 2"/>
-      <w:lsdException w:name="heading 3"/>
-      <w:lsdException w:name="heading 4"/>
-      <w:lsdException w:name="heading 5"/>
-      <w:lsdException w:name="heading 6"/>
-      <w:lsdException w:name="heading 7"/>
-      <w:lsdException w:name="heading 8"/>
-      <w:lsdException w:name="heading 9"/>
-      <w:lsdException w:name="caption"/>
-      <w:lsdException w:name="Title"/>
-      <w:lsdException w:name="Subtitle"/>
-      <w:lsdException w:name="Strong"/>
-      <w:lsdException w:name="Emphasis"/>
-      <w:lsdException w:name="Normal Table"/>
-      <w:lsdException w:name="Table Simple 1"/>
-      <w:lsdException w:name="Table Simple 2"/>
-      <w:lsdException w:name="Table Simple 3"/>
-      <w:lsdException w:name="Table Classic 1"/>
-      <w:lsdException w:name="Table Classic 2"/>
-      <w:lsdException w:name="Table Classic 3"/>
-      <w:lsdException w:name="Table Classic 4"/>
-      <w:lsdException w:name="Table Colorful 1"/>
-      <w:lsdException w:name="Table Colorful 2"/>
-      <w:lsdException w:name="Table Colorful 3"/>
-      <w:lsdException w:name="Table Columns 1"/>
-      <w:lsdException w:name="Table Columns 2"/>
-      <w:lsdException w:name="Table Columns 3"/>
-      <w:lsdException w:name="Table Columns 4"/>
-      <w:lsdException w:name="Table Columns 5"/>
-      <w:lsdException w:name="Table Grid 1"/>
-      <w:lsdException w:name="Table Grid 2"/>
-      <w:lsdException w:name="Table Grid 3"/>
-      <w:lsdException w:name="Table Grid 4"/>
-      <w:lsdException w:name="Table Grid 5"/>
-      <w:lsdException w:name="Table Grid 6"/>
-      <w:lsdException w:name="Table Grid 7"/>
-      <w:lsdException w:name="Table Grid 8"/>
-      <w:lsdException w:name="Table List 1"/>
-      <w:lsdException w:name="Table List 2"/>
-      <w:lsdException w:name="Table List 3"/>
-      <w:lsdException w:name="Table List 4"/>
-      <w:lsdException w:name="Table List 5"/>
-      <w:lsdException w:name="Table List 6"/>
-      <w:lsdException w:name="Table List 7"/>
-      <w:lsdException w:name="Table List 8"/>
-      <w:lsdException w:name="Table 3D effects 1"/>
-      <w:lsdException w:name="Table 3D effects 2"/>
-      <w:lsdException w:name="Table 3D effects 3"/>
-      <w:lsdException w:name="Table Contemporary"/>
-      <w:lsdException w:name="Table Elegant"/>
-      <w:lsdException w:name="Table Professional"/>
-      <w:lsdException w:name="Table Subtle 1"/>
-      <w:lsdException w:name="Table Subtle 2"/>
-      <w:lsdException w:name="Table Web 1"/>
-      <w:lsdException w:name="Table Web 2"/>
-      <w:lsdException w:name="Table Web 3"/>
-      <w:lsdException w:name="Table Theme"/>
-      <w:lsdException w:name="Placeholder Text"/>
-      <w:lsdException w:name="No Spacing"/>
-      <w:lsdException w:name="Light Shading"/>
-      <w:lsdException w:name="Light List"/>
-      <w:lsdException w:name="Light Grid"/>
-      <w:lsdException w:name="Medium Shading 1"/>
-      <w:lsdException w:name="Medium Shading 2"/>
-      <w:lsdException w:name="Medium List 1"/>
-      <w:lsdException w:name="Medium List 2"/>
-      <w:lsdException w:name="Medium Grid 1"/>
-      <w:lsdException w:name="Medium Grid 2"/>
-      <w:lsdException w:name="Medium Grid 3"/>
-      <w:lsdException w:name="Dark List"/>
-      <w:lsdException w:name="Colorful Shading"/>
-      <w:lsdException w:name="Colorful List"/>
-      <w:lsdException w:name="Colorful Grid"/>
-      <w:lsdException w:name="Light Shading Accent 1"/>
-      <w:lsdException w:name="Light List Accent 1"/>
-      <w:lsdException w:name="Light Grid Accent 1"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 1"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 1"/>
-      <w:lsdException w:name="Medium List 1 Accent 1"/>
-      <w:lsdException w:name="Revision"/>
-      <w:lsdException w:name="List Paragraph"/>
-      <w:lsdException w:name="Quote"/>
-      <w:lsdException w:name="Intense Quote"/>
-      <w:lsdException w:name="Medium List 2 Accent 1"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 1"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 1"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 1"/>
-      <w:lsdException w:name="Dark List Accent 1"/>
-      <w:lsdException w:name="Colorful Shading Accent 1"/>
-      <w:lsdException w:name="Colorful List Accent 1"/>
-      <w:lsdException w:name="Colorful Grid Accent 1"/>
-      <w:lsdException w:name="Light Shading Accent 2"/>
-      <w:lsdException w:name="Light List Accent 2"/>
-      <w:lsdException w:name="Light Grid Accent 2"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 2"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 2"/>
-      <w:lsdException w:name="Medium List 1 Accent 2"/>
-      <w:lsdException w:name="Medium List 2 Accent 2"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 2"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 2"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 2"/>
-      <w:lsdException w:name="Dark List Accent 2"/>
-      <w:lsdException w:name="Colorful Shading Accent 2"/>
-      <w:lsdException w:name="Colorful List Accent 2"/>
-      <w:lsdException w:name="Colorful Grid Accent 2"/>
-      <w:lsdException w:name="Light Shading Accent 3"/>
-      <w:lsdException w:name="Light List Accent 3"/>
-      <w:lsdException w:name="Light Grid Accent 3"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 3"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 3"/>
-      <w:lsdException w:name="Medium List 1 Accent 3"/>
-      <w:lsdException w:name="Medium List 2 Accent 3"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 3"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 3"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 3"/>
-      <w:lsdException w:name="Dark List Accent 3"/>
-      <w:lsdException w:name="Colorful Shading Accent 3"/>
-      <w:lsdException w:name="Colorful List Accent 3"/>
-      <w:lsdException w:name="Colorful Grid Accent 3"/>
-      <w:lsdException w:name="Light Shading Accent 4"/>
-      <w:lsdException w:name="Light List Accent 4"/>
-      <w:lsdException w:name="Light Grid Accent 4"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 4"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 4"/>
-      <w:lsdException w:name="Medium List 1 Accent 4"/>
-      <w:lsdException w:name="Medium List 2 Accent 4"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 4"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 4"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 4"/>
-      <w:lsdException w:name="Dark List Accent 4"/>
-      <w:lsdException w:name="Colorful Shading Accent 4"/>
-      <w:lsdException w:name="Colorful List Accent 4"/>
-      <w:lsdException w:name="Colorful Grid Accent 4"/>
-      <w:lsdException w:name="Light Shading Accent 5"/>
-      <w:lsdException w:name="Light List Accent 5"/>
-      <w:lsdException w:name="Light Grid Accent 5"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 5"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 5"/>
-      <w:lsdException w:name="Medium List 1 Accent 5"/>
-      <w:lsdException w:name="Medium List 2 Accent 5"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 5"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 5"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 5"/>
-      <w:lsdException w:name="Dark List Accent 5"/>
-      <w:lsdException w:name="Colorful Shading Accent 5"/>
-      <w:lsdException w:name="Colorful List Accent 5"/>
-      <w:lsdException w:name="Colorful Grid Accent 5"/>
-      <w:lsdException w:name="Light Shading Accent 6"/>
-      <w:lsdException w:name="Light List Accent 6"/>
-      <w:lsdException w:name="Light Grid Accent 6"/>
-      <w:lsdException w:name="Medium Shading 1 Accent 6"/>
-      <w:lsdException w:name="Medium Shading 2 Accent 6"/>
-      <w:lsdException w:name="Medium List 1 Accent 6"/>
-      <w:lsdException w:name="Medium List 2 Accent 6"/>
-      <w:lsdException w:name="Medium Grid 1 Accent 6"/>
-      <w:lsdException w:name="Medium Grid 2 Accent 6"/>
-      <w:lsdException w:name="Medium Grid 3 Accent 6"/>
-      <w:lsdException w:name="Dark List Accent 6"/>
-      <w:lsdException w:name="Colorful Shading Accent 6"/>
-      <w:lsdException w:name="Colorful List Accent 6"/>
-      <w:lsdException w:name="Colorful Grid Accent 6"/>
-      <w:lsdException w:name="Subtle Emphasis"/>
-      <w:lsdException w:name="Intense Emphasis"/>
-      <w:lsdException w:name="Subtle Reference"/>
-      <w:lsdException w:name="Intense Reference"/>
-      <w:lsdException w:name="Book Title"/>
-      <w:lsdException w:name="Bibliography"/>
-      <w:lsdException w:name="TOC Heading"/>
-      <w:lsdException w:name="Plain Table 1"/>
-      <w:lsdException w:name="Plain Table 2"/>
-      <w:lsdException w:name="Plain Table 3"/>
-      <w:lsdException w:name="Plain Table 4"/>
-      <w:lsdException w:name="Plain Table 5"/>
-      <w:lsdException w:name="Grid Table Light"/>
-      <w:lsdException w:name="Grid Table 1 Light"/>
-      <w:lsdException w:name="Grid Table 2"/>
-      <w:lsdException w:name="Grid Table 3"/>
-      <w:lsdException w:name="Grid Table 4"/>
-      <w:lsdException w:name="Grid Table 5 Dark"/>
-      <w:lsdException w:name="Grid Table 6 Colorful"/>
-      <w:lsdException w:name="Grid Table 7 Colorful"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 1"/>
-      <w:lsdException w:name="Grid Table 2 Accent 1"/>
-      <w:lsdException w:name="Grid Table 3 Accent 1"/>
-      <w:lsdException w:name="Grid Table 4 Accent 1"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 1"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 1"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 1"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 2"/>
-      <w:lsdException w:name="Grid Table 2 Accent 2"/>
-      <w:lsdException w:name="Grid Table 3 Accent 2"/>
-      <w:lsdException w:name="Grid Table 4 Accent 2"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 2"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 2"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 2"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 3"/>
-      <w:lsdException w:name="Grid Table 2 Accent 3"/>
-      <w:lsdException w:name="Grid Table 3 Accent 3"/>
-      <w:lsdException w:name="Grid Table 4 Accent 3"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 3"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 3"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 3"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 4"/>
-      <w:lsdException w:name="Grid Table 2 Accent 4"/>
-      <w:lsdException w:name="Grid Table 3 Accent 4"/>
-      <w:lsdException w:name="Grid Table 4 Accent 4"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 4"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 4"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 4"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 5"/>
-      <w:lsdException w:name="Grid Table 2 Accent 5"/>
-      <w:lsdException w:name="Grid Table 3 Accent 5"/>
-      <w:lsdException w:name="Grid Table 4 Accent 5"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 5"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 5"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 5"/>
-      <w:lsdException w:name="Grid Table 1 Light Accent 6"/>
-      <w:lsdException w:name="Grid Table 2 Accent 6"/>
-      <w:lsdException w:name="Grid Table 3 Accent 6"/>
-      <w:lsdException w:name="Grid Table 4 Accent 6"/>
-      <w:lsdException w:name="Grid Table 5 Dark Accent 6"/>
-      <w:lsdException w:name="Grid Table 6 Colorful Accent 6"/>
-      <w:lsdException w:name="Grid Table 7 Colorful Accent 6"/>
-      <w:lsdException w:name="List Table 1 Light"/>
-      <w:lsdException w:name="List Table 2"/>
-      <w:lsdException w:name="List Table 3"/>
-      <w:lsdException w:name="List Table 4"/>
-      <w:lsdException w:name="List Table 5 Dark"/>
-      <w:lsdException w:name="List Table 6 Colorful"/>
-      <w:lsdException w:name="List Table 7 Colorful"/>
-      <w:lsdException w:name="List Table 1 Light Accent 1"/>
-      <w:lsdException w:name="List Table 2 Accent 1"/>
-      <w:lsdException w:name="List Table 3 Accent 1"/>
-      <w:lsdException w:name="List Table 4 Accent 1"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 1"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 1"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 1"/>
-      <w:lsdException w:name="List Table 1 Light Accent 2"/>
-      <w:lsdException w:name="List Table 2 Accent 2"/>
-      <w:lsdException w:name="List Table 3 Accent 2"/>
-      <w:lsdException w:name="List Table 4 Accent 2"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 2"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 2"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 2"/>
-      <w:lsdException w:name="List Table 1 Light Accent 3"/>
-      <w:lsdException w:name="List Table 2 Accent 3"/>
-      <w:lsdException w:name="List Table 3 Accent 3"/>
-      <w:lsdException w:name="List Table 4 Accent 3"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 3"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 3"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 3"/>
-      <w:lsdException w:name="List Table 1 Light Accent 4"/>
-      <w:lsdException w:name="List Table 2 Accent 4"/>
-      <w:lsdException w:name="List Table 3 Accent 4"/>
-      <w:lsdException w:name="List Table 4 Accent 4"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 4"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 4"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 4"/>
-      <w:lsdException w:name="List Table 1 Light Accent 5"/>
-      <w:lsdException w:name="List Table 2 Accent 5"/>
-      <w:lsdException w:name="List Table 3 Accent 5"/>
-      <w:lsdException w:name="List Table 4 Accent 5"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 5"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 5"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 5"/>
-      <w:lsdException w:name="List Table 1 Light Accent 6"/>
-      <w:lsdException w:name="List Table 2 Accent 6"/>
-      <w:lsdException w:name="List Table 3 Accent 6"/>
-      <w:lsdException w:name="List Table 4 Accent 6"/>
-      <w:lsdException w:name="List Table 5 Dark Accent 6"/>
-      <w:lsdException w:name="List Table 6 Colorful Accent 6"/>
-      <w:lsdException w:name="List Table 7 Colorful Accent 6"/>
-    </w:latentStyles>
-    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
-      <w:name w:val="Normal"/>
-      <w:rsid w:val="00BA1494"/>
-      <w:pPr>
-        <w:jc w:val="both"/>
-      </w:pPr>
-      <w:rPr>
-        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
-        <wx:font wx:val="Segoe UI"/>
-        <w:sz w:val="22"/>
-        <w:sz-cs w:val="24"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
-      <w:name w:val="Default Paragraph Font"/>
-    </w:style>
-    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
-      <w:name w:val="Normal Table"/>
-      <wx:uiName wx:val="Table Normal"/>
-      <w:rPr>
-        <wx:font wx:val="Times New Roman"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-      <w:tblPr>
-        <w:tblInd w:w="0" w:type="dxa"/>
-        <w:tblCellMar>
-          <w:top w:w="0" w:type="dxa"/>
-          <w:left w:w="108" w:type="dxa"/>
-          <w:bottom w:w="0" w:type="dxa"/>
-          <w:right w:w="108" w:type="dxa"/>
-        </w:tblCellMar>
-      </w:tblPr>
-    </w:style>
-    <w:style w:type="list" w:default="on" w:styleId="NoList">
-      <w:name w:val="No List"/>
-    </w:style>
-  </w:styles>
-  <w:shapeDefaults>
-    <o:shapedefaults v:ext="edit" spidmax="1026"/>
-    <o:shapelayout v:ext="edit">
-      <o:idmap v:ext="edit" data="1"/>
-    </o:shapelayout>
-  </w:shapeDefaults>
-  <w:docPr>
-    <w:view w:val="print"/>
-    <w:zoom w:percent="98"/>
-    <w:proofState w:spelling="clean" w:grammar="clean"/>
-    <w:stylePaneFormatFilter w:val="3F01"/>
-    <w:defaultTabStop w:val="720"/>
-    <w:punctuationKerning/>
-    <w:characterSpacingControl w:val="DontCompress"/>
-    <w:optimizeForBrowser/>
-    <w:allowPNG/>
-    <w:validateAgainstSchema/>
-    <w:saveInvalidXML w:val="off"/>
-    <w:ignoreMixedContent w:val="off"/>
-    <w:alwaysShowPlaceholderText w:val="off"/>
-    <w:compat>
-      <w:breakWrappedTables/>
-      <w:snapToGridInCell/>
-      <w:wrapTextWithPunct/>
-      <w:useAsianBreakRules/>
-      <w:dontGrowAutofit/>
-    </w:compat>
-    <wsp:rsids>
-      <wsp:rsidRoot wsp:val="00DA470D"/>
-      <wsp:rsid wsp:val="00015413"/>
-      <wsp:rsid wsp:val="000E0D53"/>
-      <wsp:rsid wsp:val="002411DB"/>
-      <wsp:rsid wsp:val="002912C4"/>
-      <wsp:rsid wsp:val="002A44CA"/>
-      <wsp:rsid wsp:val="002A467F"/>
-      <wsp:rsid wsp:val="003733BB"/>
-      <wsp:rsid wsp:val="003D24DE"/>
-      <wsp:rsid wsp:val="003F4447"/>
-      <wsp:rsid wsp:val="00463286"/>
-      <wsp:rsid wsp:val="00496876"/>
-      <wsp:rsid wsp:val="004B5D83"/>
-      <wsp:rsid wsp:val="004D539B"/>
-      <wsp:rsid wsp:val="004E2C36"/>
-      <wsp:rsid wsp:val="00572F28"/>
-      <wsp:rsid wsp:val="00593A72"/>
-      <wsp:rsid wsp:val="005A64CC"/>
-      <wsp:rsid wsp:val="005F1E2D"/>
-      <wsp:rsid wsp:val="00627E5E"/>
-      <wsp:rsid wsp:val="006405D9"/>
-      <wsp:rsid wsp:val="00674FDB"/>
-      <wsp:rsid wsp:val="00686448"/>
-      <wsp:rsid wsp:val="00694FC5"/>
-      <wsp:rsid wsp:val="007021D0"/>
-      <wsp:rsid wsp:val="009A6173"/>
-      <wsp:rsid wsp:val="009E797F"/>
-      <wsp:rsid wsp:val="00A4431B"/>
-      <wsp:rsid wsp:val="00AE0403"/>
-      <wsp:rsid wsp:val="00AE257E"/>
-      <wsp:rsid wsp:val="00BA1494"/>
-      <wsp:rsid wsp:val="00BD0C5A"/>
-      <wsp:rsid wsp:val="00C8436B"/>
-      <wsp:rsid wsp:val="00CB5B76"/>
-      <wsp:rsid wsp:val="00D76821"/>
-      <wsp:rsid wsp:val="00D83EBC"/>
-      <wsp:rsid wsp:val="00DA470D"/>
-      <wsp:rsid wsp:val="00DB33A4"/>
-      <wsp:rsid wsp:val="00DD0806"/>
-      <wsp:rsid wsp:val="00E07C79"/>
-      <wsp:rsid wsp:val="00FB0CBC"/>
-      <wsp:rsid wsp:val="00FE5AF8"/>
-      <wsp:rsid wsp:val="00FF5722"/>
-    </wsp:rsids>
-  </w:docPr>
-  <w:body>
-    <wx:sect>
-      <w:p wsp:rsidR="00CB5B76" wsp:rsidRDefault="00DA470D">
-        <w:r>
-          <w:t>Hello, world! My name is {{ r.name }}.</w:t>
-        </w:r>
-      </w:p>
-      <w:sectPr wsp:rsidR="00CB5B76">
-        <w:pgSz w:w="12240" w:h="15840"/>
-        <w:pgMar w:top="1440" w:right="1800" w:bottom="1440" w:left="1800" w:header="720" w:footer="720" w:gutter="0"/>
-        <w:cols w:space="720"/>
-        <w:docGrid w:line-pitch="360"/>
-      </w:sectPr>
-    </wx:sect>
-  </w:body>
-</w:wordDocument>
--- a/themes/hello-world/src/html.css
+++ b/themes/hello-world/src/html.css
@ -1 +0,0 @@
-{{! An empty CSS file. }}
--- a/themes/hello-world/src/html.html
+++ b/themes/hello-world/src/html.html
@ -1,14 +0,0 @@
-<!DOCTYPE html>
-{{! A simple-as-possible HTML template for the "Hello World" theme. }}
-<html style="height: 100%;">
-  <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>
-    {{{styleSheet "css/style.css"}}}
-  </head>
-  <body>
-    <h1>Hello, world! My name is {{ r.name }}</h1>
-  </body>
-</html>
--- a/themes/hello-world/src/latex.tex
+++ b/themes/hello-world/src/latex.tex
@ -1,8 +0,0 @@
-\documentclass{article}
-\title{[[ r.name ]]'s Resume}
-\author{[[ r.name ]]}
-\date{December 2015}
-\begin{document}
-   \maketitle
-   Hello world! My name is [[ r.name ]].
-\end{document}
--- a/themes/hello-world/src/md.txt
+++ b/themes/hello-world/src/md.txt
@ -1,7 +0,0 @@
-{{!
-
-  modern/md.txt
-  A Markdown resume template for FluentCV's "hello-world" theme.
-
-}}
-# Hello, world! My name is {{ r.name }}.
--- a/themes/hello-world/src/pdf.css
+++ b/themes/hello-world/src/pdf.css
@ -1 +0,0 @@
-{{! An empty CSS file. }}
--- a/themes/hello-world/src/pdf.html
+++ b/themes/hello-world/src/pdf.html
@ -1,14 +0,0 @@
-<!DOCTYPE html>
-{{! A simple-as-possible HTML-to-PDF template for the "Hello World" theme. }}
-<html style="height: 100%;">
-  <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 type="text/css" rel="stylesheet" href="css/style.css">
-  </head>
-  <body>
-    <h1>Hello, world! My name is {{ r.name }}</h1>
-  </body>
-</html>
--- a/themes/hello-world/src/txt.txt
+++ b/themes/hello-world/src/txt.txt
@ -1,4 +0,0 @@
-{{!
-A simple-as-possible plain TXT resume template for the "Hello World" theme.
-}}
-Hello, world! My name is {{ r.name }}.
--- a/themes/hello-world/theme.json
+++ b/themes/hello-world/theme.json
@ -1,6 +0,0 @@
-{
-  "title": "hello-world",
-  "description": "An unstyled starter résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
-  "engine": "handlebars"
-}
--- a/themes/modern/src/modern-doc.xml
+++ b/themes/modern/src/modern-doc.xml
@ -37,8 +37,6 @@
      <o:DocumentProperties>
      <w:fonts>
      <w:lists>
-      <w:styles>
-      <w:docPr>

    To do that, we'll use the Handlebars partial syntax and pull in the
    sections one after the other.
@ -48,7 +46,285 @@
  {{> doc-properties }}
  {{> doc-fonts }}
  {{> doc-lists }}
-  {{> doc-styles }}
+
+  {{!<!--
+
+    The <styles> section contains named style definitions for the Word document.
+    Here we can adjust fonts, paragraph settings, and make other stylistic
+    changes specific to the Word format of this resume. There's also a prebuilt
+    section partial we could use here (section/doc-styles) but that would make
+    it difficult to edit invidual styles.
+
+  -->}}
+
+  <w:styles>
+    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
+      <w:name w:val="Normal"/>
+      <w:rsid w:val="002743C8"/>
+      <w:rPr>
+        <w:rFonts w:ascii="{{{fontFace 'default' 'Calibri'}}}" w:h-ansi="{{{fontFace 'default' 'Calibri'}}}"/>
+        <wx:font wx:val="{{{fontFace 'default' 'Calibri'}}}"/>
+        <w:sz-cs w:val="24"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:pPr>
+        <w:jc w:val="both"/>
+      </w:pPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading1">
+      <w:name w:val="heading 1"/>
+      <wx:uiName wx:val="Heading 1"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading1Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:outlineLvl w:val="0"/>
+        <w:pBdr>
+          <w:top w:val="single" w:sz="6" w:space="1" w:color="#EEEEEE" />
+        </w:pBdr>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+        <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="40"/>
+        <w:sz-cs w:val="40"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading2">
+      <w:name w:val="heading 2"/>
+      <wx:uiName wx:val="Heading 2"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading2Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="600"/>
+        <w:outlineLvl w:val="1"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="595959"/>
+        <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+        <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
+        <w:b/>
+        <w:b-cs/>
+        <!-- <w:caps/> -->
+        <w:sz-cs w:val="28"/>
+        <w:sz w:val="28"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading3">
+      <w:name w:val="heading 3"/>
+      <wx:uiName wx:val="Heading 3"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading3Char"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="240" w:after="100" w:after-autospacing="on"/>
+        <w:outlineLvl w:val="2"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="FromTo">
+      <w:name w:val="FromTo"/>
+      <w:rsid w:val="004E2103"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:b w:val="off"/>
+        <w:b-cs/>
+        <w:color w:val="AEAAAA"/>
+        <w:sz w:val="28"/>
+        <w:sz-cs w:val="28"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
+      <w:name w:val="Default Paragraph Font"/>
+    </w:style>
+    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
+      <w:name w:val="Normal Table"/>
+      <wx:uiName wx:val="Table Normal"/>
+      <w:rPr>
+        <wx:font wx:val="Times New Roman"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:tblPr>
+        <w:tblInd w:w="0" w:type="dxa"/>
+        <w:tblCellMar>
+          <w:top w:w="0" w:type="dxa"/>
+          <w:left w:w="108" w:type="dxa"/>
+          <w:bottom w:w="0" w:type="dxa"/>
+          <w:right w:w="108" w:type="dxa"/>
+        </w:tblCellMar>
+      </w:tblPr>
+    </w:style>
+    <w:style w:type="list" w:default="on" w:styleId="NoList">
+      <w:name w:val="No List"/>
+    </w:style>
+    <w:style w:type="character" w:styleId="Hyperlink">
+      <w:name w:val="Hyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="2F5496"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="FollowedHyperlink">
+      <w:name w:val="FollowedHyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="7B0796"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading2Char">
+      <w:name w:val="Heading 2 Char"/>
+      <w:link w:val="Heading2"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+        <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
+        <w:b/>
+        <w:b-cs/>
+        <!-- <w:caps/> -->
+        <w:sz-cs w:val="28"/>
+        <w:sz w:val="28"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading3Char">
+      <w:name w:val="Heading 3 Char"/>
+      <w:link w:val="Heading3"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:rFonts w:ascii="{{{fontFace 'heading3' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading3' 'Calibri'}}}"/>
+        <w:color w:val="1F4D78"/>
+        <w:sz w:val="28"/>
+        <w:sz-cs w:val="28"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="NormalWeb">
+      <w:name w:val="Normal (Web)"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+        <w:jc w:val="both"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading1Char">
+      <w:name w:val="Heading 1 Char"/>
+      <w:link w:val="Heading1"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+        <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="40"/>
+        <w:sz-cs w:val="40"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Strong">
+      <w:name w:val="Strong"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Emphasis">
+      <w:name w:val="Emphasis"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:i/>
+        <w:i-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="tenure">
+      <w:name w:val="tenure"/>
+      <w:basedOn w:val="DefaultParagraphFont"/>
+      <w:rsid w:val="001B7422"/>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Title">
+      <w:name w:val="Title"/>
+      <w:basedOn w:val="Normal"/>
+      <w:next w:val="Normal"/>
+      <w:link w:val="TitleChar"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:pPr>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+        <wx:font wx:val="Segoe UI"/>
+        <w:b/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="TitleChar">
+      <w:name w:val="Title Char"/>
+      <w:link w:val="Title"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="ListParagraph">
+      <w:name w:val="List Paragraph"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="00C146CA"/>
+      <w:pPr>
+        <w:ind w:left="720"/>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Summary">
+      <w:name w:val="Summary"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="SummaryChar"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:pPr>
+        <w:spacing w:before="120"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:color w:val="767171"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="SummaryChar">
+      <w:name w:val="Summary Char"/>
+      <w:link w:val="Summary"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:sz-cs w:val="24"/>
+      </w:rPr>
+    </w:style>
+  </w:styles>
+
  {{> doc-pr }}

  {{!<!--
@ -197,11 +473,16 @@
      -->}}

      {{#*inline "header-projects"}}{{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }}{{/inline}}
+      {{#*inline "header-governance"}}{{> header-icon _title="GOVERNANCE" _section="governance" _icon="pict/justice-scales" }}{{/inline}}
      {{#*inline "header-education"}}{{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}{{/inline}}
      {{#*inline "header-service"}}{{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }}{{/inline}}
+      {{#*inline "header-affiliation"}}{{> header-icon _title="AFFILIATION" _section="affiliation" _icon="pict/share-alt" }}{{/inline}}
      {{#*inline "header-writing"}}{{> header-icon _title="WRITING" _section="writing" _icon="pict/wri" }}{{/inline}}
+      {{#*inline "header-reading"}}{{> header-icon _title="READING" _section="reading" _icon="pict/book" }}{{/inline}}
      {{#*inline "header-recognition"}}{{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }}{{/inline}}
-      {{#*inline "header-speaking"}}{{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }}{{/inline}}
+      {{#*inline "header-speaking"}}{{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/group" }}{{/inline}}
+      {{#*inline "header-references"}}{{> header-icon _title="REFERENCES" _section="references" _icon="pict/thumbs-up" }}{{/inline}}
+      {{#*inline "header-interests"}}{{> header-icon _title="INTERESTS" _section="interests" _icon="pict/bicycle" }}{{/inline}}

      {{!<!--

@ -218,11 +499,16 @@

      {{#section "employment"}}{{> section/employment }}{{/section}}
      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "governance"}}{{> section/governance }}{{/section}}
      {{#section "education"}}{{> section/education }}{{/section}}
      {{#section "service"}}{{> section/service }}{{/section}}
+      {{#section "affiliation"}}{{> section/affiliation }}{{/section}}
      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "writing"}}{{> section/reading }}{{/section}}
      {{#section "recognition"}}{{> section/recognition }}{{/section}}
      {{#section "speaking"}}{{> section/speaking }}{{/section}}
+      {{#section "interests"}}{{> section/interests }}{{/section}}
+      {{#section "references"}}{{> section/references }}{{/section}}

      {{!<!--
        And we're done! Close off the word document and go home.
--- a/themes/modern/src/modern-html.css
+++ b/themes/modern/src/modern-html.css
@ -1,3 +1,10 @@
+{{!
+
+  Templatized CSS file for the Modern theme. Expanded by Handlebars during
+  resume generation.
+
+}}
+
 * {
  box-sizing: border-box;
 }
@ -7,7 +14,7 @@ main {
 }

 body {
-  font-family: 'Helvetica Neue', Helvetica, 'Lato', sans-serif;
+  font-family: {{{fontList 'default'}}};
  font-size: 15px;
  color: #333;
  line-height: 1.42857143;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hacksalot	547d38c766	Adjust header-icon.	2016-01-24 04:49:05 -05:00
hacksalot	0a4e460763	Continue templatizing styles.	2016-01-23 23:30:10 -05:00
hacksalot	d95af3f21e	Themes: Compact: Improve coverage and formatting.	2016-01-23 23:22:31 -05:00
hacksalot	c6d3420854	Partials: Interests: Deglitch.	2016-01-23 23:21:56 -05:00
hacksalot	ff1c2aab26	Partials: DOC: Support configurable fonts/sizes/colors	2016-01-23 23:21:26 -05:00
hacksalot	ac67ff58f6	Capture.	2016-01-23 20:18:40 -05:00
hacksalot	caae22e4b5	Modern: Adjust look and feel.	2016-01-23 08:05:49 -05:00
hacksalot	39dcf37c2a	Partials: DOC: Style section dates.	2016-01-23 08:04:52 -05:00
hacksalot	89496d6361	Add more predefined icon partials.	2016-01-23 08:03:43 -05:00
hacksalot	e9b4d747d7	Theme: Modern: Update font usage.	2016-01-23 06:18:18 -05:00
hacksalot	387e6ff41a	Themes: Modern: Add default "governance" section.	2016-01-23 00:00:26 -05:00
hacksalot	826c1b29f1	Themes: Basis: Add default "governance" section.	2016-01-22 23:59:38 -05:00
hacksalot	bb7f328b05	Introduce "governance" section partials. Fixes #34.	2016-01-22 23:58:59 -05:00
hacksalot	b009861168	Update LICENSE.md.	2016-01-22 10:32:29 -05:00
hacksalot	4137ef7511	Remove "underscore" theme. Relocated to fluentdesk/underscore	2016-01-22 10:32:19 -05:00
hacksalot	8d3b2421e6	Add font defaults where {{fontFace}} is used.	2016-01-22 08:34:36 -05:00
hacksalot	dda332d0ec	Remove "hello-world" theme. Relocated to https://github.com/fluentdesk/fresh-theme-hello-world.	2016-01-22 08:33:56 -05:00
hacksalot	87f4bd2efc	Add "info" section partial.	2016-01-22 05:57:09 -05:00
hacksalot	7a0169e394	Capture.	2016-01-22 04:53:52 -05:00
hacksalot	34cac6d464	Partials: HTML: Rename all to .hbs.	2016-01-22 04:24:42 -05:00
hacksalot	0603dce6af	Partials: DOC: Rename all to .hbs.	2016-01-22 04:18:30 -05:00
hacksalot	3c84a9f17a	Capture.	2016-01-22 02:42:25 -05:00
hacksalot	aabb18d3a6	Gather.	2016-01-21 23:19:53 -05:00
hacksalot	e1d5062364	Drop /partials README.	2016-01-21 07:14:15 -05:00
hacksalot	803e206688	Fix encoding of affiliation nouns.	2016-01-21 00:13:03 -05:00
hacksalot	c52eda62bc	Speaking: Tweak titles & dates.	2016-01-20 19:51:15 -05:00
hacksalot	37bc960d47	TXT: Add missing speaking partial.	2016-01-20 09:52:34 -05:00
hacksalot	685d973307	Positive: Adjust testimonials icon.	2016-01-20 09:17:21 -05:00
hacksalot	46caf0aa7f	Positive: Add "affiliation" section.	2016-01-20 09:17:08 -05:00
hacksalot	961af74305	Modern: Support keywords in education section.	2016-01-20 09:13:46 -05:00
hacksalot	23c2b72e6a	Modern: Change testimonials icon.	2016-01-20 09:13:23 -05:00
hacksalot	eb0d731d55	Introduce affiliation section.	2016-01-20 09:12:53 -05:00
hacksalot	9bf5d43f87	Introduce "reading" section.	2016-01-20 06:23:35 -05:00
hacksalot	76b362c2b8	Update contributors. @evanplaice submit a PR as needed to update or change your contributor info (defaults to what's on your public GH profile). Thanks again. -HAL	2016-01-20 03:58:08 -05:00
hacksalot	3159480379	Bump version to 0.14.0-beta.	2016-01-20 03:55:25 -05:00
hacksalot	e87ba4d40a	Add a few more keywords to package.json.	2016-01-20 03:54:59 -05:00
hacksalot	f92b3ff4e0	DOC: Fix encoding glitch in Writing section.	2016-01-19 23:26:19 -05:00
hacksalot	fe6046a107	Improve "references" coverage. 1. Introduce TXT, MD, and DOC section partials for "references". 2. Reference TXT/MD partials from Basis theme so inherited themes (Modern, Compact, Positive) see the changes.	2016-01-19 23:25:50 -05:00
hacksalot	bc77d70ed5	Modern: Update PDF from HTML.	2016-01-19 21:58:43 -05:00
hacksalot	6fa9cc3c7b	Partials: References: Prevent orphaned comma.	2016-01-15 13:59:45 -05:00
hacksalot	78b2b98c8d	Partials: Recognition: Use conditional link.	2016-01-15 13:59:20 -05:00
hacksalot	e42cd44bb7	Remove extraneous inline style.	2016-01-14 15:46:19 -05:00
hacksalot	ea0d6987cd	Fix encoding glitch in HTML partials.	2016-01-14 15:46:10 -05:00
				`@ -0,0 +1 @@`
				`{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}`