Bump version to 0.15.0-beta.

Awesome: Improve date handling.
Awesome: Adjust whitespace.
2025-07-06 10:11:05 +01:00 · 2016-02-13 22:52:46 -05:00 · 2016-02-13 22:48:52 -05:00 · 2016-02-11 22:00:34 -05:00 · 2016-02-11 10:21:37 -05:00 · 2016-02-11 10:10:10 -05:00
176 changed files with 4143 additions and 5802 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
@ -1,20 +1,35 @@
 fresh-themes
 ============

-*Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
-(through conversion) [JSON Resume][jrs] formats.*
+*Stylized templates for your résumé and/or CV, compatible with [FRESH/FRESCA][f]
+and (through conversion) [JSON Resume][jrs] formats.*

- [positive][t-positive]: A visually dense/compact theme.
- [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].
- [minimist][t-minimist]: An unstyled barebones theme.
- [hello-world][t-hello]: A simple-as-possible example theme.
- New themes weekly.
+FRESH themes are multiformat, Markdown-aware, standards-friendly templates for
+résumés, CVs, and other employment artifacts.
+
+- **Markdown-friendly**. FRESH themes support Markdown and/or HTML formatting
+*across multiple formats*. That means if you **bold something in your resume**
+you will see that style reflected not just in the HTML version, but in the MS
+Word version, and the PDF too.
+
+- **Multiple output formats** including HTML, MS Word, Markdown, LaTeX, plain
+text, and more.
+
+- **Engine-agnostic**. FRESH themes can be built with Handlebars,
+Underscore, and in the future, other template engines such as Liquid.
+
+- **DRY**. FRESH themes rely on partials and theme inheritance in order to
+minimize the amount of duplication and boilerplate you have to wade through
+to design and/or build a modern, multiformat resume.
+
+- **Open and unaffiliated**. Like the [FRESH/FRESCA schema][f] they're based on,
+FRESH themes have no commercial or corporate backing, basis, or bias.

 ## Use

-1. Install [HackMyResume][hmr] or a similar tool.
+1. The quickest way to get started with FRESH themes is to install
+[HackMyResume][hmr]. Installing this repo (fresh-themes) is not required except
+for development purposes.

 2. Create a [FRESH][f] or [JRS][jrs] résumé.

@ -25,15 +40,20 @@ fresh-themes
    hackmyresume BUILD resume.json TO out/resume.all -t positive
    ```

-## Install
+## Predefined FRESH Themes

-The **fresh-themes** repo is automatically installed when you install
-HackMyResume. For development or testing purposes, you can install the
-standalone version via NPM:
+This repository provides canonical versions of a handful of FRESH themes used
+in and installed with HackMyResume. Other FRESH themes may be available on
+GitHub and NPM.

-`[sudo] npm install fresh-themes [--save]`
+- [positive][t-positive]: A visually dense/compact theme.
+- [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].
+- New themes weekly.

-...or fork and clone it from GitHub as usual.
+All FRESH themes in this repo are MIT licensed. You're free to change, modify,
+update, or improve them at will.

 ## How It Works

@ -47,8 +67,8 @@ FRESH theme the same way you would any other template: by intermixing markup
 <p>{{ job.summary }}</p>
 ```

-Run it through a tool, and you get finished markup suitable for display or
-saving as a document:
+Run it through a tool like HackMyResume, and you get finished markup suitable
+for display or saving as a document:

 ```html
 <h3>Ninja</h3>
@ -56,19 +76,12 @@ saving as a document:
 ```

 The only difference between a FRESH theme and your Jekyll blog or MS Word
-template is that FRESH themes are:
+template is the syntax. If you can do `{{ r.name }}` or `{% highlight html %}`
+in a template file you can work with FRESH themes.

- **Multiformat**. Each FRESH theme can declare multiple formats: HTML, Word,
-PDF, Markdown, or other future formats.
- **Markdown-friendly**. All FRESH themes support inline Markdown/HTML
-formatting.
- **Inheritable**. FRESH themes can inherit or "borrow" formats from other
-themes.
- **Agnostic**. FRESH themes don't mandate that you use a particular templating
-engine or style: you can use Handlebars, Underscore, or other engines in the
-future.
-
-If you can do `{{ r.name }}` or `{% highlight html %}` in a template file you can work with FRESH themes.
+For an annotated example of building a FRESH theme for multiple formats
+including HTML, MS Word, and PDF, check out the Modern theme's [HTML][h] and
+[DOC][d] templates.

 ## Structure

@ -86,11 +99,12 @@ in your theme's JSON file.

 ## Contribute

-Contributions are welcome.
+Contributions are encouraged.

 1. Fork, branch, and clone this repository.
 2. Add or edit a theme or make other changes.
 3. Submit a PR.
+4. Ideally, target the `dev` branch with your PR.

 ## License

@ -100,10 +114,12 @@ MIT. See [LICENSE.md][1] for details.
 [2]: https://github.com/fluentdesk/fluentcv
 [3]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
