change spacing on full resume link

Make sure partials use either the {{date}} or {{dateRange}} helpers.

.gitignore

@@ -1,2 +1,3 @@
 # It is pitch black. You are likely to be eaten by a grue.
 informatic-new/
+assets/

LICENSE.md

@@ -1,7 +1,7 @@
 The MIT License
 ===============
 
-Copyright (c) 2015 James M. Devlin (https://github.com/hacksalot)
+Copyright (c) 2016 hacksalot (https://github.com/hacksalot)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,26 +1,87 @@
 fresh-themes
 ============
 
-Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
+*Stylized templates for your résumé and/or CV, compatible with [FRESH/FRESCA][f]
-[JSON Resume][jrs] formats.
+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.
-- [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
+## How It Works
-[FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest
-official standalone version of the theme repository over NPM...
 
-`[sudo] npm install fresh-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 +95,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
+in your theme's JSON file.
-can work with FRESH themes.
 
 ## 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
 
@@ -53,11 +114,14 @@ MIT. See [LICENSE.md][1] for details.
 [2]: https://github.com/fluentdesk/fluentcv
 [3]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
+[h]: https://github.com/fluentdesk/fresh-themes/blob/dev/themes/modern/src/modern-html.html
+[d]: https://github.com/fluentdesk/fresh-themes/blob/dev/themes/modern/src/modern-doc.xml
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
 [t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
-[t-minimist]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/minimist
+[t-underscore]: https://github.com/fluentdesk/fresh-themes-underscore
 [t-modern]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/modern
 [t-hello]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/hello-world
 [t-compact]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/compact
 [t-positive]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/positive
+[hmr]: https://github.com/hacksalot/hackmyresume

package.json

@@ -1,29 +1,38 @@
 {
   "name": "fresh-themes",
-  "version": "0.9.2-beta",
+  "version": "0.15.1-beta",
-  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
+  "description": "Multiformat themes and templates for your résumé / CV.",
   "repository": {
     "type": "git",
     "url": "https://github.com/fluentdesk/fresh-themes.git"
   },
-  "main": "themes/README.md",
+  "main": "README.md",
   "keywords": [
     "résumé",
     "resume",
     "CV",
+    "employment",
     "portfolio",
     "Handlebars",
     "Underscore",
     "Markdown",
     "LaTeX",
     "HTML",
+    "Word",
     "Microsoft Word",
     "PDF",
     "Acrobat",
+    "Adobe",
     "JSON",
     "YAML"
   ],
   "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "contributors": [
+    "Brett Hardin (https://github.com/bhardin)",
+    "Evan Plaice <evanplaice@gmail.com> (https://github.com/evanplaice)",
+    "Ya Zhuang (https://github.com/zhuangya)",
+    "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/fluentdesk/fresh-themes/issues"

partials/doc/doc-fonts.hbs

@@ -0,0 +1,48 @@
+{{!
+  The w:fonts node contains font setup information for the Word document,
+  including the default font as well as optional descriptions of fonts via
+  the <w:font> element.
+
+  This node is optional, but if omitted, Word will create a default <w:fonts>
+  section on save, with defaults (like Times New Roman) that are probably not
+  ideal for a specific use case. So we include this section by default, and set
+  the fonts to the theme's declared typography settings.
+}}
+
+<w:fonts>
+  {{!
+    The defaultFonts element defines the font to use when no other font or
+    formatting is specified. It's optional, but if not specified, Word will
+    fill it in to a default value. (Usually, it sets all four font families
+    to "Times New Roman").
+  }}
+  <w:defaultFonts w:ascii="{{{fontFace 'default' 'Calibri'}}}" w:fareast="{{{fontFace 'default' 'Calibri'}}}" w:h-ansi="{{{fontFace 'default' 'Calibri'}}}" w:cs="{{{fontFace 'default' 'Calibri'}}}"/>
+
+  {{!
+    Here go individual <w:font> entries. These are not required to actually use
+    any fonts, but are used by Word when it has to reconstruct a missing font.
+    Since fonts are not embedded into Word documents, this allows Word to
+    display the document without losing too much visual fidelity.
+
+    In a standard Word document, this first entry would also be set to Times
+    New Roman.
+  }}
+
+  <w:font w:name="{{{fontFace 'default' 'Calibri'}}}">
+    <w:panose-1 w:val="02020603050405020304"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Roman"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
+  </w:font>
+
+
+  <w:font w:name="Calibri">
+    <w:panose-1 w:val="020F0502020204030204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="Swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
+  </w:font>
+
+</w:fonts>

partials/doc/doc-lists.hbs

@@ -0,0 +1,118 @@
+<w:lists>
+  <w:listDef w:listDefId="1">
+    <w:lsid w:val="602C53DD"/>
+    <w:plt w:val="HybridMultilevel"/>
+    <w:tmpl w:val="61849B8C"/>
+    <w:lvl w:ilvl="0" w:tplc="DD7ED086">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="•"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="720" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="1" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="1440" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="2" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="2160" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="3" w:tplc="04090001" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="2880" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="4" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="3600" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="5" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="4320" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="6" w:tplc="04090001" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="5040" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="7" w:tplc="04090003" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val="o"/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="5760" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+    <w:lvl w:ilvl="8" w:tplc="04090005" w:tentative="on">
+      <w:start w:val="1"/>
+      <w:nfc w:val="23"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:ind w:left="6480" w:hanging="360"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+      </w:rPr>
+    </w:lvl>
+  </w:listDef>
+  <w:list w:ilfo="1">
+    <w:ilst w:val="1"/>
+  </w:list>
+</w:lists>

partials/doc/doc-pr.hbs

@@ -0,0 +1,41 @@
+<w:docPr>
+  <w:view w:val="print"/>
+  <w:zoom w:percent="98"/>
+  <w:doNotEmbedSystemFonts/>
+  <w:defaultTabStop w:val="720"/>
+  <w:characterSpacingControl w:val="DontCompress"/>
+  <w:webPageEncoding w:val="unicode"/>
+  <w:optimizeForBrowser/>
+  <w:allowPNG/>
+  <w:validateAgainstSchema/>
+  <w:saveInvalidXML w:val="off"/>
+  <w:ignoreMixedContent w:val="off"/>
+  <w:alwaysShowPlaceholderText w:val="off"/>
+  <w:compat>
+    <w:breakWrappedTables/>
+  </w:compat>
+  <wsp:rsids>
+    <wsp:rsidRoot wsp:val="00C146CA"/>
+    <wsp:rsid wsp:val="000A3AF0"/>
+    <wsp:rsid wsp:val="001B7422"/>
+    <wsp:rsid wsp:val="002743C8"/>
+    <wsp:rsid wsp:val="002865F0"/>
+    <wsp:rsid wsp:val="002D3B7B"/>
+    <wsp:rsid wsp:val="00397D4D"/>
+    <wsp:rsid wsp:val="00437135"/>
+    <wsp:rsid wsp:val="00505903"/>
+    <wsp:rsid wsp:val="00606071"/>
+    <wsp:rsid wsp:val="006C2CFB"/>
+    <wsp:rsid wsp:val="00771B3E"/>
+    <wsp:rsid wsp:val="007D096C"/>
+    <wsp:rsid wsp:val="009452CA"/>
+    <wsp:rsid wsp:val="00A210E1"/>
+    <wsp:rsid wsp:val="00B43FDC"/>
+    <wsp:rsid wsp:val="00C146CA"/>
+    <wsp:rsid wsp:val="00C77315"/>
+    <wsp:rsid wsp:val="00CD3781"/>
+    <wsp:rsid wsp:val="00E578D4"/>
+    <wsp:rsid wsp:val="00EA0B64"/>
+    <wsp:rsid wsp:val="00FE101B"/>
+  </wsp:rsids>
+</w:docPr>

partials/doc/doc-properties.hbs

@@ -0,0 +1,17 @@
+<o:DocumentProperties>
+  <o:Title>Resume for {{ r.name }}</o:Title>
+  <o:Author>{{ r.name }}</o:Author>
+  <o:Keywords>resume;CV</o:Keywords>
+  <o:LastAuthor>{{ r.name }}</o:LastAuthor>
+  <o:Revision>1</o:Revision>
+  <o:TotalTime>60</o:TotalTime>
+  <o:Created>2015-12-16T17:38:00Z</o:Created>
+  <o:LastSaved>2015-12-16T18:32:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>241</o:Words>
+  <o:Characters>1379</o:Characters>
+  <o:Lines>11</o:Lines>
+  <o:Paragraphs>3</o:Paragraphs>
+  <o:CharactersWithSpaces>1617</o:CharactersWithSpaces>
+  <o:Version>15</o:Version>
+</o:DocumentProperties>

partials/doc/doc-styles.hbs

@@ -0,0 +1,253 @@
+<w:styles>
+  <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
+    <w:name w:val="Normal"/>
+    <w:rsid w:val="002743C8"/>
+    <w:rPr>
+      <w:rFonts w:ascii="{{{fontFace 'default' 'Calibri'}}}" w:h-ansi="{{{fontFace 'default' 'Calibri'}}}"/>
+      <wx:font wx:val="{{{fontFace 'default' 'Calibri'}}}"/>
+      <w:sz-cs w:val="24"/>
+      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+    </w:rPr>
+    <w:pPr>
+      <w:jc w:val="both"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading1">
+    <w:name w:val="heading 1"/>
+    <wx:uiName wx:val="Heading 1"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="Heading1Char"/>
+    <w:rsid w:val="00505903"/>
+    <w:pPr>
+      <w:spacing w:before="100" w:before-autospacing="on"/>
+      <w:outlineLvl w:val="0"/>
+      <w:pBdr>
+        <w:top w:val="single" w:sz="6" w:space="1" w:color="{{{color 'heading-border' 'EEEEEE'}}}" />
+      </w:pBdr>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'heading1' 'AEAAAA'}}}"/>
+      <w:kern w:val="36"/>
+      <w:sz w:val="{{{fontSize 'heading1' 40 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'heading1' 40 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading2">
+    <w:name w:val="heading 2"/>
+    <wx:uiName wx:val="Heading 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="Heading2Char"/>
+    <w:rsid w:val="00505903"/>
+    <w:pPr>
+      <w:spacing w:before="120"/>
+      <w:outlineLvl w:val="1"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:b/>
+      <w:b-cs/>
+      <w:caps/>
+      <w:sz-cs w:val="36"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading3">
+    <w:name w:val="heading 3"/>
+    <wx:uiName wx:val="Heading 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="Heading3Char"/>
+    <w:rsid w:val="001B7422"/>
+    <w:pPr>
+      <w:spacing w:before="240" w:after="100" w:after-autospacing="on"/>
+      <w:outlineLvl w:val="2"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{fontFace 'heading3'}}"/>
+      <w:b/>
+      <w:b-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
+    <w:name w:val="Default Paragraph Font"/>
+  </w:style>
+  <w:style w:type="table" w:default="on" w:styleId="TableNormal">
+    <w:name w:val="Normal Table"/>
+    <wx:uiName wx:val="Table Normal"/>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'table' 'Calibri'}}}"/>
+      <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblCellMar>
+        <w:top w:w="0" w:type="dxa"/>
+        <w:left w:w="108" w:type="dxa"/>
+        <w:bottom w:w="0" w:type="dxa"/>
+        <w:right w:w="108" w:type="dxa"/>
+      </w:tblCellMar>
+    </w:tblPr>
+  </w:style>
+  <w:style w:type="list" w:default="on" w:styleId="NoList">
+    <w:name w:val="No List"/>
+  </w:style>
+  <w:style w:type="character" w:styleId="Hyperlink">
+    <w:name w:val="Hyperlink"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:strike w:val="off"/>
+      <w:dstrike w:val="off"/>
+      <w:color w:val="{{{color 'hyperlink' '0064BD'}}}"/>
+      <w:u w:val="none"/>
+      <w:effect w:val="none"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="FollowedHyperlink">
+    <w:name w:val="FollowedHyperlink"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:strike w:val="off"/>
+      <w:dstrike w:val="off"/>
+      <w:color w:val="{{{color 'visited' '7B0796'}}}"/>
+      <w:u w:val="none"/>
+      <w:effect w:val="none"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading2Char">
+    <w:name w:val="Heading 2 Char"/>
+    <w:link w:val="Heading2"/>
+    <w:rsid w:val="00505903"/>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading2' 'Calibri'}}}"/>
+      <w:b/>
+      <w:b-cs/>
+      <w:caps/>
+      <w:sz-cs w:val="{{{fontSize 'heading2' 36 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading3Char">
+    <w:name w:val="Heading 3 Char"/>
+    <w:link w:val="Heading3"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:rFonts w:ascii="{{{fontFace 'heading3' 'Calibri'}}}" w:fareast="{{{fontFace 'heading3' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading3' 'Calibri'}}}" w:cs="{{{fontFace 'heading3' 'Calibri'}}}"/>
+      <w:color w:val="1F4D78"/>
+      <w:sz w:val="{{{fontSize 'heading3' 24 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'heading3' 24 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="NormalWeb">
+    <w:name w:val="Normal (Web)"/>
+    <w:basedOn w:val="Normal"/>
+    <w:rsid w:val="001B7422"/>
+    <w:pPr>
+      <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+      <w:jc w:val="both"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'default-view-web' 'Calibri' }}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Heading1Char">
+    <w:name w:val="Heading 1 Char"/>
+    <w:link w:val="Heading1"/>
+    <w:rsid w:val="00505903"/>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1' 'Calibri'}}}" w:h-ansi="{{{fontFace 'heading1' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'heading1' 'AEAAAA'}}}"/>
+      <w:kern w:val="36"/>
+      <w:sz w:val="{{fontSize 'heading1' 40 'half-point'}}"/>
+      <w:sz-cs w:val="{{fontSize 'heading1' 40 'half-point'}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Strong">
+    <w:name w:val="Strong"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:b/>
+      <w:b-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Emphasis">
+    <w:name w:val="Emphasis"/>
+    <w:rsid w:val="001B7422"/>
+    <w:rPr>
+      <w:i/>
+      <w:i-cs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="tenure">
+    <w:name w:val="tenure"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:rsid w:val="001B7422"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Title">
+    <w:name w:val="Title"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="TitleChar"/>
+    <w:rsid w:val="002D3B7B"/>
+    <w:pPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:ascii="{{{fontFace 'title'}}}" w:h-ansi="{{{fontFace 'title'}}}"/>
+      <wx:font wx:val="{{{fontFace 'title'}}}"/>
+      <w:b/>
+      <w:spacing w:val="-10"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="TitleChar">
+    <w:name w:val="Title Char"/>
+    <w:link w:val="Title"/>
+    <w:rsid w:val="002D3B7B"/>
+    <w:rPr>
+      <w:rFonts w:ascii="{{{fontFace 'title'}}}" w:h-ansi="{{{fontFace 'title'}}}"/>
+      <w:spacing w:val="-10"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'title' 48 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListParagraph">
+    <w:name w:val="List Paragraph"/>
+    <w:basedOn w:val="Normal"/>
+    <w:rsid w:val="00C146CA"/>
+    <w:pPr>
+      <w:ind w:left="720"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'list-paragraph' 'Calibri' }}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Summary">
+    <w:name w:val="Summary"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="SummaryChar"/>
+    <w:rsid w:val="00A210E1"/>
+    <w:pPr>
+      <w:spacing w:before="120"/>
+    </w:pPr>
+    <w:rPr>
+      <wx:font wx:val="{{{fontFace 'summary' 'Calibri'}}}"/>
+      <w:color w:val="{{{color 'summary' '767171'}}}"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SummaryChar">
+    <w:name w:val="Summary Char"/>
+    <w:link w:val="Summary"/>
+    <w:rsid w:val="00A210E1"/>
+    <w:rPr>
+      <w:rFonts w:ascii="{{{fontFace 'summary' 'Calibri'}}}" w:h-ansi="{{{fontFace 'summary' 'Calibri'}}}"/>
+      <w:sz-cs w:val="{{{fontSize 'summary' 24 'half-point'}}}"/>
+      <w:sz w:val="{{{fontSize 'summary' 24 'half-point'}}}"/>
+    </w:rPr>
+  </w:style>
+</w:styles>

partials/doc/header-icon.hbs

@@ -0,0 +1,18 @@
+{{! 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:ind w:left="-720"/>      
+    </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>

partials/doc/header-simple.hbs

@@ -0,0 +1,9 @@
+{{! A simple resume heading. }}
+<w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+  <w:pPr>
+    <w:pStyle w:val="Heading1"/>
+  </w:pPr>
+  <w:r wsp:rsidRPr="00C146CA">
+    <w:t>{{{sectionTitle _title}}}</w:t>
+  </w:r>
+</w:p>

partials/doc/pict/arrow.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000008.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAc9JREFUeNrs2GlPwjAYAOAOcGMVxyHHBIIkgIl+wSj//xdoPDABBY1BYQNRYMI4tnSK8sEg7JItTWy/7eyzvm+vUZqmAZyKB2BWCIiACIiACIiACIiACOgfgHqNq4ub2ivCBdRpPg9GXaF6VmkjnEKmyS91GyZHc8iOyemktmzy/aU2dTiYqL/OTrQVJgBKhwkzX09Z2yjOhl3xWWy/S5PpzNoGk4KxvBmTWRDqP93VWp2xguw3qCmTGZAklm/rvam6gZQyNhk2odQ4L1c3o1nk0+W9bLuXqW/lysPI1b8RuqBOtdpTNlrdPGTHOWgPpLaag9mmNYZJrXNV6Aw1lzW6A6M4kNd7PFssR9OQY+fPMztxzv+zG1w/LjWtWY0uaKSsiBfFRJOZg/0ErTPCzyhgV6MH6suT5Vu3+ZNiHvociZTluczD8qXTvB84qzE/2zN8zg2NXgtxfhqA8eKADWcjpl8ZT6UFRYKZo8KujcXNWpAnyNDC+DuvIZekLbwznCmGHRip42Fu0V28gSDEYepIRQKU+5slvaqSMe4ronQgggcIpKMh73xSk/u4bBT3shHmc7WIEC4gECjwIQog1T2Q8RIWyTKC0IcPyOXyIcAAUAi1CCT2DrUAAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000008.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/bicycle.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000015.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABEpJREFUeNrsV2tz2kYUXQmBBQghZDAYZFsmxo/4VbfOtNPp3+9MmzpxqF8EAyYEbCxjLITEQwipuwIMxIChqSeZqTT6sivp7rnnnj13hRmGAb6nCwff2WUBsgBZgCxAFiALkAXIAmQBsgBZgCxA/zNAxFdHkEppQdL7Y4c7EA578W8GKJ0+LSjDU3cS/uZ1iHhZQHpNqqlf/nTjDrcr4POXGqLapUg3DB20hXQi5N9h/xUkbLp/+9vz3y+F9pezDt/Gr7uB4QKmjuJF2YCPYr/sBvEXE7WHoewEhvXuR94aslgZuvVA1D8Hn6gPmURRezmGBi/t+vjPZHWKr2zM3s8zF25mUhvpk1R1uhzaYuLiVv+vGNLKheyna0FudqSMYzaSmo8GtVSq3IBDz8pvB0v4CLjHbwuKDjDK7agpTR3Y2KBXFytSs91BhtudLBuOvlp0ETMAUktn8fP75tjk7MzemxG10IunfyRFFXQU7cz/dZKpj+ESc3Jb+2t+YpptLxXjF4lKy8zGHYqEwzSJUpcgYWXZjE+Q1Ij8tNvEFUID4W5uBXEpU2r00Ng966t8J4z4OZ97qKtGPX/+Tl3/6aldEU84TycRGsw1H/1xe/HxMXGfqfXia9XC6SV7GKMH08jFUwL6zhndhuQ9JC+upUd2WjURuMMMDOalmCAnFU7PrkqtlnB5xvj3w8QkUd+kilABgPDyhwNoQDnxASkDSofb9NoAMGThU2k4jawC18focGyZBvpVrthEzCys73LIBJBVlh9NgI7sbIdp6B1GNffxYeIuy5dE5H7OcCyCD9Ti/GOpYdZiZ5cPxQIUWkIq5vvSeW/CdfjWfngFadPy5aqJPrgZ8q5thSjsyY6jo+us3SxhQZxQMrnaQGnMeTjXgOucmLWA6xGtXPw4B3QVJWeIheMPt+YWaCh96aCJBxnBBxTNoyG9thOqvL2pm1Y5/ygaat7tuBfVdksCgBnHkKaZtBKEo1+M7HXPddS6IirwrneMQGt2hkoNkoq5Tel0XlRURLON9HRjkLEY70QsCYV8fzGWdDzbXAkCDtsQF9q63WB8NKjkZH2oz9YQJmLOTXW/xsng6nJf4m4HlFm73agCsNCt0PIGX0uXXUtcP0y5oT4LiPKQxF1Ta1bzNRDtVo1gN/bZwZdqqaOjugowJnKww400GR9FAkEBspTVAY/3hLx5EBmSx71ZaJudniRqzs/A5ED9+rIwxhU14fJORoHoEDf2SMOxHhhXr96O7a9SJllGwiSZCDOxly2uhdxwSqtkj85utBEOfpyoIMlQCyv+CQ1ydTmEdjt0mpOc+CQM8iHTpTDP8obv2dYxzqlv8oWSaG43wsMdHvDkMyfbzPt4xxsx0hOILgVNc+85Nei41AinnrWXYS4fv7cbIac6bWf/PsmX27P1smm7PcBsLmqeX+EXWMcspwlVTCczQkVuGV/T7b/l9Y8AAwCSXjehR+kgEQAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000015.png" o:title="fa-bicycle"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/book.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000013.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArtJREFUeNrsmP1v0kAYx1soxZW2YOl4s8xkvkyJMZop/380JkuMLpmOxSkvQQasdNCWUks5Wq8WZP4waG9HMpPeL/SSK/e553m+z/NcSdd1ibs0YsQdGxFQBBQBRUARUAQUAUVAEVAE9J8BUUhv2er3by2TpJ2Z7QTahS3u7ZfSQU5PItw67Prx0cXECfkWk39ZPeC34bJRQw5NA4dpKFuJIavekmdI0RpLbCOGBo3+dfOQFLl+vQsWEUHymeI2gJx/w+J19YBZt7p+/O5i4q8VynCvka5wvEjhA5IH6vzvJM7szAxVu3k16CqTxeMOV4BbqZe12g/x1dvHPB4gIPfG9mo6V1pflIAS40s0QRi9sUVM9QFB8DiC2mqenmtzpLyVzOShZ82+PoXBRCfxxJDVVcZgNU0UKofP1kUDaH88avzyebhSBvJ0VY+HFSQ8sp+C6wGdTEtrY5MAnaG1eKSZLAsDvDc24H6sUMKjMvPSO98KT/n8/sOa0ziuu+SP89ldCNjXTThh+SIe2RvNkXnjluuLE5vzbNKTDZiRUuJDCkem1s9rV0jp2fNRJgd/2kMd8iRThU0WCAY0mJiI3QTJZ8te/hoZ0JxMRqKx1DLVtFDbG0ZY+csXPwagXkefI/Kk0hL0kXzl/YEv/tsD2fX+EJWHYQtwA2MwsZfivzWQ2fjaRel+/GQllKGPtK4BBRHP5Hdx9EPK2ED+jp3kCswygZGsmMPS5M8cB1lf4h70kf1TgwqleCEYz6bEqFqL6h4jyTDNJcUIUuUR4yVo44997j/Ac+ugYh4GW6y+eUKjmAm0vY5okaxxuIzNc/egTOSzjmKG952tnA10T2xcIXDN3HgNAsPTTyeodcNvVHJPDyuBiYLcy4DZPDvpaBaK3BLi/vMXEh9CC8EvisDQLBCqriYYngl7z/otwABxHQzMzw8ozAAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000013.png" o:title="fa-book"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/code.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000009.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPlQTFRFv8HDv8HEv8LQv8LSv8zdv8HGv8LKv8HKv8jXv8bVv8LOwczdzcHDycLEwcHDxcHGycLD18bD1cTDzcLDx8HD28jD08LDw8HD1cbDxcHD2czS1czSy8bEw9Dmzdzxz97xydj1xdLqx9Tqy9jszdz7wc7iy9bu0+P/2ef72e//2/X/+djK4czD6dDE89bK4crD99rM997Q/dzO5c7E89TI997T//vd/efX/+HQ++XT//Hd/+3V/+nT///5+/n/+//////75f//6f///f/////s///q8//////1///37/////vo///k4fH/5//////w4+/7//Hk5fH/////unTQ4QAAAQ1JREFUSMft1GtTQUEYB/A/JSlCoXJJUYqKqNwvFaFDquf7f5h0jrMXe3BmvGrGvnp29jc7O/99dkG2BzZ0Q/8/bbVt01vsd+zRlzskbO5a9jqul9OK78woqgfOV6r5kwtpJYCtN726x3a3F4QruYBO5c6NXr0f4pyofiRbWEhqhNxZUiwsJOWx2yfFwkIOwrgwKslClWJUooUqjahUq9NhAUh1Gf2Lik0eAM+HsKsWhCNtLo8iuGSyeIy9sXRW7YTb5qk7ZyFZAoI1o5qTPFdmeVSyFG7LtDwqWYo9MLMls2fmpNRZU+v8pEdc6bNJWJZyv2rRLyGq79jP8lcgRrXiwTzxqFbR53hm/S/jF09ZANBqGaBnAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000009.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/edu.hbs

@@ -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>

partials/doc/pict/emp.hbs

@@ -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>

partials/doc/pict/group.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000014.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA5hJREFUeNrsmPtT2kAQx0M4DhJeAZFGqohBGdHal9PWdvrX94dOO1Pta2gtICLFgBQhhhDgOJLGii8khZBMpz9kh58y2c3n9na/e4dDVVXifzKS+M/MBrKBbCAbyAaygWwgG+gfG5jqLfSr/IOvyjImPb4AyyUXaDBlfCQcZEuNjoRJmvYvLnMRZoKnY+KJUaln977XpJtvOf2prUexwCQYfJLdzfO9m54uNrW9zgIzW/Yrm7tNo9mglc8V0CScWqZwm0azfjWX4bGZGipX6/1xaWufFoW/e1Z4cTDmsdoqH8gmaqiHddaD8WWKFFls1GtiT1sdFb43z/jgRTIUnVrAqE0Q9KxALlLLoTLOEWjfRZX9z8Vq5zoTpeND4Aom0ulFRj8H0Gtiy2KRsHPcc7c/Rhb23h/cpBkmoH+W/7K7X11k/Y5xnlRkiTYBBO5vJBk42ppeLj1XzvCiboOeF6+ylIi4Rj0D99c4eva2x0hWIA0V4Wc2x9e7WjmR0Def2lylj3bfVjoT1hJMvt6E5e/FsjD0ZFfSXBQqCBEQksaBcOPr7pdmH7iDieVkjKUvQ2AFE+WP7wqdSYrhCj9+lgoAQF5HPC4elsrtAemNPd/mPMaKWi4Wmucdj3tn+exePusAf0pCUUF0g1PQFCrd74mgVHhTkYe1pGL1SjVOCjVuI2qohurt23KhhTv/KYan09AR39qJgdSUjRU16iBFT4G6IR+cgsTlDsh6MnahRkaAZKQXShWbTZahJs9tOkQft/RUGaGWZccPJPD1lTjr+vvU9ibWPIV6x2hwXSAajq93SAVjrB+I/vXNWMChu1vs2tYigXyRaNTrHhsIAMoYEEzeyYHTv/pw5/kyQ8hn/GGuhOJPXyRZalTItdGx+nA75ans/+DrEvIspF7tJFm3YyR/8ZWFGYQRdasnfKt3gR64F0EHmWzralY46FD8QXrJg0aGKyHkMt8q7StlAO7IxpN5dDTsK0iFouyczgZMcUC7MiHz/tPp3bOIk6Z8DEP9ia90xbNGu3e3HTQl3NnmpmnNqYHk/IcPVWn2s7IzsvryQcy6Q7501DRBc66EjZOfFt465KrYM3mdUCShZh3QqYQIs6Z2RdkqIKHdteDfbIxEq4AQVszzEINu275K/yugMO2x4Ftu35xVQCCeCLnMLt07l2As2zIQ3kqvh9xgVhroZR8/snZ0DDtXlqW+0Y4DdNADp335twADAHYlmV3HkUP7AAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000014.png" o:title="fa-group"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/justice-scales.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000011.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA8dJREFUeNrsl+1v2lYUhy8GLo6xsQHjuEA9MI4hTatG2qR+2D8/aR8mVVOytlrLO65DKLOT4DcoOMYMGqlbi7GdJlOjyVf+4mv76Dlvv3scW61W4CGtWAQUAUVAEVAEFAFFQBFQBHQ3IEcft6ShMQdomi2JZQZ+XyC1+VtrfP35NsmIPz5hE/81kNo/HRquZ3jm2mIJkqR4wEG1/VZduPEUhXoDoYV6g8MCgcJ4Y2rm1Nj9GKfrRRoCOo+rI2O50KYLz9cgnAJwP0AERaSR3RGyLlqj7DpCl9Z6xydCZPp/W0PAsfQ52MNx6N1lf75t6ksQ2+Pqz3jPLnNmM8uFFB6GFAl+xWifnLz5/eRV17OOEiSLo58spXLePT8bvjp9+fqPl29UcB9AzqinzomySNij3pl7+xS4w540RTmeAhOpa9wdSGlKJizWKsVaATWHTeW2PJPuuY5kOb7cqIRzyR/I6A40kK0IGQAyopgFyqA9vw2O3ZPGNlE5LKxTW/whD0O45AfkyoORnS7XCje3VG0/Y6tN2QnN86E9nqJMtXhTzDmBJ4NdQvxa+syEdOUfdcV4kYbaWVMLhzNvDS8AJdYzn+ufOQh2CdltTlIAyR9kvxDlgyINtHYrRHE6Z03FzrDrYv7XCuES4muuxnwlHYmSyKbnymAUlDft3VCDebH29Vlx41K3M7sd0C5zmyOpVmGhKb1T/aWrPQF0ScA9dKsk0ClL6SlOeKBZv6+51CMvc5uVFR4RjjaUZ77Sld4XyzsOtXqFAXq/MwkJ5CidvwxYaHA7hR7hqkU4lTvn3qJy1ZZNyFb53aNaofGYsC9kz7xvAc0kWQdMVUT9UpIRqhSij6WZV3jeT2yCFXK+vb1xyZRbk+DxQxtcWkksp3f7un/VonhSGw8u+aP8l/vy2ETwwkLqdAMEEEvZ2loXsrQ/EAYT4NqUP5hhlAaHe1t7SSS21NSxEeb7FIEGpgxWWToeTvjiJFfdbsPHlVwy5OSToTk8uIYSpSdHZSqQKU4IR4eMV91TR4cNMpAphhWEYy9Z8TCJUJXjF8zVoNNVzNly6+l6SGW4RnUf7uzCDPv8Ba302+/Vi4/XW50Yx4g8X+VpKvFNE6NtWVcTxdzM7ShRyOVIdLube6e/nE9BnDr++Sm19f1cM43LieVuKoahCCyDIXca8iGOs+vrm0dkiFL59cWE/gABD2w9OKAwfx3S61/PfXVl5XyygcRiPv6hzNOf6uS9/Ci6zmoVZkx0Vyufkdm27fuK0LpTPjp3zkUC8+rQrfW3AAMAaZzVLhuUv2EAAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000011.png" o:title="fa-justice-scales"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/quote.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000012.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrsl89PwjAUgOksMMgEMuJCRqKRqBkOI1f9/w9e1INEjXAwxB/LwIEKiKxbJfHAEqPSt6KEvJddtnzN+177tq6Ec55YplASSxYohEIohEIohEIohEIohEIotGJCVHQA8+6dTs8b+OG0GtXYs8uqJPgzyPznMua2Gk2nH0SfrRnW0b4RFwbM0KR7cd7o+QuAIT3EPIEEQjBohsK7q8svCRRCpqVQtVjS4TBMaHT7+MyiA9bNul3RUvFhmFC/7b5F6Pz28WFZkQLDeijsDMezu4y5+1MCIRgo9DKeRF7btJ6VBq/k1hEMHxy2EBi6dfjuzUm3SSJFKCltwzrYydGYcIwlCzlnsysYvTpnp9cDGbC8Hnp/arWlwVKamoe+NBh/0FAIhf5ZiNJ5PuVESQrDQCFtq5gjv6VI5jdNYRi6ZNlKvVoqfF8TzRQsu6ZTcTj+Mehv4kOAAQCDHsVN5IYqHwAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000012.png" o:title="fa-quote"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/rec.hbs

@@ -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>

partials/doc/pict/share-alt.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000010.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAihJREFUeNrsl+1P2lAUxukLFyxaEULFrjNoAFGMiW7OZPv3TZYlbkEbNkSsCghYIWCVIqWUFXUfxKa9k0vF5J6vTc759Z7nnPtcYjAYeKYpSM+UBQbCQBgIA2EgDISBMBAGwkDvDIieSFatKV9c1pSeQXpnw5FlfhFA1yFQvzp05fjw6KqjPyvi4xPbySj9Bi27PxUzIzRmDLqV/M+c7L6GVOl3pW1Yf+vVLgqay0BG9Uax6X+nWVTdBVLUe3t5aXcuAhmtUkU1pmLsTZT8SbnW6TsNNBPkUAHpjaIoFW+7T+ND+UJcbCMRISFRHgKEeB7NHlLOM2K59aIoTVF6v28pgpedIwP8l0+rfhQtUwp/LGiGpzZKQ/jnFlPpeNBzLYlSud37h+Vlw8JG+oMfTgBOJ1QR9ws3ulOSJxTwfKaUtk4HGIZGKepWU7WlIYCJshYLWVSlATsP0E+ZYT/JZHApHmJctB+s3/4n+3L++69s6U5DBuSkIbVwcFCDWLCUqdxk4uMsmLz9aGV/ZBo9uGxDLAHU89X2q+0HjB/S6tnDXKM7UiPKh/V6td6FtFPeaGovxaEBerwfquclWdFMjZOA5WIrS4+DpctS7gwOayb6dTcOUAE5XC1QWD7h826cGW/KYJcHt7q5921rgZoi+zHMRZIT30P/FcF522sCzn4g9dSCwPnGtR9oXx0LyXWeJazKBPiddORN3mXm2pqo/RhjFbzOfvwVYACXgQOVsrGQ2gAAAABJRU5ErkJggg==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000010.png" o:title="fa-share-alt"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/srv.hbs

@@ -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>

partials/doc/pict/star.hbs

@@ -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>

partials/doc/pict/thumbs-up.hbs

@@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000016.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArlJREFUeNrsl91T2kAQwEMIIYQQPhoDWlBaYDogOD7UGTu2//9THS3WMopQNUoIUSEkIcZ8NJcp0I44ggTIQ+7lcpvM3i+7e7t7PtM0ITcNGHLZ8IA8IA/IA/KAPCAPyAPygFw2EKcUGXz9tHknGAiORTYyWTqBvk2Pz5meWmgcHt8KY00+fC3/uZiEV+Wy7mUb0Pgj6WQsFvBBkCl3GjVuZTHU42TdmnCqkP9U3v1SSQetlX7fulkRkNYRHq3JT0Rxe02mSECkqQNjJUDGtSTbYRNL/ZUQqH1WVEVYAZDWrrF9yxIwEU2NQkpWwIRi5NKBhPr3c+7JMk84m8sOdT2wom7zROHl5iHtvvqLAdEToAuVzaE1DIbhn4CQjKNitwd+Gg3jOLJwIOWievIAjEO+L5ZSIz0a2xE08PDEN6r86Gt/iN4qlNLkolym3Z4c3kggdMLrpdy/27Q4cVKm1Qdco3p0ITuRqbW7+vEZI+kTXgViO3vlxGtWNuR242edGZiQP1o+qFBzWkht/p5IgwSpaWjAHngyv70GcpQuctzcMSQr6jNZKL1b/EjiM/gbR5BFHnsYnYnG8lqzL4IZIxJu6IeUxtG1nTwjVBpxAxC2SYXs+EAwGHIDkBWpU++zFCDhjJXs8kvEXQFk3A3sYkvQHxBXAMEhvw1iGM66DPb53oSvce0+SGXBUMxJoCC9/+3gayYyMxNbq/d0UIOpTcJJIFVi+B4vyLbZDbUrarMdG5zO4c60Hzhm3bAGkCldnVaHsgHz44gB5SxCr6eyG0n0ZTViRwL+CgSJ6fjnq/bjQhtOxCg6GSUJcgynivzlea0lWbbE3m3vb8cdAnrBhQrbvmqxXP/xdd8FEjt7pQQCLRTof7I21xUVWX+uyk/E06ViZuoO1qmr9LgXE2TVHLYEM7TSo/FHgAEAC/8S0Mwjye0AAAAASUVORK5CYII=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000016.png" o:title="fa-bicycle"/>
+  </v:shape>
+</w:pict>

partials/doc/pict/wri.hbs

@@ -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>

partials/doc/section/affiliation.hbs

@@ -0,0 +1,71 @@
+<wx:sub-section>
+
+  {{#> header-affiliation }}
+  {{> header-simple _title="AFFILIATION" _section="affiliation" }}
+  {{/header-affiliation}}
+
+  {{#each r.affiliation.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ role }}}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{{ organization }}}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>

partials/doc/section/education.hbs

@@ -1,12 +1,8 @@
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+
-    <w:pPr>
+  {{#> header-education }}
-      <w:pStyle w:val="Heading1"/>
+  {{> header-simple _title="EDUCATION" _section="education" }}
-    </w:pPr>
+  {{/header-education}}
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EDUCATION</w:t>
-    </w:r>
-  </w:p>
 
   {{#each r.education.history}}
 
@@ -32,7 +28,10 @@
         <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:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange . 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#either area studyType }}

partials/doc/section/employment.hbs

@@ -1,12 +1,8 @@
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+
-    <w:pPr>
+  {{#> header-employment }}
-      <w:pStyle w:val="Heading1"/>
+  {{> header-simple _title="EMPLOYMENT" _section="employment" }}
-    </w:pPr>
+  {{/header-employment}}
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EMPLOYMENT</w:t>
-    </w:r>
-  </w:p>
 
   {{#each r.employment.history}}
 
@@ -35,7 +31,10 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@@ -45,12 +44,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 +61,6 @@
         </w:rPr>
       </w:pPr>
       {{{wpml this true}}}
-      <!-- <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
     </w:p>
     {{/each}}
 

partials/doc/section/governance.hbs

@@ -0,0 +1,78 @@
+<wx:sub-section>
+
+  {{#> header-governance }}
+  {{> header-simple _title="GOVERNANCE" _section="governance" }}
+  {{/header-governance}}
+
+  {{#each r.governance}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+
+      {{#if role}}
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ role }}, </w:t>
+      </w:r>
+      {{/if}}
+
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ organization }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange .}}</w:t>
+      </w:r>
+    </w:p>
+
+    {{#if summary }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>

partials/doc/section/info.hbs

@@ -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>

partials/doc/section/interests.hbs

@@ -0,0 +1,32 @@
+<wx:sub-section>
+
+  {{#> header-interests }}
+  {{> header-simple _title="INTERESTS" _section="interests" }}
+  {{/header-interests}}
+
+  <wx:sub-section>
+
+    {{#each r.interests}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ name }}}</w:t>
+      </w:r>
+      {{#if keywords}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{#each keywords}}{{#unless @first}}, {{/unless}}{{{ . }}}{{/each}}</w:t>
+      </w:r>
+      {{/if}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+</wx:sub-section>

partials/doc/section/projects.hbs

@@ -0,0 +1,71 @@
+<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:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <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>

partials/doc/section/reading.hbs

@@ -0,0 +1,68 @@
+<wx:sub-section>
+
+  {{#> header-reading }}
+  {{> header-simple _title="READING" _section="reading" }}
+  {{/header-reading}}
+
+  {{#each r.reading}}
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <!-- <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs> -->
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{{ title }}}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <!-- <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r> -->
+      {{#if author}}
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>, {{{ author }}}</w:t>
+      </w:r>
+      {{/if}}
+    </w:p>
+    {{#if summary}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>

partials/doc/section/recognition.hbs

@@ -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>
+  {{#> header-recognition }}
-      <w:pStyle w:val="Heading1"/>
+  {{> header-simple _title="RECOGNITION" _section="recognition" }}
-    </w:pPr>
+  {{/header-recognition}}
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>RECOGNITION</w:t>
-    </w:r>
-  </w:p>
 
   {{#each r.recognition}}
 
@@ -33,7 +28,10 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@@ -70,4 +68,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

partials/doc/section/references.hbs

@@ -0,0 +1,52 @@
+<wx:sub-section>
+
+  {{#> header-references }}
+  {{> header-simple _title="REFERENCES" _section="references" }}
+  {{/header-references}}
+
+  {{#each r.references}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{{ name }}}</w:t>
+      </w:r>
+      {{#if role}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          <w:t>, {{{ role }}}</w:t>
+        </w:r>
+      {{/if}}
+      {{#if category}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          <w:t> ({{{ category }}})</w:t>
+        </w:r>
+      {{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>

partials/doc/section/service.hbs

@@ -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>
+  {{#> header-service }}
-      <w:pStyle w:val="Heading1"/>
+  {{> header-simple _title="SERVICE" _section="service" }}
-    </w:pPr>
+  {{/header-service}}
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SERVICE</w:t>
-    </w:r>
-  </w:p>
 
   {{#each r.service.history}}
 
@@ -36,7 +31,10 @@
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@@ -46,12 +44,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 +61,6 @@
         </w:rPr>
       </w:pPr>
       {{{wpml this true}}}
-      <!-- <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
     </w:p>
     {{/each}}
 
@@ -83,4 +69,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

partials/doc/section/skills.hbs

@@ -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>

partials/doc/section/speaking.hbs

@@ -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,24 @@
           <w:tab w:val="right" w:pos="9360"/>
         </w:tabs>
       </w:pPr>
-      <w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
-        <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: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:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@@ -45,14 +41,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 +59,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>
 

partials/doc/section/writing.hbs

@@ -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>
+  {{#> header-writing }}
-      <w:pStyle w:val="Heading1"/>
+  {{> header-simple _title="WRITING" _section="writing" }}
-    </w:pPr>
+  {{/header-writing}}
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>WRITING</w:t>
-    </w:r>
-  </w:p>
 
   {{#each r.writing}}
   <wx:sub-section>
@@ -25,14 +20,17 @@
             <w:rStyle w:val="Hyperlink"/>
           </w:rPr>
           {{/if}}
-          <w:t>{{ title }}</w:t>
+          <w:t>{{{ title }}}</w:t>
         </w:r>
       {{#if url}}</w:hlink>{{/if}}
       <w:r wsp:rsidR="00EA0B64">
         <w:tab/>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
+        <w:rPr>
+          <w:rStyle w:val="FromTo"/>
+        </w:rPr>
+        <w:t>{{date date 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#if summary}}
@@ -61,12 +59,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 +67,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

partials/html/header-icon.hbs

@@ -0,0 +1,3 @@
+<header>
+  <h2>{{#if _icon}}{{> (lookup . '_hdricon') }}{{/if}}{{{sectionTitle _title _section}}}</h2>
+</header>

partials/html/header-simple.hbs

@@ -0,0 +1,3 @@
+<header>
+<h2>{{{sectionTitle _title _section}}}</h2>
+</header>

partials/html/highlights.hbs

@@ -0,0 +1,8 @@
+{{#if highlights}}
+<b>Highlights:</b>
+<ul>
+  {{#each highlights}}
+  <li>{{{ . }}}</li>
+  {{/each}}
+</ul>
+{{/if}}

partials/html/section/affiliation.hbs

@@ -0,0 +1,26 @@
+{{#section "affiliation"}}
+<hr>
+<section id="affiliation">
+  {{#> header-affiliation }}
+    {{> header-icon _title="AFFILIATION" _section="affiliation" _hdricon=(lookup . '_icon') }}
+  {{/header-affiliation}}
+
+  {{#each r.affiliation.history}}
+    {{#> body-affiliation }}
+    <div>
+      <h3><em>{{{ role }}}</em>,
+        {{#if url }}
+        <a href="{{{ url }}}">{{{ organization }}}</a>
+        {{else}}
+        {{{ organization }}}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-affiliation}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/certifications.hbs

@@ -0,0 +1,35 @@
+{{#section "certifications"}}
+<hr>
+<section id="certifications">
+  <div class="certifications">
+  {{#> header-certifications }}
+    {{> header-icon _title="CERTIFICATIONS" _section="certifications" _hdricon=(lookup . '_icon') }}
+  {{/header-certifications}}
+  <center>
+    {{#each r.certifications}}
+    <span>
+      {{#each certificates}}
+        {{#if logo}}
+          <img class="media-object logo"
+            src="../images/{{logo}}"
+            alt="{{name}}{{#level}} - {{.}}{{/level}}"
+            title="{{name}}{{#level}} - {{.}}{{/level}}" />
+        {{/if}}
+      {{/each}}
+    </span>
+    {{/each}}
+    </center>
+    </div>
+    <div class="certifications">
+    <center>
+    {{#each r.certifications}}
+      {{#each certificates}}
+        {{#unless logo}}
+          | {{name}}{{#level}} - ({{.}}){{/level}} |
+        {{/unless}}
+      {{/each}}
+    {{/each}}
+  </center>
+  </div>
+</section>
+{{/section}}

partials/html/section/education.hbs

@@ -0,0 +1,20 @@
+{{#section "education"}}
+<hr>
+<section id="education">
+  {{#> header-education }}
+    {{> header-icon _title="EDUCATION" _section="education" _hdricon=(lookup . '_icon') }}
+  {{/header-education}}
+  {{#each r.education.history}}
+    {{#> body-education }}
+    <div>
+      <h3>{{#if title}}<em>{{{ title }}}</em>, {{/if}}{{{ institution }}}</h3>
+      <span class="tenure">{{dateRange .}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+      {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
+      {{#if grade}} - <strong>{{grade}}</strong>{{/if}}
+    </div>
+    {{/body-education}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/employment.hbs

@@ -0,0 +1,26 @@
+{{#section "employment"}}
+<hr>
+<section id="employment">
+  {{#> header-employment }}
+    {{> header-icon _title="EMPLOYMENT" _section="employment" _hdricon=(lookup . '_icon') }}
+  {{/header-employment}}
+
+  {{#each r.employment.history}}
+    {{#> body-employment }}
+    <div>
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{{ url }}}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>
+      <p>{{{ summary }}}</p>
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}      
+    </div>
+    {{/body-employment}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/governance.hbs

@@ -0,0 +1,26 @@
+{{#section "governance"}}
+<hr>
+<section id="governance">
+  {{#> header-governance }}
+    {{> header-icon _title="GOVERNANCE" _section="governance" _hdricon=(lookup . '_icon') }}
+  {{/header-governance}}
+
+  {{#each r.governance}}
+    {{#> body-governance }}
+    <div>
+      <h3>{{#if position}}<em>{{ position }}</em>,
+        {{/if}}{{#if url }}
+        <a href="{{{ url }}}">{{ organization }}</a>
+        {{else}}
+        {{ organization }}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>
+      <p>{{{ summary }}}</p>
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-governance}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/info.hbs

@@ -0,0 +1,12 @@
+{{#has 'info.brief'}}
+<hr>
+<section id="summary">
+  {{#> header-info }}
+    {{> header-icon _title="About" _section="info" _hdricon=(lookup . '_icon') }}
+  {{/header-info}}
+  {{#> body-info }}
+    {{{ r.info.brief }}}
+  {{/body-info}}
+  <img class="qr" src="../images/qr.png" />
+</section>
+{{/has}}

partials/html/section/interests.hbs

@@ -0,0 +1,15 @@
+{{#section "interests"}}
+<hr>
+<section id="interests">
+  {{#> header-interests }}
+    {{> header-icon _title="INTERESTS" _section="interests" _hdricon=(lookup . '_icon') }}
+  {{/header-interests}}
+  <center>
+  {{#each r.interests}}
+    {{#> body-interests }}
+    | <em>{{{ name }}}</em> |
+    {{/body-interests}}
+  {{/each}}
+  </center>
+</section>
+{{/section}}

partials/html/section/projects.hbs

@@ -0,0 +1,25 @@
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  {{#> header-projects }}
+    {{> header-icon _title="PROJECTS" _section="projects" _hdricon=(lookup . '_icon') }}
+  {{/header-projects}}
+  {{#each r.projects }}
+    {{#> body-projects }}
+    <div>
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    </h3>
+    {{#if start}}<span class="tenure">{{dateRange .}}</span>{{/if}}
+    {{{ summary }}}
+    {{> highlights }}
+    {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}    
+    </div>
+    {{/body-projects }}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/reading.hbs

@@ -0,0 +1,17 @@
+{{#section "reading"}}
+<hr>
+<section id="reading">
+  {{#> header-reading }}
+    {{> header-icon _title="READING" _section="reading" _hdricon=(lookup . '_icon') }}
+  {{/header-reading}}
+  {{#each r.reading }}
+    {{#> body-reading }}
+    <div>
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>{{#if author}}, {{{ author }}}{{/if}}</h3>
+      <span class="tenure">{{date date 'YYYY'}}</span>
+      {{{ summary }}}
+    </div>
+    {{/body-reading}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/recognition.hbs

@@ -0,0 +1,18 @@
+{{#section "recognition"}}
+<hr>
+<section id="recognition">
+  {{#> header-recognition }}
+    {{> header-icon _title="RECOGNITION" _section="recognition" _hdricon=(lookup . '_icon') }}
+  {{/header-recognition}}
+  {{#each r.recognition}}
+    {{#> body-recognition }}
+    <div>
+    <h3><em>{{ title }}</em>, {{{link from url }}}</h3>
+    <span class="tenure">{{date date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-recognition}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/references.hbs

@@ -0,0 +1,16 @@
+{{#section "references"}}
+<hr>
+<section id="references">
+  {{#> header-references }}
+    {{> header-icon _title="REFERENCES" _section="references" _hdricon=(lookup . '_icon') }}
+  {{/header-references}}
+  {{#each r.references}}
+    {{#> body-references }}
+    <div>
+    <h3><em>{{ name }}</em>{{#if role}}, {{{ role }}}{{/if}}</h3>
+    {{{ summary }}}
+    </div>
+    {{/body-references}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/samples.hbs

@@ -0,0 +1,24 @@
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  {{#> header-samples }}
+    {{> header-icon _title="SAMPLES" _section="samples" _hdricon=(lookup . '_icon') }}
+  {{/header-samples}}
+  {{#each r.samples}}
+    {{#> body-samples }}
+    <div>
+    <h3>
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    </h3>
+    <span class="tenure">{{date date 'YYYY-MM'}}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-samples}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/service.hbs

@@ -0,0 +1,24 @@
+{{#section "service"}}
+<hr>
+<section id="service">
+  {{#> header-samples }}
+    {{> header-icon _title="SERVICE" _section="service" _hdricon=(lookup . '_icon') }}
+  {{/header-samples}}
+  {{#each r.service.history}}
+    {{#> body-service }}
+    <div>
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{{ url }}}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+    <p>{{{ summary }}}</p>
+    {{> highlights }}
+    </div>
+    {{/body-service }}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/skills.hbs

@@ -0,0 +1,29 @@
+{{#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 }}
+          {{#name}}
+            <span title="{{level}}{{#summary}} - {{summary}}{{/summary}}">{{ name }}</span>
+          {{/name}}{{^name}}
+            {{ . }}{{/name}}{{#unless @last}}, {{/unless}}{{/each}}
+        </td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}

partials/html/section/speaking.hbs

@@ -0,0 +1,18 @@
+{{#section "speaking"}}
+<hr>
+<section id="speaking">
+  {{#> header-speaking }}
+    {{> header-icon _title="SPEAKING" _section="speaking" _hdricon=(lookup . '_icon') }}
+  {{/header-speaking}}
+  {{#each r.speaking}}
+    {{#> body-speaking }}
+    <div>
+    <h3><em>{{{ title }}}</em>, {{{ event }}}</h3>
+    <span class="tenure">{{date date 'YYYY' }}</span>
+    {{{ summary }}}
+    {{> highlights }}
+    </div>
+    {{/body-speaking}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/testimonials.hbs

@@ -0,0 +1,16 @@
+{{#section "testimonials"}}
+<hr>
+<section id="testimonials">
+  {{#> header-testimonials }}
+    {{> header-icon _title="TESTIMONIALS" _section="testimonials" _hdricon=(lookup . '_icon') }}
+  {{/header-testimonials}}
+  {{#each r.testimonials}}
+    {{#> body-testimonials }}
+    <div>
+    <h3><em>{{ name }}</em></h3>
+    <p>{{{ quote }}}</p>
+    </div>
+    {{/body-testimonials}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/section/writing.hbs

@@ -0,0 +1,19 @@
+{{#section "writing"}}
+<hr>
+<section id="writing">
+  {{#> header-writing }}
+    {{> header-icon _title="WRITING" _section="writing" _hdricon=(lookup . '_icon') }}
+  {{/header-writing}}
+  {{#each r.writing }}
+    {{#> body-writing }}
+    <div>
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }}</h3>
+      <span class="tenure">{{date date 'YYYY'}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+    </div>
+    {{/body-writing}}
+  {{/each}}
+</section>
+{{/section}}

partials/html/work-projects.hbs

@@ -0,0 +1,8 @@
+{{#if projects}}
+<p class="projects">
+<b>Projects:</b>
+  {{#each projects}}
+  {{{ name }}}{{#if customer}}(<i>{{customer}}</i>){{/if}}{{#unless @last}}, {{/unless}}
+  {{/each}}
+</p>
+{{/if}}

partials/md/section/affiliation.hbs

@@ -0,0 +1,19 @@
+{{#section "affiliation"}}
+## {{{sectionTitle "AFFILIATION"}}}
+
+{{#each r.affiliation.history }}
+{{#if url}}
+### *{{{ role }}}*, [{{{ organization }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### *{{{ role }}}*, {{{ organization }}} ({{dateRange .}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

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}}

partials/md/section/employment.hbs

@@ -0,0 +1,19 @@
+{{#section "employment"}}
+## {{{sectionTitle "EMPLOYMENT"}}}
+
+{{#each r.employment.history }}
+{{#if url}}
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### *{{{ position }}}*, {{{ employer }}} ({{dateRange .}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/governance.hbs

@@ -0,0 +1,21 @@
+{{#section "governance" }}
+## {{{sectionTitle "GOVERNANCE"}}}
+
+{{#each r.governance }}
+{{#if url}}
+### {{#if role}}*{{{ role }}}*, {{/if}}[{{{ organization }}}]({{{ url }}}) {{#has 'start'}} ({{dateRange .}}){{/has}}
+{{else}}
+### {{#if role}}*{{{ role }}}*, {{/if}}{{{ organization }}}{{#has 'start'}} ({{dateRange .}}){{/has}}
+{{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{~#if highlights}}
+
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/info.hbs

@@ -0,0 +1 @@
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}

partials/md/section/interests.hbs

@@ -0,0 +1,12 @@
+{{#section "interests"}}
+## {{{sectionTitle "INTERESTS"}}}
+
+{{#each r.interests}}
+- {{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}}
+{{#if summary}}
+{{{ summary }}}
+{{/if}}
+
+{{/each}}
+
+{{/section}}

partials/md/section/projects.hbs

@@ -0,0 +1,21 @@
+{{#section 'projects'}}
+## {{{sectionTitle "PROJECTS"}}}
+
+{{#each r.projects }}
+{{#if url }}
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### *{{{camelCase role }}}*, {{{ title }}} ({{dateRange .}})
+{{/if}}
+
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/reading.hbs

@@ -0,0 +1,12 @@
+{{#section "reading"}}
+## {{{sectionTitle "READING"}}}
+
+{{#each r.reading}}
+{{#if url}}### [*{{{ title }}}*]({{{url}}}){{#if author}}, {{{ author }}}{{/if}}
+{{else}}### *{{{ title }}}*{{#if author}}, {{{ author }}}{{/if}}
+{{/if}}
+{{#if summary}}{{{ summary }}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/recognition.hbs

@@ -0,0 +1,12 @@
+{{#section "recognition"}}
+## {{{sectionTitle "RECOGNITION"}}}
+
+{{#each r.recognition}}
+### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/references.hbs

@@ -0,0 +1,14 @@
+{{#section "references"}}
+## {{{sectionTitle "REFERENCES"}}}
+
+{{#each r.references }}
+### *{{{ name }}}*{{#if role}}, {{{ role }}}{{/if}}{{#if category}} ({{{ category }}}){{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if contact}}{{#each contact }}{{{ label }}}: {{{ value }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/samples.hbs

@@ -0,0 +1,19 @@
+{{#section 'samples'}}
+## {{{sectionTitle "SAMPLES"}}}
+
+{{#each r.samples }}
+{{#if url}}
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
+{{else}}
+### {{{ title }}} ({{date date}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

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}}

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}}

partials/md/section/speaking.hbs

@@ -0,0 +1,15 @@
+{{#section 'speaking'}}
+## {{{sectionTitle "SPEAKING"}}}
+
+{{#each r.speaking}}
+### *{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/md/section/writing.hbs

@@ -0,0 +1,14 @@
+{{#section 'writing'}}
+## WRITING
+
+{{#each r.writing}}
+{{#if url}}
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
+{{else}}
+### {{{ title }}} ({{date date}})
+{{/if}}
+
+{{{ summary }}}
+
+{{/each}}
+{{/section}}

partials/txt/section/affiliation.hbs

@@ -0,0 +1,14 @@
+{{#section "affiliation"}}
+{{{sectionTitle "AFFILIATION"}}} --------------------------------------------------------------------
+
+{{#each r.affiliation.history }}
+{{#if role}}{{{ role }}}, {{/if}}{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

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}}

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}}

partials/txt/section/governance.hbs

@@ -0,0 +1,17 @@
+{{#section "governance" }}
+{{{sectionTitle "GOVERNANCE"}}} ---------------------------------------------------------------------
+
+{{#each r.governance }}
+{{#if role}}{{{ role }}}, {{/if}}{{{ organization }}}{{#has 'start'}} ({{dateRange .}}){{/has}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{~#if highlights}}
+
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}{{/if}}
+
+{{/each}}
+{{/section}}

partials/txt/section/info.hbs

@@ -0,0 +1 @@
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}

partials/txt/section/interests.hbs

@@ -0,0 +1,12 @@
+{{#section "interests"}}
+{{{sectionTitle "INTERESTS"}}} ----------------------------------------------------------------------
+
+{{#each r.interests}}
+{{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{/each}}
+
+{{/section}}

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}}

partials/txt/section/reading.hbs

@@ -0,0 +1,14 @@
+{{#section "reading"}}
+{{{sectionTitle "READING"}}} ------------------------------------------------------------------------
+
+{{#each r.reading}}
+"{{{ title }}}"{{#if author}}, {{{ author }}}{{/if}}
+{{#if url}}{{{ url }}}
+{{/if}}
+{{#if summary }}{{{ summary }}}
+{{/if}}
+{{#if date}}{{{date date }}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/txt/section/recognition.hbs

@@ -0,0 +1,12 @@
+{{#section "recognition"}}
+{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
+{{~#if summary}}
+
+{{{ summary }}}{{/if}}
+
+{{/each}}
+{{/section}}

partials/txt/section/references.hbs

@@ -0,0 +1,14 @@
+{{#section "references"}}
+{{{sectionTitle "REFERENCES"}}} ---------------------------------------------------------------------
+
+{{#each r.references }}
+{{{ name }}}{{#if role}}, {{{ role }}}{{/if}}{{#if category}} ({{{ category }}}){{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if contact}}{{#each contact }}{{{ label }}}: {{{ value }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/txt/section/samples.hbs

@@ -0,0 +1,15 @@
+{{#section 'samples'}}
+{{{sectionTitle "SAMPLES"}}} ------------------------------------------------------------------------
+
+{{#each r.samples }}
+{{{ title }}} ({{date date}})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

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}}

partials/txt/section/skills.hbs

@@ -0,0 +1,7 @@
+{{#section "skills"}}
+{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
+
+{{#each r.skills.sets}}
+- {{{ name }}}: {{#each skills}}{{{ . }}} {{/each}}
+{{/each}}
+{{/section}}

partials/txt/section/speaking.hbs

@@ -0,0 +1,15 @@
+{{#section 'speaking'}}
+## {{{sectionTitle "SPEAKING"}}} ------------------------------------------------------------------------
+
+{{#each r.speaking}}
+*{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}

partials/txt/section/writing.hbs

@@ -0,0 +1,10 @@
+{{#section "writing"}}
+{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}}{{#if date}} ({{date date}}){{/if}}
+{{#if summary}}{{{ summary }}}
+{{/if}}
+
+{{/each}}
+{{/section}}

themes/README.md

@@ -2,8 +2,8 @@
 ========
 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 and feel.
-- [`modern`](modern): A middle of the road theme with a modern look 'n feel.
+- [`basis`](basis): A theme that is a basis for other themes.
-- [`hello-world`](hello-world): A simple-as-possible example theme.
 - [`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.

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
+1. Run `hackmyresume build my-resume.json to out/my-resume.all -t awesome` to
-a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume.
+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`
+HackMyResume creates these by default when it generates a resume under the
-theme. To create these symlinks manually, either use the Linux / OS X symlink
+`awesome` theme. To create these symlinks manually, either use the Linux / OS X
-command for all three or, if on Windows, run use `mklink /H` for the first two
+symlink command for all three or, if on Windows, run use `mklink /H` for the
-and `mklink /J` for the last.
+first two and `mklink /J` for the last.
 
 ## License
 

themes/awesome/src/latex/.gitignore

@@ -0,0 +1,20 @@
+### TeX ###
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+*-converted-to.*
+<<<<<<< HEAD
+
+### Editor ###
+## Vim & Emacs temp files:
+.*sw[op]
+*~
+

themes/awesome/src/latex/Makefile

@@ -0,0 +1,3 @@
+
+test:
+	cd examples/ ; for f in *.tex; do xelatex $$f; done

themes/awesome/src/latex/README.md

@@ -0,0 +1,59 @@
+# Awesome CV
+*A template-friendly fork of Byungjin Park's [Awesome-CV][awe] resume template.*
+
+This fork replaces each occurrence of hard-coded resume data in the original
+Awesome-CV project with an expandable template tag, allowing you to generate a
+personalized copy of Awesome-CV without hand-editing the `.tex` files.
+
+Otherwise, it's identical to the original.
+
+## Use
+
+When expanded with [Underscore.js][und] and a [FRESH resume][fre] object (JSON),
+this project yields an Awesome-CV template, in LaTeX, but with your resume data.
+You can then use a tool like `xelatex` or similar to generate the final PDF.
+
+**Step 1**: Use a FRESH-aware template expansion tool like [HackMyResume][hmr]
+to generate the personalized LaTeX:
+
+```bash
+hackmyresume build resume.json -t awesome
+```
+
+**Step 2**: Use conventional LaTeX tools to generate a PDF or other destination
+format from the (personalized) Awesome-CV LaTeX files:
+
+```bash
+xelatex examples/resume.tex
+```
+
+**Step 3**: When you need to update your resume, update the source JSON, and
+re-generate destination formats as needed.
+
+## Notes
+
+- This project is intermittently synced with the upstream master to get the
+benefit of any new changes or tweaks.
+
+- The template tags are based on the Underscore.js template syntax but with a
+modified set of template delimiters that reduce conflicts with LaTeX
+metacharacters such as `{` or `%`.
+
+- Underscore.js was chosen because its minimalistic template engine supports
+custom delimiters (Handlebars [doesn't][hb350], except [unofficially][un]) and
+allows execution of arbitrary JavaScript in the template.
+
+- This project indirectly drives the `awesome` theme in HackMyResume and
+FluentCV. Technically the latter is a fork of this project, which itself is a
+fork of the original Awesome-CV for LaTeX.
+
+## License
+
+See the original project for license information.
+
+[awe]: https://github.com/posquit0/Awesome-CV
+[hmr]: http://please.hackmyresume.com
+[fre]: http://freshstandard.org
+[und]: http://underscorejs.org/#template
+[hb350]: https://github.com/wycats/handlebars.js/issues/350
+[un]: https://github.com/jonschlinkert/handlebars-delimiters

themes/awesome/src/latex/awesome-cv.cls

@@ -1,12 +1,27 @@
 %% Start of file `awesome-cv.cls'.
-%% Copyright 2015 Claud D. Park <posquit0.bj@gmail.com>
+% Awesome CV Class File
+%
+% This class has been downloaded from:
+% https://github.com/posquit0/Awesome-CV
+%
+% Author:
+% Claud D. Park <posquit0.bj@gmail.com>
+% http://www.posquit0.com
+%
+% Notes:
+% 1) This class file defines the structure and layout of the template file (cv.tex, resume.tex).
+% 2) It has been written in such a way that under most circumstances you 
+% should not need to edit it.
+%
+% Class license:
+% LPPL v1.3c (http://www.latex-project.org/lppl)
 %
 
 
 %-------------------------------------------------------------------------------
 %                Identification
 %-------------------------------------------------------------------------------
-\ProvidesClass{awesome-cv}[2015/11/19 v1.1.0 Awesome Curriculum Vitae Class]
+\ProvidesClass{awesome-cv}[2016/01/30 v1.5 Awesome Curriculum Vitae Class]
 \NeedsTeXFormat{LaTeX2e}
 
 
@@ -21,7 +36,7 @@
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
 % Inherit options of article
-\DeclareOption*{
+\DeclareOption*{%
   \PassOptionsToClass{\CurrentOption}{article}
 }
 \ProcessOptions\relax
@@ -49,32 +64,26 @@
 \RequirePackage{xifthen}
 % Needed to use a toolbox of programming tools
 \RequirePackage{etoolbox}
+% Needed to change line spacing in specific environment
+\RequirePackage{setspace}
 % Needed to manage fonts
-\ifxetex
+\RequirePackage[quiet]{fontspec}
-  \RequirePackage[quiet]{fontspec}
+% To support LaTeX quoting style
-  % To support LaTeX quoting style
+\defaultfontfeatures{Ligatures=TeX}
-  \defaultfontfeatures{Ligatures=TeX}
-\else
-  \RequirePackage[T1]{fontenc}
-  % Replace by the encoding you are using
-  \RequirePackage[utf8]{inputenc}
-\fi
 % Needed to manage math fonts
 \RequirePackage[math-style=TeX,vargreek-shape=unicode]{unicode-math}
 % Needed to use icons from font-awesome
-% (https://github.com/furl/latex-fontawesome)
+% (https://github.com/posquit0/latex-fontawesome)
 \RequirePackage{fontawesome}
 % Needed to deal a paragraphs
 \RequirePackage{parskip}
 % Needed to deal hyperlink
-\RequirePackage{hyperref}
+\RequirePackage[hidelinks]{hyperref}
-\hypersetup{
+\hypersetup{%
   pdftitle={},
   pdfauthor={},
   pdfsubject={},
-  pdfkeywords={},
+  pdfkeywords={}
-  colorlinks=false,
-  allbordercolors=white
 }
 
 
@@ -94,7 +103,7 @@
 \geometry{left=2.0cm, top=1.5cm, right=2.0cm, bottom=2.0cm, footskip=.5cm}
 
 %% Header & Footer
-% Set offset to each header and offset
+% Set offset to each header and footer
 \fancyhfoffset{0em}
 % Remove head rule
 \renewcommand{\headrulewidth}{0pt}
@@ -135,21 +144,13 @@
 \definecolor{awesome-darknight}{HTML}{131A28}
 \colorlet{awesome}{awesome-red}
 
+% Boolean value to switch section color highlighting
+\newbool{acvSectionColorHighlight}
+\setbool{acvSectionColorHighlight}{true}
+
 % Awesome section color
-\newcounter{colorCounter}
 \def\@sectioncolor#1#2#3{%
-  {%
+  \ifbool{acvSectionColorHighlight}{{\color{awesome}#1#2#3}}{#1#2#3}%
-    \color{%
-      \ifcase\value{colorCounter}%
-        awesome\or%
-        awesome\or%
-        awesome\or%
-        awesome\or%
-        awesome\else%
-        awesome\fi%
-    } #1#2#3%
-  }%
-  \stepcounter{colorCounter}%
 }
 
 
@@ -198,6 +199,15 @@
   BoldItalicFont=*-SemiboldIt
 ]{SourceSansPro}
 
+% Set main font
+\setmainfont[
+  Path=\@fontdir,
+  UprightFont=*-Regular,
+  ItalicFont=*-It,
+  BoldFont=*-Bold,
+  BoldItalicFont=*-BoldIt
+]{SourceSansPro}
+
 
 %-------------------------------------------------------------------------------
 %                Configuration for styles
@@ -213,6 +223,7 @@
 \newcommand*{\footerstyle}[1]{{\fontsize{8pt}{1em}\footerfont\scshape\color{lighttext} #1}}
 \newcommand*{\sectionstyle}[1]{{\fontsize{16pt}{1em}\bodyfont\bfseries\color{text}\@sectioncolor #1}}
 \newcommand*{\subsectionstyle}[1]{{\fontsize{12pt}{1em}\bodyfont\scshape\textcolor{text}{#1}}}
+\newcommand*{\paragraphstyle}{\fontsize{9pt}{1em}\bodyfontlight\upshape\color{graytext}}
 
 % For elements of entry
 \newcommand*{\entrytitlestyle}[1]{{\fontsize{10pt}{1em}\bodyfont\bfseries\color{darktext} #1}}
@@ -238,6 +249,16 @@
 \newcommand*{\skilltypestyle}[1]{{\fontsize{10pt}{1em}\bodyfont\bfseries\color{darktext} #1}}
 \newcommand*{\skillsetstyle}[1]{{\fontsize{9pt}{1em}\bodyfontlight\color{text} #1}}
 
+% For elements of the cover letter
+\newcommand*{\lettersectionstyle}[1]{{\fontsize{14pt}{1em}\bodyfont\bfseries\color{text}\@sectioncolor #1}}
+\newcommand*{\recipientaddressstyle}[1]{{\fontsize{9pt}{1em}\bodyfont\scshape\color{graytext} #1}}
+\newcommand*{\recipienttitlestyle}[1]{{\fontsize{11pt}{1em}\bodyfont\bfseries\color{darktext} #1}}
+\newcommand*{\lettertitlestyle}[1]{{\fontsize{10pt}{1em}\bodyfontlight\bfseries\color{darktext} \underline{#1}}}
+\newcommand*{\letterdatestyle}[1]{{\fontsize{9pt}{1em}\bodyfontlight\slshape\color{graytext} #1}}
+\newcommand*{\lettertextstyle}{\fontsize{10pt}{1.4em}\bodyfontlight\upshape\color{graytext}}
+\newcommand*{\letternamestyle}[1]{{\fontsize{10pt}{1em}\bodyfont\bfseries\color{darktext} #1}}
+\newcommand*{\letterenclosurestyle}[1]{{\fontsize{10pt}{1em}\bodyfontlight\slshape\color{lighttext} #1}}
+
 
 %-------------------------------------------------------------------------------
 %                Commands for personal information
@@ -277,31 +298,87 @@
 % Usage: \github{<github-nick>}
 \newcommand*{\github}[1]{\def\@github{#1}}
 
+% Defines writer's stackoverflow profile (optional)
+% Usage: \stackoverflow{<so userid>}{<so username>}
+%   e.g.https://stackoverflow.com/users/123456/sam-smith
+%       would be \stackoverflow{123456}{sam-smith}
+\newcommand*{\stackoverflow}[2]{\def\@stackoverflowid{#1}\def\@stackoverflowname{#2}}
+
 % Defines writer's linked-in (optional)
 % Usage: \linkedin{<linked-in-nick>}
 \newcommand*{\linkedin}[1]{\def\@linkedin{#1}}
 
-% Defines writer's skype (optional)
-% Usage: \skype{<skype account>}
-\newcommand*{\skype}[1]{\def\@skype{#1}}
-
 % Defines writer's twitter (optional)
 % Usage: \twitter{<twitter handle>}
 \newcommand*{\twitter}[1]{\def\@twitter{#1}}
 
+% Defines writer's skype (optional)
+% Usage: \skype{<skype account>}
+\newcommand*{\skype}[1]{\def\@skype{#1}}
+
+% Defines writer's reddit (optional)
+% Usage: \reddit{<reddit account>}
+\newcommand*{\reddit}[1]{\def\@reddit{#1}}
+
+% Defines writer's extra informations (optional)
+% Usage: \extrainfo{<extra informations>}
+\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
+
 % Defines writer's quote (optional)
 % Usage: \quote{<quote>}
 \renewcommand*{\quote}[1]{\def\@quote{#1}}
 
+% Defines recipient's information (cover letter only)
+% Usage: \recipient{<recipient name>}{<recipient address>}
+% Usage: \recipientname{<recipient name>}
+% Usage: \recipientaddress{<recipient address>}
+\newcommand*{\recipient}[2]{\def\@recipientname{#1}\def\@recipientaddress{#2}}
+\newcommand*{\recipientname}[1]{\def\@recipientname{#1}}
+\newcommand*{\recipientaddress}[1]{\def\@recipientaddress{#1}}
+
+% Defines the title for letter (cover letter only, optional)
+% Usage: \lettertitle{<title>}
+\newcommand*{\lettertitle}[1]{\def\@lettertitle{#1}}
+
+% Defines the date for letter (cover letter only)
+% Usage: \letterdate{<date>}
+\newcommand*{\letterdate}[1]{\def\@letterdate{#1}}
+
+% Defines a message of opening for letter (cover letter only)
+% Usage: \letteropening{<message>}
+\newcommand*{\letteropening}[1]{\def\@letteropening{#1}}
+
+% Defines a message of closing for letter (cover letter only)
+% Usage: \letterclosing{<message>}
+\newcommand*{\letterclosing}[1]{\def\@letterclosing{#1}}
+
+% Defines an enclosure for letter (cover letter only, optional)
+% Usage: \letterenclosure[<enclosure name>]{<enclosure>}
+\newcommand*{\letterenclname}[1][Enclosure]{\def\@letterenclname{#1}}
+\newcommand*{\letterenclosure}[2][]{%
+  % if an optional argument is provided, use it to redefine \enclname
+  \ifthenelse{\equal{#1}{}}{}{\def\@letterenclname{#1}}
+  \def\@letterenclosure{#2}
+}
+
 
 %-------------------------------------------------------------------------------
 %                Commands for extra
 %-------------------------------------------------------------------------------
-% Define separator for social informations in header
+%% Define helper macros a user can change easily
-% Usage: \headersocialsep{<separator>}
+% Header
-% Default: \quad\textbar\quad
+\newcommand{\acvHeaderNameDelim}{\space}
-\newcommand*{\headersocialsep}[1][\quad\textbar\quad]{\def\@headersocialsep{#1}}
+\newcommand{\acvHeaderAfterNameSkip}{.4mm}
-\headersocialsep
+\newcommand{\acvHeaderAfterPositionSkip}{.4mm}
+\newcommand{\acvHeaderAfterAddressSkip}{-.5mm}
+\newcommand{\acvHeaderIconSep}{\space}
+\newcommand{\acvHeaderSocialSep}{\quad\textbar\quad}
+\newcommand{\acvHeaderAfterSocialSkip}{6mm}
+\newcommand{\acvHeaderAfterQuoteSkip}{5mm}
+
+% Others
+\newcommand{\acvSectionTopSkip}{3mm}
+\newcommand{\acvEntryTopSkip}{2.5mm}
 
 
 %-------------------------------------------------------------------------------
@@ -312,7 +389,7 @@
 \newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
 \newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
 
-% Use to draw horizontal line with specific tickness
+% Use to draw horizontal line with specific thickness
 \def\vhrulefill#1{\leavevmode\leaders\hrule\@height#1\hfill \kern\z@}
 
 % Use to execute conditional statements by checking empty string
@@ -324,159 +401,150 @@
 %-------------------------------------------------------------------------------
 % Define a header for CV
 % Usage: \makecvheader
-\newcommand*{\makecvheader}{
+\newcommand*{\makecvheader}{%
   \begin{center}
-    \headerfirstnamestyle{
+    \headerfirstnamestyle{\@firstname}\headerlastnamestyle{{}\acvHeaderNameDelim\@lastname}%
-      \@firstname
+    \\[\acvHeaderAfterNameSkip]%
-    }\headerlastnamestyle{
+    \ifthenelse{\isundefined{\@position}}{}{\headerpositionstyle{\@position\\[\acvHeaderAfterPositionSkip]}}%
-      \@lastname
+    \ifthenelse{\isundefined{\@address}}{}{\headeraddressstyle{\@address\\[\acvHeaderAfterAddressSkip]}}%
-    }
+    \headersocialstyle{%
-    \\
+      \newbool{isstart}%
-    \vspace{0.4mm}
+      \setbool{isstart}{true}%
-    \ifthenelse{\isundefined{\@position}}{}{\headerpositionstyle{\@position\\}}
+      \ifthenelse{\isundefined{\@mobile}}%
-    \vspace{0.4mm}
+        {}%
-    \ifthenelse{\isundefined{\@address}}{}{\headeraddressstyle{\@address\\}}
+        {%
-    \vspace{-0.5mm}
+          \faMobile\acvHeaderIconSep\@mobile%
-    \headersocialstyle{
+          \setbool{isstart}{false}%
-      \newbool{isstart}
+        }%
-      \setbool{isstart}{true}
+      \ifthenelse{\isundefined{\@email}}%
-      \ifthenelse{\isundefined{\@mobile}}
+        {}%
-        {}
+        {%
-        {
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-          \faMobile\ \@mobile
+          \href{mailto:\@email}{\faEnvelope\acvHeaderIconSep\@email}%
-          \setbool{isstart}{false}
+        }%
-        }
+      \ifthenelse{\isundefined{\@homepage}}%
-      \ifthenelse{\isundefined{\@email}}
+        {}%
-        {}
+        {%
-        {
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-          \ifbool{isstart}
+          \href{http://\@homepage}{\faHome\acvHeaderIconSep\@homepage}%
-            {
+        }%
-              \setbool{istart}{false} 
+      \ifthenelse{\isundefined{\@github}}%
-            }
+        {}%
-            {\@headersocialsep}
+        {%
-          \href{mailto:\@email}{\faEnvelope\ \@email}
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-        }
+          \href{https://github.com/\@github}{\faGithubSquare\acvHeaderIconSep\@github}%
-      \ifthenelse{\isundefined{\@homepage}}
+        }%
-        {}
+      \ifthenelse{\isundefined{\@stackoverflowid}}%
-        {
+        {}%
-          \ifbool{isstart}
+        {%
-            {
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-              \setbool{istart}{false} 
+          \href{https://stackoverflow.com/users/\@stackoverflowid}{\faStackOverflow\acvHeaderIconSep\@stackoverflowname}%
-            }
+        }%
-            {\@headersocialsep}
+      \ifthenelse{\isundefined{\@linkedin}}%
-          \href{http://\@homepage}{\faHome\ \@homepage}
+        {}%
-        }
+        {%
-      \ifthenelse{\isundefined{\@github}}
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-        {}
+          \href{https://www.linkedin.com/in/\@linkedin}{\faLinkedinSquare\acvHeaderIconSep\@linkedin}%
-        {
+        }%
-          \ifbool{isstart}
+      \ifthenelse{\isundefined{\@twitter}}%
-            {
+        {}%
-              \setbool{istart}{false} 
+        {%
-            }
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-            {\@headersocialsep}
+          \href{https://twitter.com/\@twitter}{\faTwitter\acvHeaderIconSep\@twitter}%
-          \href{https://github.com/\@github}{\faGithubSquare\ \@github}
+        }%
-        }
+      \ifthenelse{\isundefined{\@skype}}%
-      \ifthenelse{\isundefined{\@linkedin}}
+        {}%
-        {}
+        {%
-        {
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-          \ifbool{isstart}
+          \faSkype\acvHeaderIconSep\@skype%
-            {
+        }%
-              \setbool{istart}{false} 
+      \ifthenelse{\isundefined{\@reddit}}%
-            }
+        {}%
-            {\@headersocialsep}
+        {%
-          \href{https://www.linkedin.com/in/\@linkedin}{\faLinkedinSquare\ \@linkedin}
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-        }
+          \href{https://www.reddit.com/user/\@reddit}{\faReddit\acvHeaderIconSep\@reddit}%
-      \ifthenelse{\isundefined{\@twitter}}
+        }%
-        {}
+      \ifthenelse{\isundefined{\@extrainfo}}%
-        {
+        {}%
-          \ifbool{isstart}
+        {%
-            {
+          \ifbool{isstart}{\setbool{istart}{false}}{\acvHeaderSocialSep}%
-              \setbool{istart}{false} 
+          \@extrainfo%
-            }
+        }%
-            {\@headersocialsep}
+    } \\[\acvHeaderAfterSocialSkip]%
-          \href{https://twitter.com/\@twitter}{\faTwitter\ \@twitter}
+    \ifthenelse{\isundefined{\@quote}}%
-        }
+      {}%
-      \ifthenelse{\isundefined{\@skype}}
+      {\headerquotestyle{\@quote\\}\vspace{\acvHeaderAfterQuoteSkip}}%
-        {}
+  \end{center}%
-        {
-          \ifbool{isstart}
-            {
-              \setbool{istart}{false} 
-            }
-            {\@headersocialsep}
-          \faSkype\ \@skype
-        }
-    } \\
-    \ifthenelse{\isundefined{\@quote}}
-      {}
-      {\vspace{6.0mm}\headerquotestyle{\@quote\\}\vspace{5.0mm}}
-  \end{center}
 }
 
 % Define a footer for CV
 % Usage: \makecvfooter{<left>}{<center>}{<right>}
-\newcommand*{\makecvfooter}[3]{
+\newcommand*{\makecvfooter}[3]{%
   \fancyfoot{}
-  \fancyfoot[L]{
+  \fancyfoot[L]{\footerstyle{#1}}
-    \footerstyle{#1}
+  \fancyfoot[C]{\footerstyle{#2}}
-  }
+  \fancyfoot[R]{\footerstyle{#3}} 
-  \fancyfoot[C]{
-    \footerstyle{#2}
-  }
-  \fancyfoot[R]{
-    \footerstyle{#3}
-  } 
 }
 
 % Define a section for CV
 % Usage: \cvsection{<section-title>}
-\newcommand{\cvsection}[1]{
+\newcommand{\cvsection}[1]{%
-  \par\addvspace{1.5ex}
+  \vspace{\acvSectionTopSkip}
-  \phantomsection{}
   \sectionstyle{#1}
+  \phantomsection
   \color{gray}\vhrulefill{0.9pt}
-  \par\nobreak\addvspace{1ex}
 }
 
 % Define a subsection for CV
 % Usage: \cvsubsection{<subsection-title>}
-\newcommand{\cvsubsection}[1]{
+\newcommand{\cvsubsection}[1]{%
-  \phantomsection{}
   \subsectionstyle{#1}
+  \phantomsection
 }
 
+% Define a paragraph for CV
+\newenvironment{cvparagraph}{%
+  \vspace{-3mm}
+  \paragraphstyle
+}{%
+  \vspace{1mm}
+}
+
+
 % Define an environment for cventry
-\newenvironment{cventries}{
+\newenvironment{cventries}{%
   \begin{center}
-}{
+}{%
   \end{center}
 }
 % Define an entry of cv information
 % Usage: \cventry{<position>}{<title>}{<location>}{<date>}{<description>}
-\newcommand*{\cventry}[5]{
+\newcommand*{\cventry}[5]{%
+  \vspace{\acvEntryTopSkip}
+  \vspace{-2.0mm}
   \setlength\tabcolsep{0pt}
   \setlength{\extrarowheight}{0pt}
-  \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{12.5cm} R{4.5cm}}
+  \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
     \ifempty{#2#3}
       {\entrypositionstyle{#1} & \entrydatestyle{#4} \\}
       {\entrytitlestyle{#2} & \entrylocationstyle{#3} \\
       \entrypositionstyle{#1} & \entrydatestyle{#4} \\}
-    \multicolumn{2}{L{17cm}}{\descriptionstyle{#5}} \\
+    \multicolumn{2}{L{\textwidth}}{\descriptionstyle{#5}}
-  \end{tabular*}
+  \end{tabular*}%
 }
 
 % Define an environment for cvsubentry
-\newenvironment{cvsubentries}{
+\newenvironment{cvsubentries}{%
   \begin{center}
-}{
+}{%
   \end{center}
 }
 % Define a subentry of cv information
 % Usage: \cvsubentry{<position>}{<title>}{<date>}{<description>}
-\newcommand*{\cvsubentry}[4]{
+\newcommand*{\cvsubentry}[4]{%
   \setlength\tabcolsep{0pt}
   \setlength{\extrarowheight}{0pt}
-  \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{12.5cm} R{4.5cm}}
+  \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
     \setlength\leftskip{0.2cm}
     \subentrytitlestyle{#2} & \ifthenelse{\equal{#1}{}}
       {\subentrydatestyle{#3}}{} 
@@ -490,48 +558,98 @@
 }
 
 % Define an environment for cvhonor
-\newenvironment{cvhonors}{
+\newenvironment{cvhonors}{%
   \begin{center}
     \setlength\tabcolsep{0pt}
     \setlength{\extrarowheight}{0pt}
-    \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} C{1.5cm} L{13.0cm} R{2.5cm}}
+    \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} C{1.5cm} L{\textwidth - 4.0cm} R{2.5cm}}
-}{
+}{%
     \end{tabular*}
   \end{center}
 }
 % Define a line of cv information(honor, award or something else)
 % Usage: \cvhonor{<position>}{<title>}{<location>}{<date>}
-\newcommand*{\cvhonor}[4]{
+\newcommand*{\cvhonor}[4]{%
-  \honordatestyle{#4} & \honorpositionstyle{#1}, \honortitlestyle{#2} & \honorlocationstyle{#3}
+  \honordatestyle{#4} & \honorpositionstyle{#1}, \honortitlestyle{#2} & \honorlocationstyle{#3} \\
-  \\
 }
 
 % Define an environment for cvskill
-\newenvironment{cvskills}{
+\newenvironment{cvskills}{%
   \begin{center}
     \setlength\tabcolsep{1ex}
     \setlength{\extrarowheight}{0pt}
-    \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} r L{15.2cm}}
+    \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} r L{\textwidth * \real{0.9}}}
-}{
+}{%
     \end{tabular*}
   \end{center}
 }
 % Define a line of cv information(skill)
 % Usage: \cvskill{<type>}{<skillset>}
-\newcommand*{\cvskill}[2]{
+\newcommand*{\cvskill}[2]{%
-	\skilltypestyle{#1} & \skillsetstyle{#2} 
+	\skilltypestyle{#1} & \skillsetstyle{#2} \\
-  \\
 }
 
 % Define an environment for cvitems(for cventry)
-\newenvironment{cvitems}{
+\newenvironment{cvitems}{%
-  \vspace{-4mm}
+  \vspace{-4.0mm}
   \begin{justify}
   \begin{itemize}[leftmargin=2ex, nosep, noitemsep]
     \setlength{\parskip}{0pt}
     \renewcommand{\labelitemi}{\bullet}
-}{
+}{%
   \end{itemize}
   \end{justify}
-  \vspace{-2mm}
+  \vspace{-4.0mm}
+}
+
+
+%-------------------------------------------------------------------------------
+%                Commands for elements of Cover Letter
+%-------------------------------------------------------------------------------
+% Define an environment for cvletter
+\newenvironment{cvletter}{%
+  \lettertextstyle
+}{%
+}
+
+% Define a section for the cover letter
+% Usage: \lettersection{<section-title>}
+\newcommand{\lettersection}[1]{%
+  \par\addvspace{2.5ex}
+  \phantomsection{}
+  \lettersectionstyle{#1}
+  \color{gray}\vhrulefill{0.9pt}
+  \par\nobreak\addvspace{0.4ex}
+}
+
+% Define a title of the cover letter
+% Usage: \makelettertitle
+\newcommand*{\makelettertitle}{%
+  \vspace{8.4mm}
+  \setlength\tabcolsep{0pt}
+  \setlength{\extrarowheight}{0pt}
+  \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
+    \recipienttitlestyle{\@recipientname} & \letterdatestyle{\@letterdate}
+  \end{tabular*}
+  \begin{singlespace}
+    \recipientaddressstyle{\@recipientaddress} \\\\
+  \end{singlespace}
+  \ifthenelse{\isundefined{\@lettertitle}}
+    {}
+    {\lettertitlestyle{\@lettertitle} \\}
+  \lettertextstyle{\@letteropening} 
+}
+
+% Define a closing of the cover letter
+% Usage: \makeletterclosing
+\newcommand*{\makeletterclosing}{%
+  \vspace{3.4mm}
+  \lettertextstyle{\@letterclosing} \\\\
+  \letternamestyle{\@firstname\ \@lastname}
+  \ifthenelse{\isundefined{\@letterenclosure}}
+    {\\}
+    {%
+      \\\\\\
+      \letterenclosurestyle{\@letterenclname: \@letterenclosure} \\
+    }
 }