Update README.

Modern: DOC: Add annotations.
Partials: Strip commented markup.
2025-07-06 18:21:06 +01:00 · 2016-01-13 13:38:28 -05:00 · 2016-01-13 12:09:00 -05:00 · 2016-01-13 10:03:22 -05:00 · 2016-01-13 09:55:55 -05:00 · 2016-01-13 09:50:22 -05:00
117 changed files with 2426 additions and 2548 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +1,7 @@
 The MIT License
 ===============

-Copyright (c) 2015 James M. Devlin (https://github.com/hacksalot)
+Copyright (c) 2015 Sir 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,26 +1,89 @@
 fresh-themes
 ============

-Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
-[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.*
+
+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. 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é.
+
+3. Run `hackmyresume build <your-resume.json> to <final-resume>.all -t
+<theme-name>` to generate all formats for a particular theme. For example:
+
+    ```bash
+    hackmyresume BUILD resume.json TO out/resume.all -t positive
+    ```
+
+## Predefined FRESH Themes
+
+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.

 - [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.
+- [underscore][t-underscore]: An unstyled barebones theme.
 - [hello-world][t-hello]: A simple-as-possible example theme.
 - New themes weekly.

-## Install
+All FRESH themes in this repo are MIT licensed. You're free to change, modify,
+update, or improve them at will.

-You don't need to install this repository to use the themes; just install
-[FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest
-official standalone version of the theme repository over NPM...
+## How It Works

-`[sudo] npm install fluent-themes --save`
+FRESH themes are powered by the same templates you're familiar with from Jekyll,
+Handlebars, MS Word, or your server-side web language of choice. You create a
+FRESH theme the same way you would any other template: by intermixing markup
+(HTML, XML, plain text, whatever) with special tags or placeholders:

-...or fork and clone it as usual.
+```html
+<h3>{{ job.title }}</h3>
+<p>{{ job.summary }}</p>
+```
+
+Run it through a tool like HackMyResume, and you get finished markup suitable
+for display or saving as a document:
+
+```html
+<h3>Ninja</h3>
+<p>Performed covert ops in feudal Japan.</p>
+```
+
+The only difference between a FRESH theme and your Jekyll blog or MS Word
+template is the syntax. 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

@ -34,16 +97,16 @@ multiple formats. Each theme lives in a separate folder and consists of:

 Within its containing folder, a theme can have an arbitrary structure provided
 you either a) follow a standard naming convention or b) specify your theme files
-in your theme's JSON file. If you can do `{{ r.name }}` in a template file you
-can work with FRESH themes.
+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

@ -51,13 +114,16 @@ MIT. See [LICENSE.md][1] for details.

 [1]: http://fluentcv.com
 [2]: https://github.com/fluentdesk/fluentcv
-[3]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[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/fluent-themes/tree/master/themes/awesome
-[t-minimist]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/minimist
-[t-modern]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/modern
-[t-hello]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/hello-world
-[t-compact]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/compact
-[t-positive]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/positive
+[t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
+[t-underscore]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/minimist
+[t-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
+[t-positive]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/positive
+[hmr]: https://github.com/hacksalot/hackmyresume
--- a/package.json
+++ b/package.json
@ -1,12 +1,12 @@
 {
  "name": "fresh-themes",
-  "version": "0.9.1-beta",
+  "version": "0.13.0-beta",
  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
  "repository": {
    "type": "git",
    "url": "https://github.com/fluentdesk/fresh-themes.git"
  },
-  "main": "themes/README.md",
+  "main": "README.md",
  "keywords": [
    "résumé",
    "resume",
@ -24,6 +24,11 @@
    "YAML"
  ],
  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "contributors": [
+    "Brett Hardin (https://github.com/bhardin)",
+    "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/README.md
+++ b/partials/README.md
@ -0,0 +1,35 @@
+fresh-themes/assets/partials
+============================
+This folder contains global partials available to all FRESH themes. A global
+partial is a reusable fragment of HTML, XML, or other markup that can be
+injected into your theme.
+
+## Use
+
+To load a global partial, use the following syntax in your theme:
+
+```hbs
+{{> section/[section-name] }}
+```
+
+For example:
+
+```hbs
+{{> section/employment }}
+{{> section/projects }}
+{{> section/employment }}
+```
+
+Currently two types of global partials are available:
+
+- Section partials (DOC and HTML formats) that represent a specific resume
+section.
+- Icon partials for DOC formats that make it a bit easier to embed images in
+the MS Word resume format.
+
+Many more will be supported in the future.
+
+## Overriding
+
+Themes can also declare theme-specific partials located in the theme's
+`/partials` folder (if any).
--- a/partials/doc/doc-fonts.xml
+++ b/partials/doc/doc-fonts.xml
@ -0,0 +1,17 @@
+<w:fonts>
+  <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
+  <w:font w:name="Times New Roman">
+    <w:panose-1 w:val="02020603050405020304"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Roman"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
+  </w:font>
+  <w:font w:name="Calibri">
+    <w:panose-1 w:val="020F0502020204030204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
+  </w:font>
+</w:fonts>
--- a/partials/doc/doc-lists.xml
+++ b/partials/doc/doc-lists.xml
@ -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.xml
+++ b/partials/doc/doc-pr.xml
@ -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.xml
+++ b/partials/doc/doc-properties.xml
@ -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.xml
+++ b/partials/doc/doc-styles.xml
@ -0,0 +1,248 @@
+<w:styles>
+  <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
+    <w:name w:val="Normal"/>
+    <w:rsid w:val="002743C8"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <wx:font wx:val="Calibri"/>
+      <w:sz-cs w:val="24"/>
+      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+    </w:rPr>
+    <w:pPr>
+      <w:jc w:val="both"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading1">
+    <w:name w:val="heading 1"/>
+    <wx:uiName wx:val="Heading 1"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="Heading1Char"/>
+    <w:rsid w:val="00505903"/>
+    <w:pPr>
+      <w:spacing w:before="100" w:before-autospacing="on"/>
+      <w:outlineLvl w:val="0"/>
+      <w:pBdr>
+        <w:top w:val="single" w:sz="6" w:space="1" w:color="#EEEEEE" />
+      </w:pBdr>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="Calibri"/>
+      <w:color w:val="AEAAAA"/>
+      <w:kern w:val="36"/>
+      <w:sz w:val="40"/>
+      <w:sz-cs w:val="40"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading2">
+    <w:name w:val="heading 2"/>
+    <wx:uiName wx:val="Heading 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="Heading2Char"/>
+    <w:rsid w:val="00505903"/>
+    <w:pPr>
+      <w:spacing w:before="120"/>
+      <w:outlineLvl w:val="1"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="Calibri"/>
+      <w:b/>
+      <w:b-cs/>
+      <w:caps/>
+      <w:sz-cs w:val="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="Calibri"/>
+      <w:b/>
+      <w:b-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
+    <w:name w:val="Default Paragraph Font"/>
+  </w:style>
+  <w:style w:type="table" w:default="on" w:styleId="TableNormal">
+    <w:name w:val="Normal Table"/>
+    <wx:uiName wx:val="Table Normal"/>
+    <w:rPr>
+      <wx:font wx:val="Times New Roman"/>
+      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblCellMar>
+        <w:top w:w="0" w:type="dxa"/>
+        <w:left w:w="108" w:type="dxa"/>
+        <w:bottom w:w="0" w:type="dxa"/>
+        <w:right w:w="108" w:type="dxa"/>
+      </w:tblCellMar>
+    </w:tblPr>
+  </w:style>
+  <w:style w:type="list" w:default="on" w:styleId="NoList">
+    <w:name w:val="No List"/>
+  </w:style>
+  <w:style w:type="character" w:styleId="Hyperlink">
+    <w:name w:val="Hyperlink"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:strike w:val="off"/>
+      <w:dstrike w:val="off"/>
+      <w:color w:val="0064BD"/>
+      <w:u w:val="none"/>
+      <w:effect w:val="none"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="FollowedHyperlink">
+    <w:name w:val="FollowedHyperlink"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:strike w:val="off"/>
+      <w:dstrike w:val="off"/>
+      <w:color w:val="7B0796"/>
+      <w:u w:val="none"/>
+      <w:effect w:val="none"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading2Char">
+    <w:name w:val="Heading 2 Char"/>
+    <w:link w:val="Heading2"/>
+    <w:rsid w:val="00505903"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <w:b/>
+      <w:b-cs/>
+      <w:caps/>
+      <w:sz-cs w:val="36"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading3Char">
+    <w:name w:val="Heading 3 Char"/>
+    <w:link w:val="Heading3"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
+      <w:color w:val="1F4D78"/>
+      <w:sz w:val="24"/>
+      <w:sz-cs w:val="24"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="NormalWeb">
+    <w:name w:val="Normal (Web)"/>
+    <w:basedOn w:val="Normal"/>
+    <w:rsid w:val="001B7422"/>
+    <w:pPr>
+      <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+      <w:jc w:val="both"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="Calibri"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading1Char">
+    <w:name w:val="Heading 1 Char"/>
+    <w:link w:val="Heading1"/>
+    <w:rsid w:val="00505903"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <w:color w:val="AEAAAA"/>
+      <w:kern w:val="36"/>
+      <w:sz w:val="40"/>
+      <w:sz-cs w:val="40"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Strong">
+    <w:name w:val="Strong"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:b/>
+      <w:b-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Emphasis">
+    <w:name w:val="Emphasis"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:i/>
+      <w:i-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="tenure">
+    <w:name w:val="tenure"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:rsid w:val="001B7422"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Title">
+    <w:name w:val="Title"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="TitleChar"/>
+    <w:rsid w:val="002D3B7B"/>
+    <w:pPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+      <wx:font wx:val="Segoe UI"/>
+      <w:b/>
+      <w:spacing w:val="-10"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="48"/>
+      <w:sz-cs w:val="56"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="TitleChar">
+    <w:name w:val="Title Char"/>
+    <w:link w:val="Title"/>
+    <w:rsid w:val="002D3B7B"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+      <w:spacing w:val="-10"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="48"/>
+      <w:sz-cs w:val="56"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListParagraph">
+    <w:name w:val="List Paragraph"/>
+    <w:basedOn w:val="Normal"/>
+    <w:rsid w:val="00C146CA"/>
+    <w:pPr>
+      <w:ind w:left="720"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="Calibri"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Summary">
+    <w:name w:val="Summary"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="SummaryChar"/>
+    <w:rsid w:val="00A210E1"/>
+    <w:pPr>
+      <w:spacing w:before="120"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="Calibri"/>
+      <w:color w:val="767171"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SummaryChar">
+    <w:name w:val="Summary Char"/>
+    <w:link w:val="Summary"/>
+    <w:rsid w:val="00A210E1"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <w:sz-cs w:val="24"/>
+    </w:rPr>
+  </w:style>
+</w:styles>
--- a/partials/doc/header-icon.xml
+++ b/partials/doc/header-icon.xml
@ -0,0 +1,17 @@
+{{! A resume heading with prefixed font-awesome icon. }}
+<wx:pBdrGroup>
+  <wx:borders>
+    <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+  </wx:borders>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r>
+      {{> (lookup . '_icon') }}
+    </w:r>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle _title}}}</w:t>
+    </w:r>
+  </w:p>
+</wx:pBdrGroup>
--- a/partials/doc/header-simple.xml
+++ b/partials/doc/header-simple.xml
@ -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.xml
+++ b/partials/doc/pict/arrow.xml
@ -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/code.xml
+++ b/partials/doc/pict/code.xml
@ -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.xml
+++ b/partials/doc/pict/edu.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000004.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaFQTFRFv8HDv8LIv8HGv8HEv8HKv8HMv8jXv8HOv8jZv8TT3dLS2c7Kw8HDwcbM08rIwcHDwcTKz9Lbz8jGy9DXy8bEyczTycTDxcrSx8LDw8jV2dDMxcHD3dLOw8jO1cTDx8rSwc7fzdLbz8LD1czK3dLTx8HD28jDy8HDy8zOz8rI0cLD3crD18jE0cjGyc7Z29LQz8rKxcLEw8LEw8TKy8zQ1djdzcHD1drk09bi09jm0dbizdz/xdLqy9jsxdTswc7i3ePs2eHo2+Ps2e3/z+H/3ev/2/X/3fn/2e//z+H71en/69zT6djS49LO/d7Q6drT4czD59TQ/97O/drM79LG5c7E8ePZ+eHS7eHX8+Pb/+/X/ePS8ePb//Xb9eXZ7+Pd///d/+nT/+HQ///7+evk8fX7///59+fi6/P5//v16ev1/f////nz5efz+////fXs+fv/+/Po9/n/6////evi9///8/n////q//nu4+fz///i+fHw9fX7///18//q4f/q8//i//nm6+/7///o+f//7///4///9+/w8+/w8/P5////rwMOhgAAAWBJREFUSMdj6CIaMIwqHVVKL6XJKVzmqUQoTUvn5mEAAl6LDLxKM8P4+BngQEAwKxu70hxvISR1EMAonJuHrjTfR4QBO2ASdShAKC30FWPAC8Qdi8BKwyUYiACSxUClJVLShFXyWpaCHZCcIoPXBbLmZUjeKpfDoYxZ3qkANQT8+FmcK/zRQ4tJtDIPPVyTAxgUQMGdGYGIA0ZF1BiAKq1SYnbpCgQHSVqkMjBmBawywJ5QcUVXGqXK4tYVAPQoOJ0kV9eAU4MUMBit0ZVG87C616pBYh5sXmaMMjjVYCiNVWdgYKuDBwKjhibcxehKg4Bi7PVYw8sGm6kNWsQo7QpmYPGo1cYWA57oSkMYmLy6GnUwVdpmoysNBbs/OU4XNbL0mjCiABROdpCsEK9vYGgEBMYmpmiRBVHaDPS8PXGZO8GMgYGjhSilicDEzdlKlNIkYOSwtxGlNK29o6OToFsBkPOxfsuGle0AAAAASUVORK5CYIJ=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000004.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/emp.xml
+++ b/partials/doc/pict/emp.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000003.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASZQTFRFv8HDv8HOv8HGv8LIv8TTv8zdv8LOv8bVv8LEv8HEv8HKv8rbv8LQv8HIv8jXv8HMv8LKv8TQz8bEw8LEw8LGydDfyczOz8jGw8jOz8zKw8HDwcbMz8zOycTDy8zOzcHD1cTDxcHDz8LD3crEwcHDwcLEw8LDycHDx8HD0cLDy8HD1drb3dTMy9Tb3drTycLDwcrV3drb1cjE29rb287Izdz/z9zsxdDky9r7ydbs2/X/2/H/1eXw79LG79zQ69bK7dLG487E897Q89bK/+3d///d/+nT8+vd//XZ/+fT//HZ/ePS8+XV8+/f//vb9///4f//7//////q4evw8+/s6+/w7f/////o/f//4+/w8+/w7+/w4fv/4//////59+/w8/P5////sDySyAAAAP9JREFUSMdjSCQaMIwqHZJKXYSEsQARUX9MpbYMWAFjAD2VMomJMzBISEoxSMvIMjDLieNRyhLoKs8YEKTAYArksia6KeJWyhZsJ8Vk5q7EYB6izMAeaq9CHW+pqjEwcAAxpzDQQFUVvG71UOeyArrVAuxWTzxuZQnzUueyDgcpdWDgjvCWoncU8ET6aPDa+GoyWEY5MvBFO0nh85afFn8MUVEADixVYEBBAkuNOm4V0NZR4dTV02cwMDRiEDQ2oU5yIcFUUpMLHOANAVC4wlXidysothg4wLlahUBsgQCXFQoXn1KoHJWVkuAAuLdwK3XGEQWxmErj4qOwgQS4AgDkC738cGCe/AAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000003.png" o:title="fa-building"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/rec.xml
+++ b/partials/doc/pict/rec.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000007.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUFQTFRFv8HDv8HEv8bVv8HOv8HMv8HKv8zdv8LSv8TTv8TSv8jZv8HGv8LIv8LQv8LKv8HI08zOz8zOz87TzcHDy8HDwcHDw8LEwcLE1cTDzcLDw87f18jExcHDx8LDwcTK3dTM0djb08LD0cbDw8rVwczdzdzxzdz/xdLmw9Dk0djkzdrw0droz97xwdDky9jo3eXw2+/w2e3/0+P/z+H/0+P71ePx7dLI79LG/dzO4crD4czE99zO89bK49LM8drO5dTM7dbK99rM5dDI7+HX///d8+/Z/eHQ//Xb//Xd8e3Z7+Pd//Hf///5/f/////77///4f//+/Pw8+/w9fX76f/////q6fv////o+f//+//////x6///9fv///nm4/Po//nu+fv/4+Ps///k/fXx8+/s9/n/6/n/5f//+fHw8/P5////sapGIwAAASVJREFUSMdjyCIaMIwqHVVKB6U+zgKCMCCk74tHqZ8ZAxJgVMWj1EUYWSkDkz/RSpkDsCoNDAICVxEUpSwGIMFgNKVuogy4AKshqlJzBkYxIEBTJQ4UEmVQQ1fKhulW9pCsrFAJopRy+GNTasHAGZaVFS6BopQrIivLXYTRCFWphySDemSWnyWKUo2srCgrBs5otMCyFmWQismyQYkt46xYaQZuE/RwBcUpj6YncsDyxtnKMDBq+WLElp+dDJZA5TPFGrHx9rJoCuW0E3AmwkAveVi08SskBuNP2n4OELXcOkTkAkeQWoS/8SlNUoSGPmGl4HjQJSobhkoQaWpyihM4pvSCUvEr9VZCClXlNDxKQ1FTlkoE0dmQN50qSv0ygpBBJqpbAYc7NrM+qyXXAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000007.png" o:title="fa-trophy"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/srv.xml
+++ b/partials/doc/pict/srv.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000005.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMxQTFRFv8HDv8HEv8jXv8HOv8LSv8TTv8zdv8LKv8bT3czIwcHDwcTM18bDxcHDw8zdx8HD08bDw8HDw8rZ3drbz8TDycHDzcHDw8LDwc7ixdLqzdzxxdLoxdTs1ePx0eH72+n//dzO79LG89bK+9rM997Q5drb/9zO7dbK5c7G/+nV++XT/+3X//Hf//HZ///d/+fT//nq///q8////fXx8+/z+///4f//9///6f///f//7/////Xk8fv///Hk/fXo5ef1///7///x6fX/////TAOGGAAAALpJREFUSMft1NcOgjAUBuCDe4Hixr33Xohb+/7vZCnEKC3ShEv4b5om30Xzn5wC4g741Keu6CqegGSdh65TgCM0OGgLSAKbv3S72yPUNmjwYN6ZdCyCpKKOQUNHNBGhrLFpFwtJnaYJVXQJ4RObnjPE9mR8ZC+6FCp2b70a9tbP3TVKWhog9pNfaS3r21ok1essbyfpEcwLJq06TmtRNKniZSqUuGlk4Hm6xCtQc6SPoRxtPkcQe7n4s96JF4yPwZXEugAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000005.png" o:title="fa-child"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/star.xml
+++ b/partials/doc/pict/star.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000001.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1QTFRFv8HEv8HDv8jZv8HGv8rbv8HIv8HOv8zdv8bVv8TOv8TMv8LK08TD1cTD2dDOz8rIw8LDwcLGycrOz9DX0crIw8LEwcHDw8LGycrTx8HD2cjDzcHDw8bQ29zZz8TDxcHDy8TDx8LD3drizdzxz97xzdz/xdTs09zqz+H70+P70+X/0eH/0+Px1eX51+v/3ef11+Hw1en/99jK+drM49rb7dTI7dbK8djM9drO99zO89bK5c7E/9zO79rQ8dTI7drO69zi/efZ/+/X/+HQ///d/+vV8+HT///7+fX5///m9//////q+f///fXx8+vk6+/w9/n/5fH/4//////w7////f/////54f//+/////v1//Hm4+Hq//vw8fv/////A0CiDgAAARBJREFUSMdjiCMRMIxqGNUwqoHaGtw9SNRgxKBBkgZPHkYmL1I0GDMyMmuSoAFoASNOKxiwW4DbCgYcFuC0ggGHBUArtIjU4M0L0cDI4kNQg6+fCR+/ACMMCAoJK/kH4NLgKCIqxogNMIhLBGLTYMyIEzBoY9PgbopTvTJ2P7ibiRGhHtnT2HUwq+AOJXdzTB2sOviC1d1CjJB69IizRNXBqksopp0kUTSwBRHS4Ixmgx4hDVZoflAlpMEaTYMaAQ3BUmga2AlocJGGqJORlYMwOELwa3CVB6ni1A+NC3NTAAdTOH4NNkA1XAahYHaYrSIwYRji12DHyK0eAedF2stjBhOqhqjoCBR+jEMs/UtvAMiRyWLg7gtIAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000001.png" o:title="star-icon"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/wri.xml
+++ b/partials/doc/pict/wri.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000006.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAI1QTFRFv8HDv8HEv8bVv8jXv8LKv8HGv8HIv8zdv8rZv8TT18bDxcHD2dLd1cbDwczd2cjDxcLKwc7fxcTDx8HDz8TDy9jszdzxy9jmy9jo2ef72+n/1eX56dLI79LG/efT/+3X//Hf///59+/w9fX7//vo/f//9///7///8////fv7//nm8+/w8/H1/fXx////vxL+UwAAAMZJREFUSMft1NkSgjAMBdCL4i7uG+4KiIr2/z/PwghtsYk8+WSez2TuJJlAVC786Z/+mp7OQUUaduHMoypUSpgWnDQtRfc9lK2dhv1LYRcsDT0MCluLGSollK1faSqlsxzm1vXpAKlcbfO+Sn7SQmZ25NNz1WRqb/S2DAl3Td9ASfr0ubDSoLzU6Rep0XRHY0YqKmVjAkYqukNzc/cYqdOWEG9rlTptJ48os3apU6ATi8OUkmV6nJHSpHROG6Wlos8kq4D+Ni/aqw5+HvnsQQAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1030" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000006.png" o:title="fa-pencil"/>
+  </v:shape>
+</w:pict>
--- a/themes/positive/src/partials/education.xml
+++ b/themes/positive/src/partials/education.xml
@ -1,12 +1,8 @@
 <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>EDUCATION</w:t>
-    </w:r>
-  </w:p>
+
+  {{#> header-education }}
+  {{> header-simple _title="EDUCATION" _section="education" }}
+  {{/header-education}}

  {{#each r.education.history}}

--- a/themes/positive/src/partials/employment.xml
+++ b/themes/positive/src/partials/employment.xml
@ -1,12 +1,8 @@
 <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>EMPLOYMENT</w:t>
-    </w:r>
-  </w:p>
+
+  {{#> header-employment }}
+  {{> header-simple _title="EMPLOYMENT" _section="employment" }}
+  {{/header-employment}}

  {{#each r.employment.history}}

@ -45,12 +41,6 @@
        </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 }}
@ -68,12 +58,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/info.xml
+++ b/partials/doc/section/info.xml
@ -0,0 +1,16 @@
+<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 "info" "ABOUT}}}</w:t>
+    </w:r>
+  </w:p>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
+    <w:pPr>
+      <w:pStyle w:val="Summary"/>
+    </w:pPr>
+    {{{wpml r.info.brief true }}}
+  </w:p>
+</wx:sub-section>
--- a/partials/doc/section/projects.xml
+++ b/partials/doc/section/projects.xml
@ -0,0 +1,68 @@
+<wx:sub-section>
+
+  {{#> header-projects }}
+  {{> header-simple _title="PROJECTS" _section="projects" }}
+  {{/header-projects}}
+
+  {{#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: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/positive/src/partials/recognition.xml
+++ b/themes/positive/src/partials/recognition.xml
@ -1,13 +1,8 @@
-{{#if r.recognition}}
 <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>RECOGNITION</w:t>
-    </w:r>
-  </w:p>
+
+  {{#> header-recognition }}
+  {{> header-simple _title="RECOGNITION" _section="recognition" }}
+  {{/header-recognition}}

  {{#each r.recognition}}

@ -70,4 +65,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/themes/positive/src/partials/service.xml
+++ b/themes/positive/src/partials/service.xml
@ -1,13 +1,8 @@
-{{#if r.service }}
 <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>SERVICE</w:t>
-    </w:r>
-  </w:p>
+
+  {{#> header-service }}
+  {{> header-simple _title="SERVICE" _section="service" }}
+  {{/header-service}}

  {{#each r.service.history}}

@ -46,12 +41,6 @@
        </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 }}
@ -69,12 +58,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}}

@ -83,4 +66,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/partials/doc/section/skills.xml
+++ b/partials/doc/section/skills.xml
@ -0,0 +1,80 @@
+<wx:sub-section>
+
+  {{#> header-skills }}
+  {{> header-simple _title="SKILLS" _section="skills" }}
+  {{/header-skills}}
+
+  <w:tbl>
+    <w:tblPr>
+      <w:tblW w:w="0" w:type="auto"/>
+      <w:tblLook w:val="04A0"/>
+    </w:tblPr>
+    <w:tblGrid>
+      <w:gridCol w:w="828"/>
+      <w:gridCol w:w="8748"/>
+    </w:tblGrid>
+
+    {{#each r.skills.sets}}
+
+    <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
+      <w:trPr>
+        <w:trHeight w:val="882"/>
+      </w:trPr>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:w="828" w:type="dxa"/>
+          <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:r>
+            <w:rPr>
+              <w:noProof/>
+            </w:rPr>
+            <w:pict>
+              <v:rect id="_x0000_s1028" style="position:absolute;left:0;text-align:left;margin-left:20.6pt;margin-top:1.4pt;width:7.15pt;height:38.25pt;z-index:1" fillcolor="{{{skillColor level}}}"  strokeweight="0"/>
+            </w:pict>
+          </w:r>
+          <w:r>
+            <w:rPr>
+              <w:noProof/>
+            </w:rPr>
+            <w:pict>
+              <v:rect id="_x0000_s1026" style="position:absolute;left:0;text-align:left;margin-left:20.6pt;margin-top:1.4pt;width:7.15pt;height:{{{skillHeight level}}}pt;z-index:2" fillcolor="#FFFFFF" strokeweight="0"/>
+            </w:pict>
+          </w:r>
+        </w:p>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:w="8748" w:type="dxa"/>
+          <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+        </w:tcPr>
+        <w:p>
+          <w:pPr>
+            <w:spacing w:before="120"/>
+          </w:pPr>
+          <w:r>
+            <w:rPr>
+              <w:sz w:val="24"/>
+              <w:b/>
+              <w:caps/>
+            </w:rPr>
+            <w:t>{{{ name }}}</w:t>
+          </w:r>
+        </w:p>
+        <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
+          <w:r>
+            <w:rPr>
+              <w:caps/>
+              <w:spacing w:val="22"/>
+            </w:rPr>
+            <w:t>{{#each skills }}{{ this }}{{#unless @last}}  {{/unless}}{{/each}}</w:t>
+          </w:r>
+        </w:p>
+      </w:tc>
+    </w:tr>
+
+    {{/each}}
+
+  </w:tbl>
+</wx:sub-section>
--- a/themes/compact/src/partials/employment.xml
+++ b/themes/compact/src/partials/employment.xml
@ -1,14 +1,10 @@
 <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>EMPLOYMENT</w:t>
-    </w:r>
-  </w:p>

-  {{#each r.employment.history}}
+  {{#> header-speaking }}
+  {{> header-simple _title="SPEAKING" _section="speaking" }}
+  {{/header-speaking}}
+
+  {{#each r.speaking}}

  <wx:sub-section>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
@ -18,24 +14,21 @@
          <w:tab w:val="right" w:pos="9360"/>
        </w:tabs>
      </w:pPr>
-      <w:r>
-        <w:t>{{ position }}, </w:t>
-      </w:r>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/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>{{ employer }}</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:t>{{formatDate safe.start 'YYYY-MM'}} — {{formatDate safe.end 'YYYY-MM'}}</w:t>
+        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
      </w:r>
    </w:p>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@ -45,14 +38,9 @@
        </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>

+    {{#if highlights}}
    {{#each highlights }}
    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
      <w:pPr>
@ -68,14 +56,9 @@
        </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}}
+    {{/if}}

  </wx:sub-section>

--- a/themes/positive/src/partials/writing.xml
+++ b/themes/positive/src/partials/writing.xml
@ -1,13 +1,8 @@
-{{#if r.writing}}
 <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>WRITING</w:t>
-    </w:r>
-  </w:p>
+
+  {{#> header-writing }}
+  {{> header-simple _title="WRITING" _section="writing" }}
+  {{/header-writing}}

  {{#each r.writing}}
  <wx:sub-section>
@ -61,12 +56,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}}

@ -75,4 +64,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/partials/html/header-icon.html
+++ b/partials/html/header-icon.html
@ -0,0 +1,6 @@
+<header>
+  {{#if _icon}}
+  {{> (lookup . '_hdricon') }}
+  {{/if}}
+  <h2>{{{sectionTitle _title _section}}}</h2>
+</header>
--- a/partials/html/header-simple.html
+++ b/partials/html/header-simple.html
@ -0,0 +1,3 @@
+<header>
+<h2>{{{sectionTitle _title _section}}}</h2>
+</header>
--- a/partials/html/highlights.html
+++ b/partials/html/highlights.html
@ -0,0 +1,7 @@
+{{#if highlights}}
+<ul>
+  {{#each highlights}}
+  <li>{{{ . }}}</li>
+  {{/each}}
+</ul>
+{{/if}}
--- a/partials/html/section/education.html
+++ b/partials/html/section/education.html
@ -0,0 +1,18 @@
+{{#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 }}
+    </div>
+    {{/body-education}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/employment.html
+++ b/partials/html/section/employment.html
@ -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/projects.html
+++ b/partials/html/section/projects.html
@ -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/recognition.html
+++ b/partials/html/section/recognition.html
@ -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>, {{ from }}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    {{ summary }}
+    {{> highlights }}
+    </div>
+    {{/body-recognition}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/references.html
+++ b/partials/html/section/references.html
@ -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></h3>
+    {{ summary }}
+    </div>
+    {{/body-references}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/samples.html
+++ b/partials/html/section/samples.html
@ -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.html
+++ b/partials/html/section/service.html
@ -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 style="clear: both;">{{{ summary }}}</p>
+    {{> highlights }}
+    </div>
+    {{/body-service }}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/skills.html
+++ b/partials/html/section/skills.html
@ -0,0 +1,24 @@
+{{#section "skills"}}
+<hr>
+<section id="skills">
+  {{#> header-skills }}
+    {{> header-icon _title="SKILLS" _section="skills" _hdricon=(lookup . '_icon') }}
+  {{/header-skills}}
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ . }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}
--- a/partials/html/section/speaking.html
+++ b/partials/html/section/speaking.html
@ -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>, {{ from }}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-speaking}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/section/testimonials.html
+++ b/partials/html/section/testimonials.html
@ -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.html
+++ b/partials/html/section/writing.html
@ -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/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/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/recognition.hbs
+++ b/partials/md/section/recognition.hbs
@ -0,0 +1,10 @@
+{{#section 'recognition'}}
+## {{{sectionTitle "RECOGNITION"}}}
+
+{{#each r.recognition}}
+### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+
+{{{ summary }}}
+
+{{/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 }}}*, {{{ from }}} ({{formatDate safe.date 'MMM 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/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/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/recognition.hbs
+++ b/partials/txt/section/recognition.hbs
@ -0,0 +1,9 @@
+{{#section "recognition"}}
+{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+
+{{/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/writing.hbs
+++ b/partials/txt/section/writing.hbs
@ -0,0 +1,9 @@
+{{#section "writing"}}
+{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{{ summary }}}
+
+{{/each}}
+{{/section}}
--- a/themes/README.md
+++ b/themes/README.md
@ -2,8 +2,11 @@
 ========
 FRESH resume themes live here, one per folder.

- [`minimist`](minimist): A no-frills theme.
- [`modern`](modern): A middle of the road theme with a modern look 'n feel.
- [`hello-world`](hello-world): A simple-as-possible example theme.
+- [`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.
+- [`underscore`](underscore): An unstyled starter theme illustrating the use of Underscore.js (instead of Handlebars) as a template engine.
+- [`basis`](minimist): An unstyled starter theme.
+- [`hello-world`](hello-world): A simple-as-possible example theme.
--- a/themes/awesome/README.md
+++ b/themes/awesome/README.md
@ -5,8 +5,9 @@ An experimental resume theme based on [Byungjin Park's][author] awesome

 ## Use

-1. Run `fluentcv build my-resume.json to out/my-resume.all -t awesome` to create
-a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume.
+1. Run `hackmyresume build my-resume.json to out/my-resume.all -t awesome` to
+create a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume
+resume.

 2. Generate a styled PDF by running `xelatex my-resume.tex` in the `examples`
 folder generated in Step 1. You'll need a valid and updated LaTeX environment on
@ -21,10 +22,10 @@ are 3 symlinks in the `examples` folder that need to exist:
 - `fontawesome.sty` should link to `../fontawesome.sty`.
 - `fonts` should link to `../fonts` (folder).

-FluentCV creates these by default when it generates a resume under the `awesome`
-theme. To create these symlinks manually, either use the Linux / OS X symlink
-command for all three or, if on Windows, run use `mklink /H` for the first two
-and `mklink /J` for the last.
+HackMyResume creates these by default when it generates a resume under the
+`awesome` theme. To create these symlinks manually, either use the Linux / OS X
+symlink command for all three or, if on Windows, run use `mklink /H` for the
+first two and `mklink /J` for the last.

 ## License

@ -34,5 +35,5 @@ MIT. See [LICENSE.md][lic].
 [m]: http://miktex.org/download
 [desk]: http://fluentcv.com
 [cli]: https://github.com/fluentdesk/fluentcv
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [author]: https://github.com/posquit0
--- a/themes/awesome/awesome.json
+++ b/themes/awesome/awesome.json
@ -1,5 +1,5 @@
 {
-  "title": "compact",
+  "title": "awesome",
  "description": "A technical résumé theme based on Awesome-CV for LaTeX.",
  "engine": "underscore",
  "url": "https://github.com/posquit0/Awesome-CV",
@ -10,6 +10,7 @@
    "evaluate": "\\[~([\\s\\S]+?)~]",
    "comment": "\\[\\#([\\s\\S]+?)\\#\\]"
  },
+  "leaf": true,
  "formats": {
    "latex": {
      "transform": [
@ -38,5 +39,5 @@
      }
    }
  },
-  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fluent-themes/blob/master/themes/awesome/README.md."
+  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fresh-themes/blob/master/themes/awesome/README.md."
 }
--- a/themes/basis/README.md
+++ b/themes/basis/README.md
@ -0,0 +1,16 @@
+Theme: Basis
+============
+A basis résumé theme for HackMyResume, FluentCV, and other FRESH-compatible
+resume tools.
+
+## Use
+
+The basis theme contains default theme files for use in other themes. Other
+FRESH themes can inherit from the basis theme (or any theme) in order to provide
+default formats that the theme author(s) may not necessarily be interested in.
+
+## License
+
+MIT. See [LICENSE.md][lic] for details.
+
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/basis/src/html.css
+++ b/themes/basis/src/html.css
@ -0,0 +1 @@
+/* An empty CSS file. */
--- a/themes/basis/src/html.html
+++ b/themes/basis/src/html.html
@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ RAW.name }}</title>
+    {{{styleSheet "html.css"}}}
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
+        </div>
+      </header>
+
+
+
+{{#has "info.brief"}}
+<section id="summary">
+  {{{ r.info.brief }}}
+</section>
+{{/has}}
+
+
+
+{{!<!--
+  Use predefined global partials for the other sections.
+
+  The "inline" bit before each section allows us to pass a custom heading
+  icon into the global partial. For this theme, we're using Font Awesome.
+-->}}
+
+{{> section/skills }}
+
+{{> section/employment }}
+
+{{> section/projects }}
+
+{{> section/education }}
+
+{{> section/service }}
+
+{{> section/samples }}
+
+{{> section/writing }}
+
+{{> section/recognition }}
+
+{{> section/speaking }}
+
+
+
+    </main>
+  </body>
+</html>
--- a/themes/basis/src/md.txt
+++ b/themes/basis/src/md.txt
@ -0,0 +1,25 @@
+{{ r.name }}
+============
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+
+{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}}
+
+{{> section/skills }}
+
+{{> section/employment }}
+
+{{> section/projects }}
+
+{{> section/education }}
+
+{{> section/samples }}
+
+{{> section/writing }}
+
+{{> section/service }}
+
+{{> section/recognition }}
+
+{{> section/speaking }}
--- a/themes/basis/src/pdf.html
+++ b/themes/basis/src/pdf.html
@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ RAW.name }}</title>
+    {{{styleSheet "html.css"}}}
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
+        </div>
+      </header>
+
+
+
+{{#has "info.brief"}}
+<section id="summary">
+  {{{ r.info.brief }}}
+</section>
+{{/has}}
+
+
+
+{{!<!--
+  Use predefined global partials for the other sections.
+
+  The "inline" bit before each section allows us to pass a custom heading
+  icon into the global partial. For this theme, we're using Font Awesome.
+-->}}
+
+{{> section/skills }}
+
+{{> section/employment }}
+
+{{> section/projects }}
+
+{{> section/education }}
+
+{{> section/service }}
+
+{{> section/samples }}
+
+{{> section/writing }}
+
+{{> section/recognition }}
+
+{{> section/speaking }}
+
+
+
+    </main>
+  </body>
+</html>
--- a/themes/basis/src/txt.txt
+++ b/themes/basis/src/txt.txt
@ -0,0 +1,23 @@
+{{ r.name }}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+================================================================================
+
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
+
+{{> section/skills }}
+
+{{> section/employment }}
+
+{{> section/projects }}
+
+{{> section/education }}
+
+{{> section/samples }}
+
+{{> section/writing }}
+
+{{> section/service }}
+
+{{> section/recognition }}
--- a/themes/basis/theme.json
+++ b/themes/basis/theme.json
@ -0,0 +1,7 @@
+{
+  "title": "basis",
+  "description": "A theme that is a basis for other themes.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "message": "This theme contains default unstyled formats that can be used by other themes or as a starting point for a custom theme."
+}
--- a/themes/compact/README.md
+++ b/themes/compact/README.md
@ -15,4 +15,4 @@ job entries in order for this theme to make sense.

 MIT. See [LICENSE.md][lic] for details.

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/compact/compact.json
+++ b/themes/compact/compact.json
@ -1,6 +0,0 @@
-{
-  "title": "compact",
-  "description": "A compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
-  "engine": "handlebars"
-}
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@ -2,158 +2,9 @@
 <?mso-application progid="Word.Document"?>
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
  <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
-  <o:DocumentProperties>
-    <o: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>
-  <w:fonts>
-    <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
-    <w:font w:name="Times New Roman">
-      <w:panose-1 w:val="02020603050405020304"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Roman"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
-    </w:font>
-    <w:font w:name="Calibri">
-      <w:panose-1 w:val="020F0502020204030204"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Swiss"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
-    </w:font>
-  </w:fonts>
-  <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>
+  {{> doc-properties }}
+  {{> doc-fonts }}
+  {{> doc-lists }}
  <w:styles>
    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
      <w:name w:val="Normal"/>
@ -504,18 +355,14 @@
          </w:r>
        </w:hlink>
      </w:p>
-      <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
-        <w:pPr>
-          <w:pStyle w:val="Summary"/>
-        </w:pPr>
-        <w:r wsp:rsidRPr="000A3AF0">
-          <w:t>{{ r.info.brief }}</w:t>
-        </w:r>
-      </w:p> -->
-      {{{wpml r.info.brief }}}
-      {{> skills }}
-      {{> employment }}
-      {{> education }}
+      {{{wpml RAW.info.brief }}}
+      {{#section "skills"}}{{> skills }}{{/section}}
+      {{#section "employment"}}{{> section/employment }}{{/section}}
+      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "education"}}{{> section/education }}{{/section}}
+      {{#section "service"}}{{> section/service }}{{/section}}
+      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "recognition"}}{{> section/recognition }}{{/section}}
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/compact/src/compact-html.css
+++ b/themes/compact/src/compact-html.css
@ -45,12 +45,9 @@ li {
  margin-left: 2em;
 }

-h3 {
-  margin-top: 1em;
-}
-
 p, li {
  text-align: justify;
+  clear: both;
 }

 .tenure {
@ -69,10 +66,8 @@ main > header {
 }


-main > header > h1 {
-  float: left;
-  font-size: 1.5em;
-  text-transform: uppercase;
+h3 {
+  display: inline-block;
  line-height: 1;
 }
 #contact {
@ -87,7 +82,19 @@ main > header > h1 {
  margin-left: 5px;
 }

-h2 > span.fa {
+span.fa {
  text-align: left;
  margin-right: 3px;
+  float: left;
+}
+
+section > div {
+  margin-bottom: 1em;
+  clear: both;
+}
+
+span.keywords {
+  font-size: 10px;
+  color: gray;
+  text-align: right;
 }
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@ -4,158 +4,96 @@
    <meta charset="utf-8">
    <title>{{ RAW.name }}</title>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{{styleSheet "compact-html.css"}}}    
+    {{{styleSheet "html.css"}}}
  </head>
  <body>
    <main>
      <header>
        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>

+{{!<!--

-{{#if r.info.brief}}
-      <section id="summary">
-        {{{ r.info.brief }}}
-      </section>
-{{/if}}
+  INLINE TEMPLATE DEFINITIONS

+-->}}

-{{#if r.skills}}
-      <section id="skills">
-        <header>
-        <h2><span class="fa fa-code"></span> Skills</h2><hr>
-        </header>
-        <table>
-          <thead>
-            <tr>
-              <th>Skill</th>
-              <th>Keywords</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{#each r.skills.sets}}
-            <tr>
-              <td style="width: 25%;">{{ name }}</td>
-              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
-            </tr>
-            {{/each}}
-          </tbody>
-        </table>
-      </section>
-{{/if}}
+{{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
+{{#*inline "icon-employment"}}<span class="fa fa-building"></span>{{/inline}}
+{{#*inline "icon-projects"}}<span class="fa fa-star"></span>{{/inline}}
+{{#*inline "icon-education"}}<span class="fa fa-mortar-board"></span>{{/inline}}
+{{#*inline "icon-service"}}<span class="fa fa-child"></span>{{/inline}}
+{{#*inline "icon-samples"}}<span class="fa fa-share"></span>{{/inline}}
+{{#*inline "icon-writing"}}<span class="fa fa-pencil"></span>{{/inline}}
+{{#*inline "icon-recognition"}}<span class="fa fa-trophy"></span>{{/inline}}
+{{#*inline "icon-speaking"}}<span class="fa fa-users"></span>{{/inline}}
+{{#*inline "icon-testimonials"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-references"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}

-
-
-{{#if r.employment}}
-      <section id="employment">
-        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
-        </header>
-
-        {{#each r.employment.history}}
-          {{#compare @index 4 operator="<"}}
+{{#*inline "body-employment" }}
+<div>
  <h3><em>{{ position }}</em>,
    {{#if url }}
-              <a href="{{ url }}">{{ employer }}</a>
+    <a href="{{{ url }}}">{{ employer }}</a>
    {{else}}
    {{ employer }}
    {{/if}}
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{{ summary }}}</p>
-            {{#if highlights}}
-              <ul>
-              {{#each highlights}}
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+  <p>{{{ summary }}}</p>
+  {{> highlights }}
+  {{#if keywords}}
+  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
  {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
+</div>
+{{/inline}}

-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
-        {{/each}}
-
-      </section>
-{{/if}}
-
-{{# if r.education}}
-      <section id="education">
-        <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
-        </header>
-        {{#each r.education.history}}
-          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-        {{/each}}
-
-      </section>
-{{/if}}
-
-{{#if r.service}}
-      <section id="volunteer">
-        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
-        </header>
-        {{#each r.service.history}}
-          <h3><em>{{ position }}</em>,
+{{#*inline "body-projects" }}
+<div>
+  <h3><em>{{ role }}</em>,
    {{#if url }}
-            <a href="{{ url }}">{{ organization }}</a>
+    <a href="{{{ url }}}">{{ title }}</a>
    {{else}}
-            {{ organization }}
+    {{ title }}
    {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+  <p>{{{ summary }}}</p>
+  {{> highlights }}
+  {{#if keywords}}
+  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
  {{/if}}
-        {{/each}}
+</div>
+{{/inline}}

-      </section>
-{{/if}}
+{{!<!--

-{{#if r.writing}}
-      <section id="publications">
-        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
-        </header>
-        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{{ summary }}}{{/if}}
-        {{/each}}
-      </section>
-{{/if}}
+  RESUME SECTIONS

-{{# if r.recognition}}
-      <section id="awards">
-        <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
-        </header>
-        {{#each r.recognition}}
-          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
-          {{ summary }}
-        {{/each}}
+-->}}
+
+{{#has "info.brief"}}
+<section id="summary">
+  {{{ r.info.brief }}}
 </section>
-{{/if}}
+{{/has}}
+
+{{> section/skills _icon="icon-skills"}}
+{{> section/employment _icon="icon-employment"}}
+{{> section/projects _icon="icon-projects"}}
+{{> section/education _icon="icon-education"}}
+{{> section/service _icon="icon-service"}}
+{{> section/samples _icon="icon-samples"}}
+{{> section/writing _icon="icon-writing"}}
+{{> section/recognition _icon="icon-recognition"}}
+{{> section/speaking _icon="icon-speaking"}}
+{{> section/testimonials _icon="icon-testimonials"}}
+{{> section/references _icon="icon-references"}}

    </main>
  </body>
--- a/themes/compact/src/compact-md.txt
+++ b/themes/compact/src/compact-md.txt
@ -1,84 +0,0 @@
-{{ r.name }}
-============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-## SKILLS
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-## EMPLOYMENT
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-### Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-## EDUCATION
-
-{{#each r.education.history}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-## WRITING
-
-{{#each r.writing}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-## SERVICE
-
-{{#each r.service.history}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-## RECOGNITION
-
-{{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@ -12,151 +12,63 @@
      <header>
        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>


-{{#if r.info.brief}}
+
+{{#has "info.brief"}}
 <section id="summary">
  {{{ r.info.brief }}}
 </section>
-{{/if}}
-
-
-{{#if r.skills}}
-      <section id="skills">
-        <header>
-        <h2><span class="fa fa-code"></span> Skills</h2><hr>
-        </header>
-        <table>
-          <thead>
-            <tr>
-              <th>Skill</th>
-              <th>Keywords</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{#each r.skills.sets}}
-            <tr>
-              <td style="width: 25%;">{{ name }}</td>
-              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
-            </tr>
-            {{/each}}
-          </tbody>
-        </table>
-      </section>
-{{/if}}
+{{/has}}



-{{#if r.employment}}
-      <section id="employment">
-        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
-        </header>
+{{!<!--
+  Use predefined global partials for the other sections.

-        {{#each r.employment.history}}
-          {{#compare @index 4 operator="<"}}
-            <h3><em>{{ position }}</em>,
-              {{#if url }}
-              <a href="{{ url }}">{{ employer }}</a>
-              {{else}}
-              {{ employer }}
-              {{/if}}
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{{ summary }}}</p>
-            {{#if highlights}}
-              <ul>
-              {{#each highlights}}
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
-            {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
+  The "inline" bit before each section allows us to pass a custom heading
+  icon into the global partial. For this theme, we're using Font Awesome.
+-->}}

-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
+{{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
+{{> section/skills }}

-            <li>{{{ position }}}, {{{ employer }}}</li>
+{{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
+{{> section/employment }}

-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
-        {{/each}}
+{{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
+{{> section/projects }}

-      </section>
-{{/if}}
+{{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
+{{> section/education }}

-{{# if r.education}}
-      <section id="education">
-        <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
-        </header>
-        {{#each r.education.history}}
-          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-        {{/each}}
+{{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
+{{> section/service }}

-      </section>
-{{/if}}
+{{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
+{{> section/samples }}

-{{#if r.service}}
-      <section id="volunteer">
-        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> 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">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
-          {{/if}}
-        {{/each}}
+{{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
+{{> section/writing }}

-      </section>
-{{/if}}
+{{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
+{{> section/recognition }}
+
+{{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
+{{> section/speaking }}
+
+{{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+{{> section/testimonials }}
+
+{{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+{{> section/references }}

-{{#if r.writing}}
-      <section id="publications">
-        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
-        </header>
-        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{{ summary }}}{{/if}}
-        {{/each}}
-      </section>
-{{/if}}

-{{# if r.recognition}}
-      <section id="awards">
-        <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
-        </header>
-        {{#each r.recognition}}
-          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
-          {{ summary }}
-        {{/each}}
-      </section>
-{{/if}}

    </main>
  </body>
--- a/themes/compact/src/compact-txt.txt
+++ b/themes/compact/src/compact-txt.txt
@ -1,90 +0,0 @@
-{{!
-
-  compact/txt.txt
-  A plain text resume template for FluentCV's "compact" theme.
-
-}}
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/compact/src/partials/education.xml
+++ b/themes/compact/src/partials/education.xml
@ -1,79 +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>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="https://veridiandynamics.com">{{/if}}
-        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
-          {{#if url }}
-          <w:rPr>
-            <w:rStyle w:val="Hyperlink"/>
-          </w:rPr>
-          {{/if}}
-          <w:t>{{ this.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>
-    <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>
-
-    {{#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/compact/src/partials/skills.xml
+++ b/themes/compact/src/partials/skills.xml
@ -1,11 +1,10 @@
-{{#if r.skills }}
 <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>SKILLS</w:t>
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
    </w:r>
  </w:p>
  <w:tbl>
@ -48,5 +47,4 @@
    {{/each}}

  </w:tbl>
-  {{/if}}
 </wx:sub-section>
--- a/themes/compact/theme.json
+++ b/themes/compact/theme.json
@ -0,0 +1,10 @@
+{
+  "title": "compact",
+  "description": "A compact résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "inherits": {
+    "txt": "basis",
+    "md": "basis"
+  }
+}
--- a/themes/hello-world/README.md
+++ b/themes/hello-world/README.md
@ -6,4 +6,4 @@ A simple résumé theme for example purposes.

 MIT. See [LICENSE.md][lic] for details.

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/hello-world/hello-world.json
+++ b/themes/hello-world/hello-world.json
@ -1,6 +0,0 @@
-{
-  "title": "minimist",
-  "description": "An unstyled starter résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "handlebars"
-}
--- a/themes/hello-world/theme.json
+++ b/themes/hello-world/theme.json
@ -0,0 +1,6 @@
+{
+  "title": "hello-world",
+  "description": "An unstyled starter résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars"
+}
--- a/themes/minimist/README.md
+++ b/themes/minimist/README.md
@ -1,9 +0,0 @@
-Theme: Minimist
-===============
-An unstyled résumé theme.
-
-## License
-
-MIT. See [LICENSE.md][lic] for details.
-
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
--- a/themes/minimist/minimist.json
+++ b/themes/minimist/minimist.json
@ -1,6 +0,0 @@
-{
-  "title": "awesome",
-  "description": "A visually compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "underscore"
-}
--- a/themes/modern/README.md
+++ b/themes/modern/README.md
@ -33,4 +33,4 @@ or a number between 1 and 10.

 MIT. See [LICENSE.md][lic] for details.

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/modern/src/modern-doc.xml
+++ b/themes/modern/src/modern-doc.xml
@ -1,497 +1,233 @@
+{{! <!--
+
+  Welcome to the annotated DOC template of the MODERN theme. This is the
+  template used to generate the output DOC (MS Word) format of your resume when
+  you choose the "modern" theme in HackMyResume or FluentCV.
+
+  These comments will be stripped when the resume is generated.
+
+  FRESH themes are just plain text documents with a bit of template magic
+  built in via Handlebars or Underscore (in this case, Handlebars). Here we're
+  buildng a DOC version of the theme, so we'll create an otherwise normal .DOC
+  document in Word XML 2003 format with WordProcessingML (an XML dialect), then
+  inject data into it using special tags. Where does the data come from? From
+  our FRESH or JSON Resume-format resume, represented in this template through
+  the "r" and "RAW" objects.
+
+    r.some-propery
+    r.some-method
+    RAW.some-other-propery
+
+  So let's begin with a standard <xml> tag and WordProcessingML prelude.
+
+--> }}
 <?xml version="1.0" encoding="UTF-8"?>
 <?mso-application progid="Word.Document"?>
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
  <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
+
+  {{!<!--
+
+    An MS Word document consists of a series of optional and required sections
+    for things like document properties, font information, and document styles.
+    FRESH provides predefined partials for all of these that you can use, or
+    you can always create your own custom markup. Here, we'll go ahead and pull
+    in predefined versions for these Word 2003 XML sections:
+
      <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>
      <w:fonts>
-    <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
-    <w:font w:name="Times New Roman">
-      <w:panose-1 w:val="02020603050405020304"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Roman"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
-    </w:font>
-    <w:font w:name="Calibri">
-      <w:panose-1 w:val="020F0502020204030204"/>
-      <w:charset w:val="00"/>
-      <w:family w:val="Swiss"/>
-      <w:pitch w:val="variable"/>
-      <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
-    </w:font>
-  </w:fonts>
      <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>
      <w:styles>
-    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
-      <w:name w:val="Normal"/>
-      <w:rsid w:val="002743C8"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <wx:font wx:val="Calibri"/>
-        <w:sz-cs w:val="24"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-      <w:pPr>
-        <w:jc w:val="both"/>
-      </w:pPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Heading1">
-      <w:name w:val="heading 1"/>
-      <wx:uiName wx:val="Heading 1"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="Heading1Char"/>
-      <w:rsid w:val="00505903"/>
-      <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on"/>
-        <w:outlineLvl w:val="0"/>
-        <w:pBdr>
-          <w:top w:val="single" w:sz="6" w:space="1" w:color="#EEEEEE" />
-        </w:pBdr>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:color w:val="AEAAAA"/>
-        <w:kern w:val="36"/>
-        <w:sz w:val="40"/>
-        <w:sz-cs w:val="40"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Heading2">
-      <w:name w:val="heading 2"/>
-      <wx:uiName wx:val="Heading 2"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="Heading2Char"/>
-      <w:rsid w:val="00505903"/>
-      <w:pPr>
-        <w:spacing w:before="120"/>
-        <w:outlineLvl w:val="1"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <w:caps/>
-        <w:sz-cs w:val="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="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
-      <w:name w:val="Default Paragraph Font"/>
-    </w:style>
-    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
-      <w:name w:val="Normal Table"/>
-      <wx:uiName wx:val="Table Normal"/>
-      <w:rPr>
-        <wx:font wx:val="Times New Roman"/>
-        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
-      </w:rPr>
-      <w:tblPr>
-        <w:tblInd w:w="0" w:type="dxa"/>
-        <w:tblCellMar>
-          <w:top w:w="0" w:type="dxa"/>
-          <w:left w:w="108" w:type="dxa"/>
-          <w:bottom w:w="0" w:type="dxa"/>
-          <w:right w:w="108" w:type="dxa"/>
-        </w:tblCellMar>
-      </w:tblPr>
-    </w:style>
-    <w:style w:type="list" w:default="on" w:styleId="NoList">
-      <w:name w:val="No List"/>
-    </w:style>
-    <w:style w:type="character" w:styleId="Hyperlink">
-      <w:name w:val="Hyperlink"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:strike w:val="off"/>
-        <w:dstrike w:val="off"/>
-        <w:color w:val="0064BD"/>
-        <w:u w:val="none"/>
-        <w:effect w:val="none"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="FollowedHyperlink">
-      <w:name w:val="FollowedHyperlink"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:strike w:val="off"/>
-        <w:dstrike w:val="off"/>
-        <w:color w:val="7B0796"/>
-        <w:u w:val="none"/>
-        <w:effect w:val="none"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading2Char">
-      <w:name w:val="Heading 2 Char"/>
-      <w:link w:val="Heading2"/>
-      <w:rsid w:val="00505903"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:b/>
-        <w:b-cs/>
-        <w:caps/>
-        <w:sz-cs w:val="36"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading3Char">
-      <w:name w:val="Heading 3 Char"/>
-      <w:link w:val="Heading3"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
-        <w:color w:val="1F4D78"/>
-        <w:sz w:val="24"/>
-        <w:sz-cs w:val="24"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="NormalWeb">
-      <w:name w:val="Normal (Web)"/>
-      <w:basedOn w:val="Normal"/>
-      <w:rsid w:val="001B7422"/>
-      <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
-        <w:jc w:val="both"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Heading1Char">
-      <w:name w:val="Heading 1 Char"/>
-      <w:link w:val="Heading1"/>
-      <w:rsid w:val="00505903"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:color w:val="AEAAAA"/>
-        <w:kern w:val="36"/>
-        <w:sz w:val="40"/>
-        <w:sz-cs w:val="40"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Strong">
-      <w:name w:val="Strong"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:b/>
-        <w:b-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="Emphasis">
-      <w:name w:val="Emphasis"/>
-      <w:rsid w:val="001B7422"/>
-      <w:rPr>
-        <w:i/>
-        <w:i-cs/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="tenure">
-      <w:name w:val="tenure"/>
-      <w:basedOn w:val="DefaultParagraphFont"/>
-      <w:rsid w:val="001B7422"/>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Title">
-      <w:name w:val="Title"/>
-      <w:basedOn w:val="Normal"/>
-      <w:next w:val="Normal"/>
-      <w:link w:val="TitleChar"/>
-      <w:rsid w:val="002D3B7B"/>
-      <w:pPr>
-        <w:contextualSpacing/>
-      </w:pPr>
-      <w:rPr>
-        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
-        <wx:font wx:val="Segoe UI"/>
-        <w:b/>
-        <w:spacing w:val="-10"/>
-        <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="TitleChar">
-      <w:name w:val="Title Char"/>
-      <w:link w:val="Title"/>
-      <w:rsid w:val="002D3B7B"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
-        <w:spacing w:val="-10"/>
-        <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="ListParagraph">
-      <w:name w:val="List Paragraph"/>
-      <w:basedOn w:val="Normal"/>
-      <w:rsid w:val="00C146CA"/>
-      <w:pPr>
-        <w:ind w:left="720"/>
-        <w:contextualSpacing/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="paragraph" w:styleId="Summary">
-      <w:name w:val="Summary"/>
-      <w:basedOn w:val="Normal"/>
-      <w:link w:val="SummaryChar"/>
-      <w:rsid w:val="00A210E1"/>
-      <w:pPr>
-        <w:spacing w:before="120"/>
-      </w:pPr>
-      <w:rPr>
-        <wx:font wx:val="Calibri"/>
-        <w:color w:val="767171"/>
-      </w:rPr>
-    </w:style>
-    <w:style w:type="character" w:styleId="SummaryChar">
-      <w:name w:val="Summary Char"/>
-      <w:link w:val="Summary"/>
-      <w:rsid w:val="00A210E1"/>
-      <w:rPr>
-        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:sz-cs w:val="24"/>
-      </w:rPr>
-    </w:style>
-  </w:styles>
      <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>
+
+    To do that, we'll use the Handlebars partial syntax and pull in the
+    sections one after the other.
+
+  -->}}
+
+  {{> doc-properties }}
+  {{> doc-fonts }}
+  {{> doc-lists }}
+  {{> doc-styles }}
+  {{> doc-pr }}
+
+  {{!<!--
+
+    That bring us to the <w:body> element, where the meat of the Word document
+    is stored.
+
+  -->}}
+
  <w:body>
    <wx:sect>
+
+      {{!<!--
+        Let's create a paragraph containing the user's name. This is the Word
+        concept of a paragraph, not quite the same as a normal paragraph, but
+        close enough. We'll use <w:p> and adorn with a <w:pPr> (paragraph
+        properties) that sets the style of this paragraph to "Title". We don't
+        have to do it this way -- we can insert arbitrary styled content here
+        -- but in practice this is how many Word docs are set up.
+      -->}}
+
      <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="007D096C" wsp:rsidP="00C146CA">
        <w:pPr>
          <w:pStyle w:val="Title"/>
        </w:pPr>
        <w:r>
-          <w:t>{{ r.name }}</w:t>
+
+          {{!<!--
+            Emit the candidate's name into the paragraph, accessible as the
+            .name property on "r", which is the FRESH or JSON Resume resume
+            object. Now, we're creating XML content here, which means that we
+            potentially need to XML-encode the raw text values from the JSON
+            resume model. Luckily, this has already been done for us. Every
+            string property on "r" is already XML-encoded (for Word formats).
+            So we'll use Handlebars triple-bracket syntax to make sure the
+            value isn't further encoded.
+          -->}}
+
+          <w:t>{{{ r.name }}}</w:t>
        </w:r>
      </w:p>
+
+      {{!<!--
+        Let's create another paragraph, using the <w:p> element. The paragraph
+        will contain the candidate's contact info. We'll wrap the whole thing
+        with an #if so that none of the content gets emitted if the resume
+        doesnt have a contact info section (some don't).
+      -->}}
+
+      {{#if r.contact }}
      <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="00505903" wsp:rsidP="00C146CA">
        <w:pPr>
          <w:rPr>
            <w:sz-cs w:val="20"/>
          </w:rPr>
-          <!-- <w:jc w:val="right"/> -->
        </w:pPr>
-        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+        <w:hlink w:dest="mailto:{{{ r.contact.email }}}">
          <w:r wsp:rsidRPr="003876BF">
            <w:rPr>
              <w:rStyle w:val="Hyperlink"/>
              <w:sz w:val="16"/>
            </w:rPr>
-            <w:t>{{ r.contact.email }}<w:br/></w:t>
+            <w:t>{{{ r.contact.email }}}<w:br/></w:t>
          </w:r>
        </w:hlink>
        <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0">
          <w:rPr>
            <w:sz w:val="16"/>
          </w:rPr>
-          <w:t>{{ r.contact.phone }}<w:br/></w:t>
+          <w:t>{{{ r.contact.phone }}}<w:br/></w:t>
        </w:r>
-        <w:hlink w:dest="{{ r.contact.website }}">
+        <w:hlink w:dest="{{{ r.contact.website }}}">
          <w:r wsp:rsidRPr="003876BF">
            <w:rPr>
              <w:rStyle w:val="Hyperlink"/>
              <w:sz w:val="16"/>
            </w:rPr>
-            <w:t>{{ r.contact.website }}</w:t>
+            <w:t>{{{ r.contact.website }}}</w:t>
          </w:r>
        </w:hlink>
      </w:p>
-      {{> info }}
-      {{> skills }}
-      {{> employment }}
-      {{> education }}
-      {{> service }}
-      {{> writing }}
-      {{> recognition }}
+      {{/if}}
+
+      {{!<!--
+
+      We could continue creating custom XML / WordProcessingML content as above,
+      but instead, let's use some predefined "section partials" for the rest
+      of the resume. A section partial is a fragment of markup (XML, in this
+      case) representing a single section of a resume. FRESH provides pre-
+      defined section partials for all resume sections that you can use and
+      override at will.
+
+      First let's create the candidate's INFO or SUMMARY section using the
+      "info" partial. "info" is a theme-specific partial owned by the modern
+      theme.
+
+      -->}}
+
+      {{#section "info"}}{{> info }}{{/section}}
+
+      {{!<!--
+
+      Now let's create the candidate's SKILLS section. The Modern theme uses
+      a skills section with colored skill bars representing the candidate's
+      proficiency with each skill. That's fairly complex to do in Word, and
+      specific to the Modern theme, so we've placed it in the "skills" partial.
+      Like the "info" partial, the "skills" partial is defined by the Modern
+      theme.
+
+      -->}}
+
+      {{#section "skills"}}{{> skills }}{{/section}}
+
+      {{!<!--
+
+      ...and we're done with major customizations for this theme. For the rest
+      of the resume, we'll used predefined SECTION PARTIALS provided by FRESH.
+      The only customization we'll make is overriding the header icon of each
+      partial to use our special embedded FontAwesome image.
+
+      We'll start with the EMPLOYMENT section.
+
+      -->}}
+
+
+      {{!<!-- Create an INLINE PARTIAL called "header-employment". This does
+      not itself render any content. Like any other partial, this one has to
+      be invoked from somewhere in order to actually be rendered. -->}}
+
+      {{#*inline "header-employment"}}
+
+        {{!<!-- Set the content of the partial. We could embed XML directly
+        here, but instead we'll reference the "header-icon" partial provided
+        by FRESH, passing in _title, _section, and _icon values so the the
+        "header-icon" partial knows how to render. -->}}
+
+        {{> header-icon _title="EMPLOYMENT" _section="employment" _icon="pict/emp" }}
+
+      {{!<!-- End the partial -->}}
+      {{/inline}}
+
+      {{!<!--
+        Do the same for each of the other sections. Again, we're just declaring
+        inline partials (templates) here. We're not actually rendering these
+        partials yet.
+      -->}}
+
+      {{#*inline "header-projects"}}{{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }}{{/inline}}
+      {{#*inline "header-education"}}{{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}{{/inline}}
+      {{#*inline "header-service"}}{{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }}{{/inline}}
+      {{#*inline "header-writing"}}{{> header-icon _title="WRITING" _section="writing" _icon="pict/wri" }}{{/inline}}
+      {{#*inline "header-recognition"}}{{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }}{{/inline}}
+      {{#*inline "header-speaking"}}{{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }}{{/inline}}
+
+      {{!<!--
+
+      Now, render each of the remaining sections of the resume in turn. We
+      could emit custom markup for these, but instead we'll take advantage
+      of the predefined "section partials" provided by FRESH, which have
+      names like "section/employment", "section/projects", etc. We'll wrap
+      each section in the special "#section" helper provided by the runtime
+      environment (HackMyResume or FluentCV) in order to allow sections to
+      be selectived hidden or ignored based on users preferences or when the
+      section isn't present or is present but has no items.
+
+      -->}}
+
+      {{#section "employment"}}{{> section/employment }}{{/section}}
+      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "education"}}{{> section/education }}{{/section}}
+      {{#section "service"}}{{> section/service }}{{/section}}
+      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "recognition"}}{{> section/recognition }}{{/section}}
+      {{#section "speaking"}}{{> section/speaking }}{{/section}}
+
+      {{!<!--
+        And we're done! Close off the word document and go home.
+      -->}}
+
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/modern/src/modern-html.css
+++ b/themes/modern/src/modern-html.css
@ -49,7 +49,7 @@ body.pdf #container > header {
  display: block;
 }

-#main > #container > section > span.fa
+span.fa
 {
  position: absolute;
  top: 4px;
@ -65,7 +65,7 @@ hr {
  border-top: 1px solid #EEE;
 }

-.tenure {
+.tenure, .keywords {
  font-size: 75%;
 }

@ -74,14 +74,14 @@ h1 {
  font-size: 46px;
 }

-h3 {
+h2 {
  font-size: 24px;
  color: #BFC1C3;
  text-transform: uppercase;
  font-weight: normal;
 }

-h4 {
+h3 {
  margin-bottom: 0;
  font-size: 18px;
 }
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@ -1,43 +1,160 @@
+{{! <!--
+
+  Welcome to the annotated HTML template of the MODERN theme. This is the
+  template used to generate the output HTML format of your resume when you
+  choose the "modern" theme in HackMyResume or FluentCV.
+
+  These comments will be stripped when the resume is generated.
+
+  FRESH themes are just plain text documents with a bit of template magic
+  built in via Handlebars or Underscore (in this case, Handlebars). Here we're
+  buildng an HTML version of the theme, so we'll create an otherwise normal HTML
+  document, then inject data into it using special tags. Where does the data
+  come from? From our FRESH or JSON Resume-format resume, represented in this
+  template through the "r" and "RAW" objects.
+
+    r.some-propery
+    r.some-method
+    RAW.some-other-propery
+
+  So let's begin with a standard HTML 5 doctype and prelude.
+
+--> }}
+
 <!DOCTYPE html>
 <html>
  <head>
    <meta charset="utf-8">
-    <title>{{ r.name }}</title>
+
+    {{! <!--
+      Set the document <title> to the candidate's name. We use RAW.name here,
+      instead of r.name, because RAW gives us the text *as entered by the user*.
+      The double bracket notation automatically encodes this value. If we wanted
+      the unencoded raw value, we'd use triple brackets as in
+      ((( RAW.name ))).
+    --> }}
+    <title>{{ RAW.name }}</title>
+
+    {{!<!-- TODO: Optimize Google Fonts and Font Awesome access. -->}}
    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+
+    {{! <!--
+      Link in the resume's stylesheet. We could use a <link> tag here as above,
+      or dump the styles into <style></style>, but there's a handy helper
+      available that allows us to do either, conditionally.
+    --> }}
+
    {{{styleSheet "modern-html.css"}}}
+
+    {{! <!--
+      Now, depending on options, "modern-html.css" will either be embedded
+      via <style> stags, or linked via <link>. Users can control this via
+      (for example) the --css option in HackMyResume.
+
+      Why might you want to embed CSS into <style> tags when most CSS guides
+      instruct you to use <link>? Because embedded CSS creates a more hardened
+      "standalone" resume with fewer external dependencies. This may not matter
+      in a typical web scenario, but HTML resumes are also used to drive PDF
+      generation, not to mention emailed, viewed locally, etc.
+
+      TL;DR Use the "styleSheet" helper whenever possible.
+    -->}}
+
  </head>
+
+  {{!<!--
+    So much for the <head> element. Now let's tackle the <body>.
+  -->}}
+
  <body>
-    <main id="main">
+    <main id="main"> {{!<!-- Use your container markup of choice here -->}}
      <div id="container">
      <header>
+
+        {{! <!--
+          Display the candidate's name using "r" (the FRESH or JSON Resume
+          object). Keep in mind that "r" contains the MARKDOWNIFIED version
+          of the text in the user's FRESH or JRS resume because FRESH resume
+          themes support Markdown natively. If you want the un-Markdownified
+          text, you'd use RAW instead.
+        --> }}
+
        <h1>{{{ r.name }}}</h1>
+
+        {{! <!--
+          Give some basic contact info. Here, the HAS helper is similar
+          to a normal IF, but provides a guaranteed-to-be-safe check against a
+          particular object path. That is, ((#if contact.email)) can error out
+          (throw an exception) if contact is null, depending on Handlebars
+          engine settings, but ((#has 'contact.email')) never will.
+        --> }}
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+          {{#has r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>


-{{#if r.info.brief}}
+{{!<!--
+  Now let's emit the candidate's summary, which is stored in r.info.brief.
+  Again we'll use the ((#has)) helper to make sure the candidate HAS a
+  summary, and if so, we'll render an HTML 5 section element containing
+  the Markdownified HTML version of it.
+-->}}
+
+{{#has 'info.brief'}}
 <hr>
 <section id="summary">
-  <h3>About</h3>
+
+  {{!<!--
+    Here we're rendering the title of the summary section, but we don't want
+    to hard code it to "About" or "Summary" because FRESH themes should not
+    assume English. The "sectionTitle" helper allows us to emit an English
+    section title of "About" by default, but provides a hook by which users
+    can override this section title if they want.
+    TL;DR Never write section titles explicitly. Always use the helper.
+  -->}}
+
+  <h2>{{{sectionTitle "info" "About"}}}</h2>
  <span class="fa fa-lg fa-user"></span>
+
+  {{!<!--
+    Emit the actual summary here.
+    Note the use of triple brackets to tell Handlebars not to further encode
+    the value. The value in r.info.brief has already been encoded (when it was
+    converted to HTML) so there's no need to encode it further.
+  -->}}
+
  {{{ r.info.brief }}}
 </section>
-{{/if}}
+{{/has}}


-{{#if r.skills }}
+{{! <!--
+  Okay, let's create a custom SKILLS section with colored skill bars.
+
+  Since this is an official resume section, we want to wrap it in the
+  "section" block helper. This allows the section to be selectively
+  omitted from the resume if either a) the section is empty or b) the user
+  tells us to hide it.
+
+  As fpr the colored bars, those are just standard HTML and CSS, with the
+  height and color of each bar linked to the candidate's skill "level" from
+  the resume.
+
+  TL;DR Always wrap your sections with the "section"!
+--> }}
+
+
+{{#section 'skills' }}
 <hr>
 <section id="skills">
  <header>
-        <h3>Skills</h3>
+  <h2>{{{sectionTitle "Skills"}}}</h2>
  </header>
  <span class="fa fa-lg fa-code"></span>
-
  <ul class="list-unstyled">
    {{#each r.skills.sets}}
      <li class="card card-nested card-skills">
@ -57,121 +174,136 @@
      </li>
    {{/each}}
  </ul>
-
-
 </section>
-{{/if}}
+{{/section}}
+
+{{! <!--
+
+  So much for SKILLS. Now let's render the EMPLOYMENT section.
+
+  We could do this manually with custom HTML, like we did with the SKILLS
+  section, but let's take advantage of some predefined partials instead.
+  FRESH provides global partials for all resume sections (employment, skills,
+  education, speaking, etc.). They're named like this:
+
+      section/skills
+      section/employment
+      section/service
+      section/recognition
+      etc..
+
+  So what we want to do is inject the "section/skills" global partial
+  and use it here in our theme. We can do that simply with:
+
+      ((> section/skills ))
+
+  (Replace the parentheses with brackets). However, in this case we want to
+  override the heading icon used in the global partial as well as its content.
+  That is, we want to use the "section/employment" partial, but selectively
+  override portions of it with our own markup.
+
+--> }}


+{{!<!--
+First, we create an inline partial called "icon-employment." The contents of
+this partial will be referenced by the section/employment partial we invoke
+below. This partial doesn't, by itself, render any content -- it's a template.
+-->}}

-{{#if r.employment}}
-<hr>
-<section id="employment">
-  <header>
-  <h3>Employment</h3>
-  </header>
-  <span class="fa fa-lg fa-building"></span>
-  {{#each r.employment.history}}
+{{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
+
+
+{{!<!--
+Next we create another inline partial called "body-employment" and set its
+contents to the markup we'd like to use for the body section of each job. This
+also doesn't render any content.
+-->}}
+
+{{#*inline "body-employment" }}
+<div>
+  <h3><em>{{ position }}</em>,
    {{#if url }}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    <a href="{{{ url }}}">{{ employer }}</a>
    {{else}}
-    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
+    {{ employer }}
    {{/if}}
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
-    {{{ summary }}}
-    {{#if proj.highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+    {{#if keywords}}
+    {{#if start}}| {{/if}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
    {{/if}}
-  {{/each}}
+  <p>{{{ summary }}}</p>
+  {{> highlights }}
+</div>
+{{/inline}}

-</section>
-{{/if}}
+{{! <!--
+  Actually render the employment section. Invoke the "section/employment"
+  partial (which lives at partials/html/section/employment.html). The header
+  icon and body of each employment stint will be rendered with the markup we
+  defined above.
+--> }}

-{{# if r.education}}
-<hr>
-<section id="education">
-  <header>
-  <h3>Education</h3>
-  </header>
-  <span class="fa fa-lg fa-mortar-board"></span>
-  {{#each r.education.history}}
-    <h4>{{ institution }}</h4>
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
-    {{#if courses}}
-      <ul>
-      {{#each courses}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
+{{> section/employment _icon="icon-employment"}}

-</section>
-{{/if}}

-{{#if r.service}}
-<hr>
-<section id="volunteer">
-  <header>
-  <h3>Service</h3>
-  </header>
-  <span class="fa fa-lg fa-child"></span>
-  {{#each r.service.history}}
+{{! <!--
+  Move on to the PROJECTS section, giving it the same treatment we gave the
+  EMPLOYMENT section.
+--> }}
+
+
+{{#*inline "body-projects" }}
+<div>
+<h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
 {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ website }}}">{{ organization }}</a></h4>
+<a href="{{{ url }}}">{{ title }}</a>
 {{else}}
-    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ organization }}</span></h4>
+{{ title }}
+{{/if}}
+</h3>
+{{#if start}}<span class="tenure">{{dateRange .}}</span>{{/if}}
+{{#if keywords}}
+{{#if start}}| {{/if}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
 {{/if}}
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM'}}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
 {{{ summary }}}
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
+{{> highlights }}
+</div>
+{{/inline}}

-</section>
-{{/if}}
+{{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}

-{{#if r.writing}}
-<hr>
-<section id="publications">
-  <header>
-  <h3>Publications</h3>
-  </header>
-  <span class="fa fa-lg fa-pencil"></span>
-  {{#each r.writing}}
-  {{#if url}}
-  <h4><a href=""><span class="res-label">{{{ title }}}</span></a>, <span>{{{ publisher.name }}}</span></h4>
-  {{else}}
-  <h4><span class="res-label">{{{ title }}}</span>, <span class="defunct">{{{ publisher.name }}}</span></h4>
-  {{/if}}
-  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
-  {{/each}}
-</section>
-{{/if}}
+{{> section/projects _icon="icon-projects"}}

-{{# if r.recognition}}
-<hr>
-<section id="awards">
-  <header>
-  <h3>Awards</h3>
-  </header>
-  <span class="fa fa-lg fa-trophy"></span>
-  {{#each r.recognition}}
-    <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}}</h4>
-    <span class="tenure">{{{ date }}}</span>
-    {{{ summary }}}
-  {{/each}}
-</section>
-{{/if}}
+
+{{! <!--
+  We'll override all section heading icons the same way, for the rest of the
+  resume, using the same inline template technique.
+--> }}
+
+{{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
+{{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
+{{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
+{{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
+{{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
+{{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
+{{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+
+{{! <!--
+  And we're done with the customizations. For the rest of the resume, we'll
+  use the default section partials and style them with whatever CSS we like.
+--> }}
+
+{{> section/education _icon="icon-education"}}
+{{> section/service _icon="icon-service"}}
+{{> section/samples _icon="icon-samples"}}
+{{> section/writing _icon="icon-writing"}}
+{{> section/recognition _icon="icon-recognition"}}
+{{> section/speaking _icon="icon-speaking"}}
+{{> section/testimonials _icon="icon-testimonials"}}
+{{> section/references _icon="icon-references"}}

      </div>
    </main>
--- a/themes/modern/src/modern-md.txt
+++ b/themes/modern/src/modern-md.txt
@ -1,84 +0,0 @@
-{{ r.name }}
-============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-## SKILLS
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-## EMPLOYMENT
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-### Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-## EDUCATION
-
-{{#each r.education.history}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-## WRITING
-
-{{#each r.writing}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-## SERVICE
-
-{{#each r.service.history}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-## RECOGNITION
-
-{{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/modern/src/modern-pdf.css
+++ b/themes/modern/src/modern-pdf.css
@ -11,7 +11,7 @@ body {
  font-size: 15px;
  color: #333;
  line-height: 1.42857143;
-  /*background-color: #F0F0F0;*/
+  background-color: #F0F0F0;
  margin: 0;
  padding: 0;
 }
@ -27,7 +27,7 @@ the PDF case, <main> for the HTML case, and style both via an ID. */
  background-color: #FFF;
  margin: 10px;
  padding: 10px;
-  border: none;
+  border: 1px solid #E6E6E6;
 }

 body.pdf > #main {
@ -49,7 +49,7 @@ body.pdf #container > header {
  display: block;
 }

-#main > #container > section > span.fa
+span.fa
 {
  position: absolute;
  top: 4px;
@ -65,7 +65,7 @@ hr {
  border-top: 1px solid #EEE;
 }

-.tenure {
+.tenure, .keywords {
  font-size: 75%;
 }

@ -74,14 +74,14 @@ h1 {
  font-size: 46px;
 }

-h3 {
+h2 {
  font-size: 24px;
  color: #BFC1C3;
  text-transform: uppercase;
  font-weight: normal;
 }

-h4 {
+h3 {
  margin-bottom: 0;
  font-size: 18px;
 }
--- a/themes/modern/src/modern-pdf.html
+++ b/themes/modern/src/modern-pdf.html
@ -12,38 +12,37 @@
    {{{ cssInfo.data }}}
    </style>
  </head>
-  <body>
+  <body class="pdf">
    <main id="main">
      <div id="container">
      <header>
        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+          {{#has r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>
-      </header>


 {{#if r.info.brief}}
 <hr>
 <section id="summary">
-  <h3>About</h3>
+  <h2>{{{sectionTitle "info" "About"}}}</h2>
  <span class="fa fa-lg fa-user"></span>
  {{{ r.info.brief }}}
 </section>
 {{/if}}

+{{!<!-- A custom skills section with colored skill bars. -->}}

-{{#if r.skills }}
+{{#section 'skills' }}
      <hr>
      <section id="skills">
        <header>
-        <h3>Skills</h3>
+        <h2>{{{sectionTitle "Skills"}}}</h2>
        </header>
        <span class="fa fa-lg fa-code"></span>
-
        <ul class="list-unstyled">
          {{#each r.skills.sets}}
            <li class="card card-nested card-skills">
@ -63,121 +62,45 @@
            </li>
          {{/each}}
        </ul>
-
-
      </section>
-{{/if}}
+{{/section}}

+{{!<!--
+  Use predefined global partials for the other sections.

+  The "inline" bit before each section allows us to pass a custom heading
+  icon into the global partial. For this theme, we're using Font Awesome.
+-->}}

-{{#if r.employment}}
-<hr>
-<section id="employment">
-  <header>
-  <h3>Employment</h3>
-  </header>
-  <span class="fa fa-lg fa-building"></span>
-  {{#each r.employment.history}}
-    {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
-    {{else}}
-    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
-    {{/if}}
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
-    {{{ summary }}}
-    {{#if proj.highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
+{{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
+{{> section/employment }}

-</section>
-{{/if}}
+{{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
+{{> section/projects }}

-{{# if r.education}}
-<hr>
-<section id="education">
-  <header>
-  <h3>Education</h3>
-  </header>
-  <span class="fa fa-lg fa-mortar-board"></span>
-  {{#each r.education.history}}
-    <h4>{{ institution }}</h4>
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
-    {{#if courses}}
-      <ul>
-      {{#each courses}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
+{{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
+{{> section/education }}

-</section>
-{{/if}}
+{{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
+{{> section/service }}

-{{#if r.service}}
-<hr>
-<section id="volunteer">
-  <header>
-  <h3>Service</h3>
-  </header>
-  <span class="fa fa-lg fa-child"></span>
-  {{#each r.service.history}}
-    {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ website }}}">{{ organization }}</a></h4>
-    {{else}}
-    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ organization }}</span></h4>
-    {{/if}}
-    <span class="tenure">{{formatDate safe.start 'YYYY-MM'}}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
-    {{{ summary }}}
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{ this }}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
-  {{/each}}
+{{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
+{{> section/samples }}

-</section>
-{{/if}}
+{{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
+{{> section/writing }}

-{{#if r.writing}}
-<hr>
-<section id="publications">
-  <header>
-  <h3>Publications</h3>
-  </header>
-  <span class="fa fa-lg fa-pencil"></span>
-  {{#each r.writing}}
-  {{#if url}}
-  <h4><a href=""><span class="res-label">{{{ title }}}</span></a>, <span>{{{ publisher.name }}}</span></h4>
-  {{else}}
-  <h4><span class="res-label">{{{ title }}}</span>, <span class="defunct">{{{ publisher.name }}}</span></h4>
-  {{/if}}
-  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
-  {{/each}}
-</section>
-{{/if}}
+{{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
+{{> section/recognition }}

-{{# if r.recognition}}
-<hr>
-<section id="awards">
-  <header>
-  <h3>Awards</h3>
-  </header>
-  <span class="fa fa-lg fa-trophy"></span>
-  {{#each r.recognition}}
-    <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}}</h4>
-    <span class="tenure">{{{ date }}}</span>
-    {{{ summary }}}
-  {{/each}}
-</section>
-{{/if}}
+{{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
+{{> section/speaking }}
+
+{{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+{{> section/testimonials }}
+
+{{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+{{> section/references }}

      </div>
    </main>
--- a/themes/modern/src/modern-txt.txt
+++ b/themes/modern/src/modern-txt.txt
@ -1,84 +0,0 @@
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/modern/src/partials/education.xml
+++ b/themes/modern/src/partials/education.xml
@ -1,94 +0,0 @@
-<wx:sub-section>
-  <wx:pBdrGroup>
-    <wx:borders>
-      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
-    </wx:borders>
-    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
-      <w:pPr>
-        <w:pStyle w:val="Heading1"/>
-      </w:pPr>
-      <w:r>
-        <w:pict>
-          <w:binData w:name="wordml://03000004.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaFQTFRFv8HDv8LIv8HGv8HEv8HKv8HMv8jXv8HOv8jZv8TT3dLS2c7Kw8HDwcbM08rIwcHDwcTKz9Lbz8jGy9DXy8bEyczTycTDxcrSx8LDw8jV2dDMxcHD3dLOw8jO1cTDx8rSwc7fzdLbz8LD1czK3dLTx8HD28jDy8HDy8zOz8rI0cLD3crD18jE0cjGyc7Z29LQz8rKxcLEw8LEw8TKy8zQ1djdzcHD1drk09bi09jm0dbizdz/xdLqy9jsxdTswc7i3ePs2eHo2+Ps2e3/z+H/3ev/2/X/3fn/2e//z+H71en/69zT6djS49LO/d7Q6drT4czD59TQ/97O/drM79LG5c7E8ePZ+eHS7eHX8+Pb/+/X/ePS8ePb//Xb9eXZ7+Pd///d/+nT/+HQ///7+evk8fX7///59+fi6/P5//v16ev1/f////nz5efz+////fXs+fv/+/Po9/n/6////evi9///8/n////q//nu4+fz///i+fHw9fX7///18//q4f/q8//i//nm6+/7///o+f//7///4///9+/w8+/w8/P5////rwMOhgAAAWBJREFUSMdj6CIaMIwqHVVKL6XJKVzmqUQoTUvn5mEAAl6LDLxKM8P4+BngQEAwKxu70hxvISR1EMAonJuHrjTfR4QBO2ASdShAKC30FWPAC8Qdi8BKwyUYiACSxUClJVLShFXyWpaCHZCcIoPXBbLmZUjeKpfDoYxZ3qkANQT8+FmcK/zRQ4tJtDIPPVyTAxgUQMGdGYGIA0ZF1BiAKq1SYnbpCgQHSVqkMjBmBawywJ5QcUVXGqXK4tYVAPQoOJ0kV9eAU4MUMBit0ZVG87C616pBYh5sXmaMMjjVYCiNVWdgYKuDBwKjhibcxehKg4Bi7PVYw8sGm6kNWsQo7QpmYPGo1cYWA57oSkMYmLy6GnUwVdpmoysNBbs/OU4XNbL0mjCiABROdpCsEK9vYGgEBMYmpmiRBVHaDPS8PXGZO8GMgYGjhSilicDEzdlKlNIkYOSwtxGlNK29o6OToFsBkPOxfsuGle0AAAAASUVORK5CYIJ=</w:binData>
-          <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
-            <v:imagedata src="wordml://03000004.png" o:title="fa-mortar-board"/>
-          </v:shape>
-        </w:pict>
-      </w:r>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>EDUCATION</w:t>
-      </w:r>
-    </w:p>
-  </wx:pBdrGroup>
-
-  {{#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,105 +0,0 @@
-<wx:sub-section>
-  <wx:pBdrGroup>
-    <wx:borders>
-      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
-    </wx:borders>
-    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
-      <w:pPr>
-        <w:pStyle w:val="Heading1"/>
-      </w:pPr>
-      <w:r>
-        <w:pict>
-          <w:binData w:name="wordml://03000003.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASZQTFRFv8HDv8HOv8HGv8LIv8TTv8zdv8LOv8bVv8LEv8HEv8HKv8rbv8LQv8HIv8jXv8HMv8LKv8TQz8bEw8LEw8LGydDfyczOz8jGw8jOz8zKw8HDwcbMz8zOycTDy8zOzcHD1cTDxcHDz8LD3crEwcHDwcLEw8LDycHDx8HD0cLDy8HD1drb3dTMy9Tb3drTycLDwcrV3drb1cjE29rb287Izdz/z9zsxdDky9r7ydbs2/X/2/H/1eXw79LG79zQ69bK7dLG487E897Q89bK/+3d///d/+nT8+vd//XZ/+fT//HZ/ePS8+XV8+/f//vb9///4f//7//////q4evw8+/s6+/w7f/////o/f//4+/w8+/w7+/w4fv/4//////59+/w8/P5////sDySyAAAAP9JREFUSMdjSCQaMIwqHZJKXYSEsQARUX9MpbYMWAFjAD2VMomJMzBISEoxSMvIMjDLieNRyhLoKs8YEKTAYArksia6KeJWyhZsJ8Vk5q7EYB6izMAeaq9CHW+pqjEwcAAxpzDQQFUVvG71UOeyArrVAuxWTzxuZQnzUueyDgcpdWDgjvCWoncU8ET6aPDa+GoyWEY5MvBFO0nh85afFn8MUVEADixVYEBBAkuNOm4V0NZR4dTV02cwMDRiEDQ2oU5yIcFUUpMLHOANAVC4wlXidysothg4wLlahUBsgQCXFQoXn1KoHJWVkuAAuLdwK3XGEQWxmErj4qOwgQS4AgDkC738cGCe/AAAAABJRU5ErkJggk==</w:binData>
-          <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
-            <v:imagedata src="wordml://03000003.png" o:title="fa-building"/>
-          </v:shape>
-        </w:pict>
-      </w:r>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>EMPLOYMENT</w:t>
-      </w:r>
-    </w:p>
-  </wx:pBdrGroup>
-  <!-- <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>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/themes/modern/src/partials/info.xml
+++ b/themes/modern/src/partials/info.xml
@ -36,7 +36,7 @@
        </w:pict>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>ABOUT</w:t>
+        <w:t>{{{sectionTitle "info" "ABOUT"}}}</w:t>
      </w:r>
    </w:p>
  </wx:pBdrGroup>
--- a/themes/modern/src/partials/recognition.xml
+++ b/themes/modern/src/partials/recognition.xml
@ -1,86 +0,0 @@
-{{#if r.recognition}}
-<wx:sub-section>
-  <wx:pBdrGroup>
-    <wx:borders>
-      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
-    </wx:borders>
-    <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>
-        <w:pict>
-          <w:binData w:name="wordml://03000007.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUFQTFRFv8HDv8HEv8bVv8HOv8HMv8HKv8zdv8LSv8TTv8TSv8jZv8HGv8LIv8LQv8LKv8HI08zOz8zOz87TzcHDy8HDwcHDw8LEwcLE1cTDzcLDw87f18jExcHDx8LDwcTK3dTM0djb08LD0cbDw8rVwczdzdzxzdz/xdLmw9Dk0djkzdrw0droz97xwdDky9jo3eXw2+/w2e3/0+P/z+H/0+P71ePx7dLI79LG/dzO4crD4czE99zO89bK49LM8drO5dTM7dbK99rM5dDI7+HX///d8+/Z/eHQ//Xb//Xd8e3Z7+Pd//Hf///5/f/////77///4f//+/Pw8+/w9fX76f/////q6fv////o+f//+//////x6///9fv///nm4/Po//nu+fv/4+Ps///k/fXx8+/s9/n/6/n/5f//+fHw8/P5////sapGIwAAASVJREFUSMdjyCIaMIwqHVVKB6U+zgKCMCCk74tHqZ8ZAxJgVMWj1EUYWSkDkz/RSpkDsCoNDAICVxEUpSwGIMFgNKVuogy4AKshqlJzBkYxIEBTJQ4UEmVQQ1fKhulW9pCsrFAJopRy+GNTasHAGZaVFS6BopQrIivLXYTRCFWphySDemSWnyWKUo2srCgrBs5otMCyFmWQismyQYkt46xYaQZuE/RwBcUpj6YncsDyxtnKMDBq+WLElp+dDJZA5TPFGrHx9rJoCuW0E3AmwkAveVi08SskBuNP2n4OELXcOkTkAkeQWoS/8SlNUoSGPmGl4HjQJSobhkoQaWpyihM4pvSCUvEr9VZCClXlNDxKQ1FTlkoE0dmQN50qSv0ygpBBJqpbAYc7NrM+qyXXAAAAAElFTkSuQmCC</w:binData>
-          <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
-            <v:imagedata src="wordml://03000007.png" o:title="fa-trophy"/>
-          </v:shape>
-        </w:pict>
-      </w:r>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>RECOGNITION</w:t>
-      </w:r>
-    </w:p>
-  </wx:pBdrGroup>
-
-  {{#each r.recognition}}
-
-  <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-MM'}}</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>
-
-    {{#if highlights}}
-    {{#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}}
-    {{/if}}
-
-  </wx:sub-section>
-
-  {{/each}}
-
-</wx:sub-section>
-{{/if}}
--- a/themes/modern/src/partials/service.xml
+++ b/themes/modern/src/partials/service.xml
@ -1,99 +0,0 @@
-{{#if r.service }}
-<wx:sub-section>
-  <wx:pBdrGroup>
-    <wx:borders>
-      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
-    </wx:borders>
-    <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>
-        <w:pict>
-          <w:binData w:name="wordml://03000005.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMxQTFRFv8HDv8HEv8jXv8HOv8LSv8TTv8zdv8LKv8bT3czIwcHDwcTM18bDxcHDw8zdx8HD08bDw8HDw8rZ3drbz8TDycHDzcHDw8LDwc7ixdLqzdzxxdLoxdTs1ePx0eH72+n//dzO79LG89bK+9rM997Q5drb/9zO7dbK5c7G/+nV++XT/+3X//Hf//HZ///d/+fT//nq///q8////fXx8+/z+///4f//9///6f///f//7/////Xk8fv///Hk/fXo5ef1///7///x6fX/////TAOGGAAAALpJREFUSMft1NcOgjAUBuCDe4Hixr33Xohb+/7vZCnEKC3ShEv4b5om30Xzn5wC4g741Keu6CqegGSdh65TgCM0OGgLSAKbv3S72yPUNmjwYN6ZdCyCpKKOQUNHNBGhrLFpFwtJnaYJVXQJ4RObnjPE9mR8ZC+6FCp2b70a9tbP3TVKWhog9pNfaS3r21ok1essbyfpEcwLJq06TmtRNKniZSqUuGlk4Hm6xCtQc6SPoRxtPkcQe7n4s96JF4yPwZXEugAAAABJRU5ErkJggk==</w:binData>
-          <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
-            <v:imagedata src="wordml://03000005.png" o:title="fa-child"/>
-          </v:shape>
-        </w:pict>
-      </w:r>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>SERVICE</w:t>
-      </w:r>
-    </w:p>
-  </wx:pBdrGroup>
-
-  {{#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>
-{{/if}}
--- a/themes/modern/src/partials/skills.xml
+++ b/themes/modern/src/partials/skills.xml
@ -37,19 +37,11 @@
        </w:pict>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>SKILLS</w:t>
+        <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
      </w:r>
    </w:p>
  </wx:pBdrGroup>

-  <!-- <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"/>
@ -72,16 +64,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/themes/modern/src/partials/writing.xml
+++ b/themes/modern/src/partials/writing.xml
@ -1,91 +0,0 @@
-{{#if r.writing}}
-<wx:sub-section>
-  <wx:pBdrGroup>
-    <wx:borders>
-      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
-    </wx:borders>
-    <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>
-        <w:pict>
-          <w:binData w:name="wordml://03000006.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAI1QTFRFv8HDv8HEv8bVv8jXv8LKv8HGv8HIv8zdv8rZv8TT18bDxcHD2dLd1cbDwczd2cjDxcLKwc7fxcTDx8HDz8TDy9jszdzxy9jmy9jo2ef72+n/1eX56dLI79LG/efT/+3X//Hf///59+/w9fX7//vo/f//9///7///8////fv7//nm8+/w8/H1/fXx////vxL+UwAAAMZJREFUSMft1NkSgjAMBdCL4i7uG+4KiIr2/z/PwghtsYk8+WSez2TuJJlAVC786Z/+mp7OQUUaduHMoypUSpgWnDQtRfc9lK2dhv1LYRcsDT0MCluLGSollK1faSqlsxzm1vXpAKlcbfO+Sn7SQmZ25NNz1WRqb/S2DAl3Td9ASfr0ubDSoLzU6Rep0XRHY0YqKmVjAkYqukNzc/cYqdOWEG9rlTptJ48os3apU6ATi8OUkmV6nJHSpHROG6Wlos8kq4D+Ni/aqw5+HvnsQQAAAABJRU5ErkJggk==</w:binData>
-          <v:shape id="_x0000_i1030" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
-            <v:imagedata src="wordml://03000006.png" o:title="fa-pencil"/>
-          </v:shape>
-        </w:pict>
-      </w:r>
-      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>WRITING</w:t>
-      </w:r>
-    </w:p>
-  </wx:pBdrGroup>
-
-  {{#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>
-{{/if}}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
hacksalot	06e458eab7	Remove unused files.	2016-01-06 10:30:08 -05:00
hacksalot	66d6c14436	Continue refactoring.	2016-01-06 10:23:40 -05:00
hacksalot	1e2a8476b3	Reorganize.	2016-01-06 06:47:56 -05:00
hacksalot	795dfe42c0	Reorganize.	2016-01-06 06:45:28 -05:00
hacksalot	368af772c2	Modern: MS Word: Adjust star icon height.	2016-01-06 06:37:39 -05:00
hacksalot	3e833234f7	Word: Refactor embedded FA icons.	2016-01-06 06:28:25 -05:00
hacksalot	b9a7848cf1	Update README.	2016-01-06 05:44:05 -05:00
hacksalot	50017c43e9	Continue fleshing out themes. Add sections and increase DRY.	2016-01-06 04:56:16 -05:00
hacksalot	b4a93020ec	Introduce global theme partials.	2016-01-06 03:51:13 -05:00
hacksalot	9fd0ce9695	...	2016-01-05 10:22:50 -05:00
hacksalot	b43e520f40	Use explicit HTML format for Compact theme.	2016-01-05 09:02:14 -05:00
hacksalot	aaf5755556	Tweak heading in Basis theme.	2016-01-05 08:59:58 -05:00
hacksalot	3261c01075	Remove Font Awesome references from Basis theme.	2016-01-05 08:58:40 -05:00
hacksalot	dad62fe610	Adjust message for Basis theme.	2016-01-05 08:48:32 -05:00
hacksalot	c15a60d576	Update author info.	2016-01-05 08:48:09 -05:00
hacksalot	e48a3f493f	Continue fleshing out themes.	2016-01-05 07:56:40 -05:00
hacksalot	2eaa34ff3f	Fix COMPACT and POSITIVE theme inheritance.	2016-01-05 06:42:26 -05:00
hacksalot	d243f5f472	Remove explicit TXT and MD formats. Themes will now inherit these formats from the Basis theme by default.	2016-01-05 06:27:52 -05:00
hacksalot	d6a9880717	Introduce "Basis" theme.	2016-01-05 06:26:39 -05:00
hacksalot	45d4cd2675	All: Better section handling & add projects.	2016-01-05 04:50:43 -05:00
hacksalot	6f2a71070e	Fix: Positive: Generation error.	2016-01-05 00:28:34 -05:00
hacksalot	27b7273228	Update license info.	2016-01-05 00:24:27 -05:00
hacksalot	e483144436	Bump version to 0.11.0-beta.	2016-01-05 00:24:18 -05:00
hacksalot	f06f97d364	Start using {{hasSection}} helper.	2016-01-05 00:24:07 -05:00
hacksalot	cf1360bc77	Patch Minimist theme.	2016-01-04 17:29:21 -05:00
hacksalot	f49df02d6a	Allow user-specified section headings.	2016-01-04 17:07:30 -05:00
hacksalot	4954079a6f	Fix: Modern: Double-encoding issue. Fixes hacksalot/hackmyresume#57.	2016-01-04 15:07:46 -05:00
hacksalot	68c1afd98b	Update package.json.	2016-01-04 07:31:42 -05:00
hacksalot	06016b8883	Bump version to 0.10.0-beta.	2016-01-04 04:08:37 -05:00
hacksalot	2c5611850b	Rename [theme-name].json to theme.json.	2016-01-04 04:08:25 -05:00
hacksalot	8d28b11fb3	Compact: Tweak Word document WPML.	2016-01-04 04:03:37 -05:00
hacksalot	c0783a4bd2	Bump version.	2015-12-30 20:29:33 -05:00
hacksalot	0d115f15ba	Merge pull request #22 from fluentdesk/dev Fix minimist stylesheet glitch.	2015-12-30 20:19:20 -05:00
hacksalot	ad939ae0fc	Minimist: Use stylesheet helper.	2015-12-30 20:14:50 -05:00
hacksalot	08dadb6f79	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2015-12-30 20:14:27 -05:00
hacksalot	8361cfa12d	Merge branch 'master' of https://github.com/fluentdesk/fresh-themes	2015-12-30 18:37:10 -05:00
hacksalot	0bdecd83f2	Bump version to 0.9.2-beta.	2015-12-30 18:37:05 -05:00
hacksalot	4458059c6f	Update docs with new name.	2015-12-30 18:35:11 -05:00
hacksalot	c74388171d	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2015-12-30 18:34:39 -05:00
hacksalot	4433f5daca	Merge pull request #21 from fluentdesk/dev dev	2015-12-30 18:27:42 -05:00