+[h]: https://github.com/fluentdesk/fresh-themes/blob/dev/themes/modern/src/modern-html.html
+[d]: https://github.com/fluentdesk/fresh-themes/blob/dev/themes/modern/src/modern-doc.xml
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
 [t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
-[t-minimist]: 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.12.0-beta",
-  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
+  "version": "0.15.0-beta",
+  "description": "Multiformat themes and templates for your résumé / CV.",
  "repository": {
    "type": "git",
    "url": "https://github.com/fluentdesk/fresh-themes.git"
@ -11,19 +11,28 @@
    "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)"
+  ],
  "license": "MIT",
  "bugs": {
    "url": "https://github.com/fluentdesk/fresh-themes/issues"
--- 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-lists.hbs
+++ b/partials/doc/doc-lists.hbs
@ -0,0 +1,118 @@
+<w:lists>
+  <w:listDef w:listDefId="1">
+    <w:lsid w:val="602C53DD"/>
+    <w:plt w:val="HybridMultilevel"/>
+    <w:tmpl w:val="61849B8C"/>
+    <w:lvl w:ilvl="0" w:tplc="DD7ED086">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="•"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="720" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="1" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="1440" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="2" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="2160" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="3" w:tplc="04090001" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="2880" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="4" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="3600" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="5" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="4320" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="6" w:tplc="04090001" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="5040" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="7" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="5760" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="8" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="6480" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+  </w:listDef>
+  <w:list w:ilfo="1">
+    <w:ilst w:val="1"/>
+  </w:list>
+</w:lists>
--- a/partials/doc/doc-pr.hbs
+++ b/partials/doc/doc-pr.hbs
@ -0,0 +1,41 @@
+<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>
--- a/partials/doc/doc-properties.hbs
+++ b/partials/doc/doc-properties.hbs
@ -0,0 +1,17 @@
+<o:DocumentProperties>
+  <o:Title>Resume for {{ r.name }}</o:Title>
+  <o:Author>{{ r.name }}</o:Author>
+  <o:Keywords>resume;CV</o:Keywords>
+  <o:LastAuthor>{{ r.name }}</o:LastAuthor>
+  <o:Revision>1</o:Revision>
+  <o:TotalTime>60</o:TotalTime>
+  <o:Created>2015-12-16T17:38:00Z</o:Created>
+  <o:LastSaved>2015-12-16T18:32:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>241</o:Words>
+  <o:Characters>1379</o:Characters>
+  <o:Lines>11</o:Lines>
+  <o:Paragraphs>3</o:Paragraphs>
+  <o:CharactersWithSpaces>1617</o:CharactersWithSpaces>
+  <o:Version>15</o:Version>
+</o:DocumentProperties>
--- a/partials/doc/doc-styles.hbs
+++ b/partials/doc/doc-styles.hbs
@ -0,0 +1,253 @@
+<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="{{{color 'heading-border' '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="{{{color 'heading1' 'AEAAAA'}}}"/>
+      <w:kern w:val="36"/>
+      <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">
+    <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="120"/>
+      <w:outlineLvl w:val="1"/>
+    </w:pPr>
+    <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="36"/>
+    </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="{{fontFace 'heading3'}}"/>
+      <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="{{{fontFace 'table' 'Calibri'}}}"/>
+      <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="{{{color 'hyperlink' '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="{{{color 'visited' '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="{{{fontSize 'heading2' 36 'half-point'}}}"/>
+    </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:fareast="{{{fontFace 'heading3' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading3' 'Calibri'}}}" w:cs="{{{fontFace 'heading3' 'Calibri'}}}"/>
+      <w:color w:val="1F4D78"/>
+      <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">
+    <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="{{{fontFace 'default-view-web' '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="{{{color 'heading1' 'AEAAAA'}}}"/>
+      <w:kern w:val="36"/>
+      <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">
+    <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="{{{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="{{{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">
+    <w:name w:val="Title Char"/>
+    <w:link w:val="Title"/>
+    <w:rsid w:val="002D3B7B"/>
+    <w:rPr>
+      <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="{{{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">
+    <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="{{{fontFace 'list-paragraph' '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="{{{fontFace 'summary' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'summary' '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="{{{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
@ -0,0 +1,9 @@
+{{! A simple resume heading. }}
+<w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+  <w:pPr>
+    <w:pStyle w:val="Heading1"/>
+  </w:pPr>
+  <w:r wsp:rsidRPr="00C146CA">
+    <w:t>{{{sectionTitle _title}}}</w:t>
+  </w:r>
+</w:p>
--- a/partials/doc/pict/arrow.hbs
+++ b/partials/doc/pict/arrow.hbs
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000008.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAc9JREFUeNrs2GlPwjAYAOAOcGMVxyHHBIIkgIl+wSj//xdoPDABBY1BYQNRYMI4tnSK8sEg7JItTWy/7eyzvm+vUZqmAZyKB2BWCIiACIiACIiACIiACOgfgHqNq4ub2ivCBdRpPg9GXaF6VmkjnEKmyS91GyZHc8iOyemktmzy/aU2dTiYqL/OTrQVJgBKhwkzX09Z2yjOhl3xWWy/S5PpzNoGk4KxvBmTWRDqP93VWp2xguw3qCmTGZAklm/rvam6gZQyNhk2odQ4L1c3o1nk0+W9bLuXqW/lysPI1b8RuqBOtdpTNlrdPGTHOWgPpLaag9mmNYZJrXNV6Aw1lzW6A6M4kNd7PFssR9OQY+fPMztxzv+zG1w/LjWtWY0uaKSsiBfFRJOZg/0ErTPCzyhgV6MH6suT5Vu3+ZNiHvociZTluczD8qXTvB84qzE/2zN8zg2NXgtxfhqA8eKADWcjpl8ZT6UFRYKZo8KujcXNWpAnyNDC+DuvIZekLbwznCmGHRip42Fu0V28gSDEYepIRQKU+5slvaqSMe4ronQgggcIpKMh73xSk/u4bBT3shHmc7WIEC4gECjwIQog1T2Q8RIWyTKC0IcPyOXyIcAAUAi1CCT2DrUAAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000008.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>
--- 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
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000009.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPlQTFRFv8HDv8HEv8LQv8LSv8zdv8HGv8LKv8HKv8jXv8bVv8LOwczdzcHDycLEwcHDxcHGycLD18bD1cTDzcLDx8HD28jD08LDw8HD1cbDxcHD2czS1czSy8bEw9Dmzdzxz97xydj1xdLqx9Tqy9jszdz7wc7iy9bu0+P/2ef72e//2/X/+djK4czD6dDE89bK4crD99rM997Q/dzO5c7E89TI997T//vd/efX/+HQ++XT//Hd/+3V/+nT///5+/n/+//////75f//6f///f/////s///q8//////1///37/////vo///k4fH/5//////w4+/7//Hk5fH/////unTQ4QAAAQ1JREFUSMft1GtTQUEYB/A/JSlCoXJJUYqKqNwvFaFDquf7f5h0jrMXe3BmvGrGvnp29jc7O/99dkG2BzZ0Q/8/bbVt01vsd+zRlzskbO5a9jqul9OK78woqgfOV6r5kwtpJYCtN726x3a3F4QruYBO5c6NXr0f4pyofiRbWEhqhNxZUiwsJOWx2yfFwkIOwrgwKslClWJUooUqjahUq9NhAUh1Gf2Lik0eAM+HsKsWhCNtLo8iuGSyeIy9sXRW7YTb5qk7ZyFZAoI1o5qTPFdmeVSyFG7LtDwqWYo9MLMls2fmpNRZU+v8pEdc6bNJWJZyv2rRLyGq79jP8lcgRrXiwTzxqFbR53hm/S/jF09ZANBqGaBnAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000009.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>
--- 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/themes/modern/src/partials/education.xml
+++ b/themes/modern/src/partials/education.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}
+  {{#> header-education }}
+  {{> header-simple _title="EDUCATION" _section="education" }}
+  {{/header-education}}

  {{#each r.education.history}}

@ -26,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/education.xml
+++ b/partials/doc/section/education.xml
@ -1,81 +0,0 @@
-<wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "EDUCATION"}}}</w:t>
-    </w:r>
-  </w:p>
-
-  {{#each r.education.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>
-      {{#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>{{ institution }}</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:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
-      </w:r>
-    </w:p>
-    {{#either area studyType }}
-    <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>
-      <w:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ area }}, {{ studyType }}</w:t>
-      </w:r>
-    </w:p>
-    {{/either}}
-
-    {{#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>
-      <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r>
-    </w:p>
-    {{/each}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
--- a/themes/modern/src/partials/employment.xml
+++ b/themes/modern/src/partials/employment.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="EMPLOYMENT" _section="employment" _icon="pict/emp" }}
+  {{#> header-employment }}
+  {{> header-simple _title="EMPLOYMENT" _section="employment" }}
+  {{/header-employment}}

  {{#each r.employment.history}}

@ -29,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">
@ -56,12 +61,6 @@
        </w:rPr>
      </w:pPr>
      {{{wpml this true}}}
-      <!-- <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
    </w:p>
    {{/each}}

--- a/partials/doc/section/employment.xml
+++ b/partials/doc/section/employment.xml
@ -1,84 +0,0 @@
-<wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "EMPLOYMENT"}}}</w:t>
-    </w:r>
-  </w:p>
-
-  {{#each r.employment.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>{{ position }}, </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>{{ employer }}</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: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:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
-    </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:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
-    </w:p>
-    {{/each}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
--- 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/themes/modern/src/partials/projects.xml
+++ b/themes/modern/src/partials/projects.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }}
+  {{#> header-projects }}
+  {{> header-simple _title="PROJECTS" _section="projects" }}
+  {{/header-projects}}

  {{#each r.projects}}

@ -29,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/projects.xml
+++ b/partials/doc/section/projects.xml
@ -1,84 +0,0 @@
-<wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "PROJECTS"}}}</w:t>
-    </w:r>
-  </w:p>
-
-  {{#each r.projects}}
-
-  <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>{{ 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:t>{{dateRange .}}</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:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
-    </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:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
-    </w:p>
-    {{/each}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
--- 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/themes/modern/src/partials/recognition.xml
+++ b/themes/modern/src/partials/recognition.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }}
+  {{#> header-recognition }}
+  {{> header-simple _title="RECOGNITION" _section="recognition" }}
+  {{/header-recognition}}

  {{#each r.recognition}}

@ -26,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/themes/modern/src/partials/service.xml
+++ b/themes/modern/src/partials/service.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }}
+  {{#> header-service }}
+  {{> header-simple _title="SERVICE" _section="service" }}
+  {{/header-service}}

  {{#each r.service.history}}

@ -29,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/service.xml
+++ b/partials/doc/section/service.xml
@ -1,85 +0,0 @@
-<wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "SERVICE"}}}</w:t>
-    </w:r>
-  </w:p>
-
-
-  {{#each r.service.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>{{ position }}, </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: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:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
-    </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:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
-    </w:p>
-    {{/each}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
--- a/partials/doc/section/skills.hbs
+++ b/partials/doc/section/skills.hbs
@ -1,23 +1,9 @@
 <wx:sub-section>

-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00D1523B" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
-    </w:r>
-  </w:p>
+  {{#> header-skills }}
+  {{> header-simple _title="SKILLS" _section="skills" }}
+  {{/header-skills}}

-
-  <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
-    </w:r>
-  </w:p> -->
  <w:tbl>
    <w:tblPr>
      <w:tblW w:w="0" w:type="auto"/>
@ -40,16 +26,6 @@
          <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
        </w:tcPr>
        <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
-          <!-- <w:pPr>
-            <w:jc w:val="right"/>
-          </w:pPr>
-          <w:r>
-            <w:rPr>
-              <w:caps/>
-              <w:color w:val="989898"/>
-            </w:rPr>
-            <w:t>{{ name }}</w:t>
-          </w:r> -->
          <w:r>
            <w:rPr>
              <w:noProof/>
--- a/partials/doc/section/recognition.xml
+++ b/partials/doc/section/recognition.xml
@ -1,16 +1,10 @@
 <wx:sub-section>

-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "RECOGNITION"}}}</w:t>
-    </w:r>
-  </w:p>
+  {{#> header-speaking }}
+  {{> header-simple _title="SPEAKING" _section="speaking" }}
+  {{/header-speaking}}

-
-  {{#each r.recognition}}
+  {{#each r.speaking}}

  <wx:sub-section>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
@ -34,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/themes/modern/src/partials/writing.xml
+++ b/themes/modern/src/partials/writing.xml
@ -1,6 +1,8 @@
 <wx:sub-section>

-  {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}
+  {{#> header-writing }}
+  {{> header-simple _title="WRITING" _section="writing" }}
+  {{/header-writing}}

  {{#each r.writing}}
  <wx:sub-section>
@ -18,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/doc/section/writing.xml
+++ b/partials/doc/section/writing.xml
@ -1,77 +0,0 @@
-<wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-      <w:t>{{{sectionTitle "WRITING"}}}</w:t>
-    </w:r>
-  </w:p>
-
-
-  {{#each r.writing}}
-  <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>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.date 'YYYY'}}</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:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
-    </w:p>
-    {{/each}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
--- a/partials/html/header-icon.hbs
+++ b/partials/html/header-icon.hbs
@ -0,0 +1,6 @@
+<header>
+  {{#if _icon}}
+  {{> (lookup . '_hdricon') }}
+  {{/if}}
+  <h2>{{{sectionTitle _title _section}}}</h2>
+</header>
--- a/partials/html/header-simple.hbs
+++ b/partials/html/header-simple.hbs
@ -0,0 +1,3 @@
+<header>
+<h2>{{{sectionTitle _title _section}}}</h2>
+</header>
--- a/partials/html/highlights.hbs
+++ b/partials/html/highlights.hbs
@ -0,0 +1,7 @@
+{{#if highlights}}
+<ul>
+  {{#each highlights}}
+  <li>{{{ . }}}</li>
+  {{/each}}
+</ul>
+{{/if}}
--- 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.hbs
+++ b/partials/html/section/education.hbs
@ -0,0 +1,19 @@
+{{#section "education"}}
+<hr>
+<section id="education">
+  {{#> header-education }}
+    {{> header-icon _title="EDUCATION" _section="education" _hdricon=(lookup . '_icon') }}
+  {{/header-education}}
+  {{#each r.education.history}}
+    {{#> body-education }}
+    <div>
+      <h3>{{#if title}}<em>{{{ title }}}</em>, {{/if}}{{{ institution }}}</h3>
+      <span class="tenure">{{dateRange .}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+      {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-education}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/employment.hbs
+++ b/partials/html/section/employment.hbs
@ -0,0 +1,26 @@
+{{#section "employment"}}
+<hr>
+<section id="employment">
+  {{#> header-employment }}
+    {{> header-icon _title="EMPLOYMENT" _section="employment" _hdricon=(lookup . '_icon') }}
+  {{/header-employment}}
+
+  {{#each r.employment.history}}
+    {{#> 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>
+    {{/body-employment}}
+  {{/each}}
+</section>
+{{/section}}
--- 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.hbs
+++ b/partials/html/section/projects.hbs
@ -0,0 +1,25 @@
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  {{#> header-projects }}
+    {{> header-icon _title="PROJECTS" _section="projects" _hdricon=(lookup . '_icon') }}
+  {{/header-projects}}
+  {{#each r.projects }}
+    {{#> body-projects }}
+    <div>
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    </h3>
+    {{#if start}}<span class="tenure">{{dateRange .}}</span>{{/if}}
+    {{{ summary }}}
+    {{> highlights }}
+    {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}    
+    </div>
+    {{/body-projects }}
+  {{/each}}
+</section>
+{{/section}}
--- 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.hbs
+++ b/partials/html/section/recognition.hbs
@ -0,0 +1,18 @@
+{{#section "recognition"}}
+<hr>
+<section id="recognition">
+  {{#> header-recognition }}
+    {{> header-icon _title="RECOGNITION" _section="recognition" _hdricon=(lookup . '_icon') }}
+  {{/header-recognition}}
+  {{#each r.recognition}}
+    {{#> body-recognition }}
+    <div>
+    <h3><em>{{ title }}</em>, {{{link from url }}}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-recognition}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/references.hbs
+++ b/partials/html/section/references.hbs
@ -0,0 +1,16 @@
+{{#section "references"}}
+<hr>
+<section id="references">
+  {{#> header-references }}
+    {{> header-icon _title="REFERENCES" _section="references" _hdricon=(lookup . '_icon') }}
+  {{/header-references}}
+  {{#each r.references}}
+    {{#> body-references }}
+    <div>
+    <h3><em>{{ name }}</em>{{#if role}}, {{{ role }}}{{/if}}</h3>
+    {{{ summary }}}
+    </div>
+    {{/body-references}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/samples.hbs
+++ b/partials/html/section/samples.hbs
@ -0,0 +1,24 @@
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  {{#> header-samples }}
+    {{> header-icon _title="SAMPLES" _section="samples" _hdricon=(lookup . '_icon') }}
+  {{/header-samples}}
+  {{#each r.samples}}
+    {{#> body-samples }}
+    <div>
+    <h3>
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    </h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-samples}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/service.hbs
+++ b/partials/html/section/service.hbs
@ -0,0 +1,24 @@
+{{#section "service"}}
+<hr>
+<section id="service">
+  {{#> header-samples }}
+    {{> header-icon _title="SERVICE" _section="service" _hdricon=(lookup . '_icon') }}
+  {{/header-samples}}
+  {{#each r.service.history}}
+    {{#> body-service }}
+    <div>
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{{ url }}}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+    <p>{{{ summary }}}</p>
+    {{> highlights }}
+    </div>
+    {{/body-service }}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/skills.html
+++ b/partials/html/sections/skills.html
@ -1,8 +1,9 @@
 {{#section "skills"}}
+<hr>
 <section id="skills">
-  <header>
-  <h2>{{{sectionTitle "Skills"}}}</h2><hr>
-  </header>
+  {{#> header-skills }}
+    {{> header-icon _title="SKILLS" _section="skills" _hdricon=(lookup . '_icon') }}
+  {{/header-skills}}
  <table>
    <thead>
      <tr>
@ -14,7 +15,7 @@
      {{#each r.skills.sets}}
      <tr>
        <td style="width: 25%;">{{ name }}</td>
-        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+        <td class="keywords">{{#each skills}}{{ . }} {{/each}}</td>
      </tr>
      {{/each}}
    </tbody>
--- a/partials/html/section/speaking.hbs
+++ b/partials/html/section/speaking.hbs
@ -0,0 +1,18 @@
+{{#section "speaking"}}
+<hr>
+<section id="speaking">
+  {{#> header-speaking }}
+    {{> header-icon _title="SPEAKING" _section="speaking" _hdricon=(lookup . '_icon') }}
+  {{/header-speaking}}
+  {{#each r.speaking}}
+    {{#> body-speaking }}
+    <div>
+    <h3><em>{{{ title }}}</em>, {{{ event }}}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-speaking}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/testimonials.hbs
+++ b/partials/html/section/testimonials.hbs
@ -0,0 +1,16 @@
+{{#section "testimonials"}}
+<hr>
+<section id="testimonials">
+  {{#> header-testimonials }}
+    {{> header-icon _title="TESTIMONIALS" _section="testimonials" _hdricon=(lookup . '_icon') }}
+  {{/header-testimonials}}
+  {{#each r.testimonials}}
+    {{#> body-testimonials }}
+    <div>
+    <h3><em>{{ name }}</em></h3>
+    <p>{{{ quote }}}</p>
+    </div>
+    {{/body-testimonials}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/writing.hbs
+++ b/partials/html/section/writing.hbs
@ -0,0 +1,19 @@
+{{#section "writing"}}
+<hr>
+<section id="writing">
+  {{#> header-writing }}
+    {{> header-icon _title="WRITING" _section="writing" _hdricon=(lookup . '_icon') }}
+  {{/header-writing}}
+  {{#each r.writing }}
+    {{#> body-writing }}
+    <div>
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }}</h3>
+      <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+    </div>
+    {{/body-writing}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/education.html
+++ b/partials/html/sections/education.html
@ -1,10 +0,0 @@
-{{#section "education"}}
-<section id="education">
-  <header>
-  <h2>{{{sectionTitle "Education"}}}</h2><hr>
-  </header>
-  {{#each r.education.history}}
-    <h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
-  {{/each}}
-</section>
-{{/section}}
--- a/partials/html/sections/employment.html
+++ b/partials/html/sections/employment.html
@ -1,24 +0,0 @@
-{{#section "employment"}}
-<section id="employment">
-  <header>
-  <h2>{{{sectionTitle "Employment"}}}</h2><hr>
-  </header>
-  {{#each r.employment.history}}
-      <h3><em>{{ position }}</em>,
-        {{#if url }}
-        <a href="{{ url }}">{{ employer }}</a>
-        {{else}}
-        {{ employer }}
-        {{/if}}
-        <span class="tenure">{{dateRange .}}<span></h3>
-      <p style="clear: both;">{{{ summary }}}</p>
-      {{#if highlights}}
-        <ul>
-        {{#each highlights}}
-          <li>{{{ this }}}</li>
-        {{/each}}
-        </ul>
-      {{/if}}
-  {{/each}}
-</section>
-{{/section}}
--- a/partials/html/sections/projects.html
+++ b/partials/html/sections/projects.html
@ -1,25 +0,0 @@
-{{#section 'projects'}}
-<hr>
-<section id="projects">
-  <header>
-  <h2>{{{sectionTitle "Projects"}}}</h2>
-  </header>
-  {{#each r.projects}}
-    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
-    {{#if url}}
-    <a href="{{{ url }}}">{{ title }}</a>
-    {{else}}
-    {{ title }}
-    {{/if}}
-    <span class="tenure">{{dateRange .}}</span></h3>
-    {{{ summary }}}
-    {{#if proj.highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{{ this }}}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
-</section>
-{{/section}}
--- a/partials/html/sections/recognition.html
+++ b/partials/html/sections/recognition.html
@ -1,11 +0,0 @@
-{{#section "recognition"}}
-<section id="awards">
-  <header>
-  <h2>{{{sectionTitle "recognition" "Awards"}}}</h2><hr>
-  </header>
-  {{#each r.recognition}}
-    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
-    {{ summary }}
-  {{/each}}
-</section>
-{{/section}}
--- a/partials/html/sections/service.html
+++ b/partials/html/sections/service.html
@ -1,24 +0,0 @@
-{{#section "service"}}
-<section id="volunteer">
-  <header>
-  <h2>{{{sectionTitle "Service"}}}</h2><hr>
-  </header>
-  {{#each r.service.history}}
-    <h3><em>{{ position }}</em>,
-      {{#if url}}
-      <a href="{{ url }}">{{ organization }}</a>
-      {{else}}
-      {{ organization }}
-      {{/if}}
-      <span class="tenure">{{dateRange .}}<span></h3>
-    <p style="clear: both;">{{{ summary }}}</p>
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{{ this }}}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
-</section>
-{{/section}}
--- a/partials/html/sections/writing.html
+++ b/partials/html/sections/writing.html
@ -1,12 +0,0 @@
-{{#section "writing"}}
-<section id="publications">
-  <header>
-  <h2>{{{sectionTitle "Writing"}}}</h2><hr>
-  </header>
-  {{#each r.writing }}
-    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-      {{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-  {{# if summary}}{{{ summary }}}{{/if}}
-  {{/each}}
-</section>
-{{/section}}
--- 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/education.hbs
+++ b/partials/md/section/education.hbs
@ -0,0 +1,19 @@
+{{#section 'education'}}
+## {{{sectionTitle "EDUCATION"}}}
+
+{{#each r.education.history}}
+{{#if url}}
+### [{{{ institution }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### {{{ institution }}} ({{dateRange .}})
+{{/if}}
+
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/employment.hbs
+++ b/partials/md/section/employment.hbs
@ -0,0 +1,19 @@
+{{#section "employment"}}
+## {{{sectionTitle "EMPLOYMENT"}}}
+
+{{#each r.employment.history }}
+{{#if url}}
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/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/projects.hbs
+++ b/partials/md/section/projects.hbs
@ -0,0 +1,21 @@
+{{#section 'projects'}}
+## {{{sectionTitle "PROJECTS"}}}
+
+{{#each r.projects }}
+{{#if url }}
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+
+{{/each}}
+{{/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
@ -0,0 +1,12 @@
+{{#section "recognition"}}
+## {{{sectionTitle "RECOGNITION"}}}
+
+{{#each r.recognition}}
+### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
+{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if 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/samples.hbs
+++ b/partials/md/section/samples.hbs
@ -0,0 +1,19 @@
+{{#section 'samples'}}
+## {{{sectionTitle "SAMPLES"}}}
+
+{{#each r.samples }}
+{{#if url}}
+### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+{{else}}
+### {{{ title }}} ({{formatDate safe.date}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/service.hbs
+++ b/partials/md/section/service.hbs
@ -0,0 +1,19 @@
+{{#section 'service'}}
+## {{{sectionTitle "SERVICE"}}}
+
+{{#each r.service.history }}
+{{#if url}}
+### *{{{ position }}}*, [{{{ organization }}}]({{{ url }}}) ({{dateRange.}})
+{{else}}
+### *{{{ position }}}*, {{{ organization }}} ({{dateRange .}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/md/section/skills.hbs
+++ b/partials/md/section/skills.hbs
@ -0,0 +1,7 @@
+{{#section "skills"}}
+## {{{sectionTitle "SKILLS"}}}
+
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/section}}
--- a/partials/md/section/speaking.hbs
+++ b/partials/md/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/md/section/writing.hbs
+++ b/partials/md/section/writing.hbs
@ -0,0 +1,14 @@
+{{#section 'writing'}}
+## WRITING
+
+{{#each r.writing}}
+{{#if url}}
+### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+{{else}}
+### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{/if}}
+
+{{{ summary }}}
+
+{{/each}}
+{{/section}}
--- 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/education.hbs
+++ b/partials/txt/section/education.hbs
@ -0,0 +1,16 @@
+{{#section "education"}}
+{{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
+
+{{#each r.education.history}}
+{{{ institution }}} ({{dateRange .}})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/employment.hbs
+++ b/partials/txt/section/employment.hbs
@ -0,0 +1,14 @@
+{{#section "employment"}}
+{{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
+
+{{#each r.employment.history }}
+{{{ position }}}, {{{ employer }}} ({{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/projects.hbs
+++ b/partials/txt/section/projects.hbs
@ -0,0 +1,15 @@
+{{#section 'projects'}}
+{{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
+
+{{#each r.projects }}
+{{{ title }}}, {{{ role }}} ({{dateRange .}})
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/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
@ -0,0 +1,12 @@
+{{#section "recognition"}}
+{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ 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/samples.hbs
+++ b/partials/txt/section/samples.hbs
@ -0,0 +1,15 @@
+{{#section 'samples'}}
+{{{sectionTitle "SAMPLES"}}} ------------------------------------------------------------------------
+
+{{#each r.samples }}
+{{{ title }}} ({{formatDate safe.date 'YYYY-MM'}})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/service.hbs
+++ b/partials/txt/section/service.hbs
@ -0,0 +1,14 @@
+{{#section "service" }}
+{{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
+
+{{#each r.service.history}}
+{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/partials/txt/section/skills.hbs
+++ b/partials/txt/section/skills.hbs
@ -0,0 +1,7 @@
+{{#section "skills"}}
+{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
+
+{{#each r.skills.sets}}
+- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
+{{/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
@ -0,0 +1,10 @@
+{{#section "writing"}}
+{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{#if summary}}{{{ summary }}}
+{{/if}}
+
+{{/each}}
+{{/section}}
--- a/themes/README.md
+++ b/themes/README.md
@ -2,10 +2,8 @@
 ========
 FRESH resume themes live here, one per folder.

- [`modern`](modern): A middle of the road theme with a modern look 'n feel.
+- [`modern`](modern): A middle of the road theme with a modern look and feel.
+- [`basis`](basis): A theme that is a basis for other themes.
 - [`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.
- [`minimist`](minimist): An unstyled starter theme.
- [`basis`](minimist): An unstyled starter theme.
- [`hello-world`](hello-world): A simple-as-possible example theme.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hacksalot	cfef0a43a8	Bump version to 0.15.0-beta.	2016-02-13 22:52:46 -05:00
hacksalot	a9f002e89a	Awesome: Improve date handling.	2016-02-13 22:48:52 -05:00
hacksalot	3d2b6318ed	Awesome: Adjust whitespace.	2016-02-11 22:00:34 -05:00
hacksalot	c7db59a5b9	Awesome: Remove explicit symlinks. Handled implicitly by HMR.	2016-02-11 10:21:37 -05:00
hacksalot	e2a04958b0	Awesome: Update from upstream. Refresh files for "Awesome" theme, now driven by fluentdesk/Awesome-CV, a templatized fork of posquit0/Awesome-CV.	2016-02-11 10:10:10 -05:00
hacksalot	cad46c2270	Bump version to 0.14.1-beta.	2016-01-29 16:07:00 -05:00
hacksalot	cd8832cc8d	Drop app name from theme description. Technically FRESH themes aren't tool-specific.	2016-01-29 16:05:44 -05:00
hacksalot	c5d8964482	Positive: Fix font face helper warning.	2016-01-29 16:05:06 -05:00
hacksalot	7337f6d280	Adjust CSS file for Modern:PDF and Compact:PDF. Use the dedicated PDF CSS file even if it's sometimes identical to the HTML CSS file.	2016-01-29 16:04:23 -05:00
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
hacksalot	af8e8c44ab	Update README.	2016-01-13 13:38:28 -05:00
hacksalot	0e0e93c033	Modern: DOC: Add annotations.	2016-01-13 12:09:00 -05:00
hacksalot	6d2c3e5882	Partials: Strip commented markup.	2016-01-13 10:03:22 -05:00
hacksalot	e7e4ede8de	Compact: DOC: Update with partials.	2016-01-13 09:55:55 -05:00
hacksalot	e96ed673ab	Modern: DOC: Update with partials.	2016-01-13 09:50:22 -05:00
hacksalot	ea42122dd5	Dissect MS Word format to partials. Introduce placeholder partials for canonical Word 2003 XML document parts.	2016-01-13 09:50:03 -05:00
hacksalot	48f7bbaf6f	Modern: HTML: Update annotations.	2016-01-12 23:20:21 -05:00
hacksalot	b57272ef4c	Move comments from Compact to Modern.	2016-01-12 22:13:33 -05:00
hacksalot	fcf9716d57	Positive: Tweak date look 'n feel.	2016-01-12 21:54:57 -05:00
hacksalot	4d3614d8c6	Partials: HTML: Remove extraneous "\|".	2016-01-12 21:54:43 -05:00
hacksalot	408cad5db5	HTML: Add title / summary to education partial.	2016-01-12 21:53:51 -05:00
hacksalot	e5dac59649	Updates to Compact/Modern/Positive.	2016-01-12 21:29:30 -05:00
hacksalot	56408b82ef	Improve consistency of partials.	2016-01-12 21:29:06 -05:00
hacksalot	786689c42d	Continue DRYing out themes.	2016-01-12 10:33:19 -05:00
hacksalot	1bac9924e5	Positive: Refactor w/ partials.	2016-01-12 09:49:28 -05:00
hacksalot	e589888935	Compact: Use global partials.	2016-01-12 09:47:37 -05:00
hacksalot	3543542f04	Partials: Unencode URLs.	2016-01-12 09:47:10 -05:00
hacksalot	2fcb283631	Allow overriding of section headers.	2016-01-12 09:40:18 -05:00
hacksalot	1799a49234	Modern: PDF: Update from HTML.	2016-01-12 07:40:00 -05:00
hacksalot	9150842523	Modern: Add testimonials & references.	2016-01-12 07:27:41 -05:00
hacksalot	c807d6c7d5	Add references and testimonials partials.	2016-01-12 07:27:13 -05:00
hacksalot	20f2721d9d	Bump version to 0.13.0-beta.	2016-01-11 21:16:57 -05:00
hacksalot	b57f758aa4	Add contributors to package.json.	2016-01-11 20:19:32 -05:00
hacksalot	be5aa7bcc9	Mention "Basis" in themes/README.md.	2016-01-11 19:58:19 -05:00
hacksalot	7138987259	Basis: TXT: Use global partials.	2016-01-11 19:55:27 -05:00
hacksalot	8c5715d5f4	Introduce TXT section partials.	2016-01-11 19:54:44 -05:00
hacksalot	9855d9a5db	Basis: Aerate Markdown format.	2016-01-11 19:05:30 -05:00
hacksalot	b6bb1f3d9a	Improve consistency of Markdown partials.	2016-01-11 19:04:56 -05:00
hacksalot	fa00a9c640	Improve markup consistency.	2016-01-11 13:47:14 -05:00
hacksalot	700c388b01	Underscore: Add warning message.	2016-01-11 12:59:12 -05:00
hacksalot	72f9dfab09	Minimist: Rename to "Underscore".	2016-01-11 12:55:55 -05:00
hacksalot	64efb1d71a	Compact: DOC: Remove skills #if guard.	2016-01-11 12:33:48 -05:00
hacksalot	18ae43054a	Use safe date in samples partial.	2016-01-11 12:33:14 -05:00
hacksalot	c3cb5d5676	Fix typo in header-simple.xml.	2016-01-11 12:32:59 -05:00
hacksalot	f5c953a81c	Modern: Remove theme msg exclamation. Hat tip Gertrude Stein.	2016-01-11 12:20:24 -05:00
hacksalot	e11a123338	Partials: Relocate MD section partials.	2016-01-11 12:19:42 -05:00
hacksalot	acd0776cf1	Basis: MD: Refactor to global partials.	2016-01-11 12:02:06 -05:00
hacksalot	31a358befd	Introduce global Markdown partials.	2016-01-11 12:01:49 -05:00
hacksalot	6b2496c63b	Basis: Introduce PDF format.	2016-01-11 11:53:11 -05:00
hacksalot	ba70f4167f	Basis: HTML: Use global partials.	2016-01-11 11:52:52 -05:00
hacksalot	5febd5c4b9	Modern: DOC: Document partials use.	2016-01-11 11:34:59 -05:00
hacksalot	7320643e70	Modern: PDF: Update CSS from HTML.	2016-01-11 11:34:43 -05:00
hacksalot	0a091b30f6	Modern: DOC: Use global partials.	2016-01-11 11:29:15 -05:00
hacksalot	cf2995fac7	Rename partials/html/sections to .../section	2016-01-11 10:17:54 -05:00
hacksalot	6fd5014e71	Modern: Add a couple comments.	2016-01-11 09:31:13 -05:00
hacksalot	85058a92ff	Modern: Add speaking section.	2016-01-11 09:30:55 -05:00
hacksalot	cd66a6b851	Modern: Fix writing section.	2016-01-11 09:29:55 -05:00
hacksalot	3e474908ec	Modern: Add speaking section. Using theme-specific partials for now.	2016-01-11 09:29:43 -05:00
hacksalot	7ee45d81fb	Add a couple new icon partials.	2016-01-11 09:28:43 -05:00
hacksalot	201adca8d9	Introduce README for partials folder.	2016-01-11 09:28:21 -05:00
hacksalot	b7b2afe568	Modern: Refactor to use global partials.	2016-01-10 23:30:35 -05:00
				`@ -0,0 +1 @@`
				`{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}`