Merge pull request #14 from fluentdesk/v0.7.0-beta

v0.7.0 beta
2024-11-22 08:10:10 +00:00 · 2015-12-19 08:51:37 -05:00 · 2015-12-19 08:51:37 -05:00 · 3866e1096a
commit 3866e1096a
parent c77fcac534 82c80fb222
56 changed files with 3423 additions and 1635 deletions
--- a/README.md
+++ b/README.md
@ -1,19 +1,22 @@
 fluent-themes
 =============
+
 Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
 [JSON Resume][jrs] formats.

- `awesome`: A technical resume theme based on [Awesome-CV][awe].
- `minimist`: An unstyled barebones theme.
- `modern`: A middle of the road theme with a modern look 'n feel.
- `hello-world`: A simple-as-possible example theme.
- `compact`: A visually dense/compact theme.
+- [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

 You don't need to install this repository to use the themes; just install
-[FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest official standalone version of the theme repository over NPM...
+[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 fluent-themes --save`

@ -29,7 +32,9 @@ multiple formats. Each theme lives in a separate folder and consists of:
 - Any necessary support files (CSS, LaTeX partials, etc.).
 - A dedicated README.

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

 ## Contribute
@ -46,7 +51,13 @@ MIT. See [LICENSE.md][1] for details.

 [1]: http://fluentcv.com
 [2]: https://github.com/fluentdesk/fluentcv
-[3]: ../LICENSE.md
+[3]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
+[t-awesome]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/awesome
+[t-minimist]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/minimist
+[t-modern]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/modern
+[t-hello]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/hello-world
+[t-compact]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/compact
+[t-positive]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/positive
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fluent-themes",
-  "version": "0.6.3-beta",
+  "version": "0.7.0-beta",
  "description": "Multiformat résumé themes and templates for FluentCV and JSON Resume.",
  "repository": {
    "type": "git",
--- a/themes/awesome/README.md
+++ b/themes/awesome/README.md
@ -1,12 +1,12 @@
 Theme: Awesome
 ==============
 An experimental FluentCV theme based on [Byungjin Park's][author]
-[Awesome-CV][acv] resume template for LaTeX.
+[Awesome-CV][acv] résumé template for LaTeX.

 ## Use

 1. Run `fluentcv build my-resume.json to out/my-resume.all -t awesome` to create
-a LaTeX resume in the Awesome-CV style using your FRESH or JSON Resume resume.
+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
--- a/themes/compact/README.md
+++ b/themes/compact/README.md
@ -1,3 +1,5 @@
 Theme: Compact
 ==============
-A compact, no-nonsense resume theme for FluentCV.
+A compact, no-frills résumé theme for FluentCV.
+
+![](compact.png)
--- a/themes/compact/compact.png
+++ b/themes/compact/compact.png
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@ -161,7 +161,7 @@
      <w:rPr>
        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
        <wx:font wx:val="Calibri"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz-cs w:val="20"/>
        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
      </w:rPr>
      <w:pPr>
@ -175,17 +175,20 @@
      <w:link w:val="Heading1Char"/>
      <w:rsid w:val="00505903"/>
      <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:spacing w:before="100" w:before-autospacing="off"/>
        <w:outlineLvl w:val="0"/>
+        <w:pBdr>
+          <w:bottom w:val="single" w:sz="6" w:space="1" w:color="auto" />
+        </w:pBdr>
      </w:pPr>
      <w:rPr>
        <wx:font wx:val="Calibri"/>
        <w:b/>
        <w:b-cs/>
-        <w:color w:val="AEAAAA"/>
-        <w:kern w:val="36"/>
-        <w:sz w:val="32"/>
-        <w:sz-cs w:val="48"/>
+        <!-- <w:color w:val="AEAAAA"/> -->
+        <w:kern w:val="20"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="paragraph" w:styleId="Heading2">
@ -195,7 +198,7 @@
      <w:link w:val="Heading2Char"/>
      <w:rsid w:val="00505903"/>
      <w:pPr>
-        <w:spacing w:before="120"/>
+        <w:spacing w:before="60"/>
        <w:outlineLvl w:val="1"/>
      </w:pPr>
      <w:rPr>
@ -203,7 +206,7 @@
        <w:b/>
        <w:b-cs/>
        <w:caps/>
-        <w:sz-cs w:val="36"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="paragraph" w:styleId="Heading3">
@ -276,7 +279,7 @@
        <w:b/>
        <w:b-cs/>
        <w:caps/>
-        <w:sz-cs w:val="36"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="character" w:styleId="Heading3Char">
@ -286,8 +289,8 @@
      <w:rPr>
        <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
        <w:color w:val="1F4D78"/>
-        <w:sz w:val="24"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="paragraph" w:styleId="NormalWeb">
@ -312,8 +315,8 @@
        <w:b-cs/>
        <w:color w:val="AEAAAA"/>
        <w:kern w:val="36"/>
-        <w:sz w:val="32"/>
-        <w:sz-cs w:val="48"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="character" w:styleId="Strong">
@ -349,11 +352,12 @@
      <w:rPr>
        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
        <wx:font wx:val="Calibri Light"/>
-        <w:caps/>
+        <!-- <w:caps/> -->
        <w:spacing w:val="-10"/>
        <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
+        <w:caps/>
      </w:rPr>
    </w:style>
    <w:style w:type="character" w:styleId="TitleChar">
@ -362,11 +366,11 @@
      <w:rsid w:val="002D3B7B"/>
      <w:rPr>
        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
-        <w:caps/>
+        <!-- <w:caps/> -->
        <w:spacing w:val="-10"/>
        <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
    <w:style w:type="paragraph" w:styleId="ListParagraph">
@ -399,7 +403,7 @@
      <w:rsid w:val="00A210E1"/>
      <w:rPr>
        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz-cs w:val="20"/>
      </w:rPr>
    </w:style>
  </w:styles>
@ -454,25 +458,16 @@
          </w:tabs>
        </w:pPr>
        <w:r>
+          <w:rPr>
+            <w:sz w:val="28"/>
+            <w:b/>
+          </w:rPr>
          <w:t>{{ r.name }}</w:t>
        </w:r>
        <w:r>
          <w:tab/>
        </w:r>
-        <w:r>
-          <w:rPr>
-            <w:color w:val="DADADA"/>
-          </w:rPr>
-          <w:t>{{ r.info.label }}</w:t>
-        </w:r>
-      </w:p>
-      <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="00505903" wsp:rsidP="00C146CA">
-        <w:pPr>
-          <w:rPr>
-            <w:sz-cs w:val="20"/>
-          </w:rPr>
-        </w:pPr>
-        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+        <w:hlink w:dest="mailto:{{{ r.contact.email }}}">
          <w:r wsp:rsidRPr="003876BF">
            <w:rPr>
              <w:rStyle w:val="Hyperlink"/>
@ -499,13 +494,13 @@
          </w:rPr>
          <w:t> - </w:t>
        </w:r>
-        <w:hlink w:dest="{{ r.contact.website }}">
+        <w:hlink w:dest="{{{ r.contact.website }}}">
          <w:r wsp:rsidRPr="003876BF">
            <w:rPr>
              <w:rStyle w:val="Hyperlink"/>
              <w:sz-cs w:val="20"/>
            </w:rPr>
-            <w:t>{{ r.contact.website }}</w:t>
+            <w:t>{{trimURL r.contact.website }}</w:t>
          </w:r>
        </w:hlink>
      </w:p>
--- a/themes/compact/src/compact-html.css
+++ b/themes/compact/src/compact-html.css
@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Helvetica, sans-serif;
+  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
  font-size: 12px;
  margin: 0; padding: 0;
  display: block;
@ -26,6 +26,11 @@ h3 {
  font-size: 1em;
 }

+hr {
+  border: none;
+  border-top: 1px solid #B3B3B3;
+}
+
 main {
  padding: 15px;
  max-width: 700px;
@ -59,16 +64,22 @@ thead {
 main > header {
  width: 100%;
  float: left;
-  margin-bottom: 1em;
+  margin-bottom: 0;
+  position: relative;
 }


 main > header > h1 {
  float: left;
  font-size: 1.5em;
+  text-transform: uppercase;
+  line-height: 1;
 }
 #contact {
  float: right;
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }

 #contact > div {
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@ -2,26 +2,25 @@
 <html>
  <head>
    <meta charset="utf-8">
-    <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <title>{{ RAW.name }}</title>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
    <link href="compact-html.css" rel="stylesheet" type="text/css">
  </head>
  <body>
    <main>
      <header>
-        <h1>{{ r.name }}</h1>
+        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
        </div>
      </header>


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

@ -67,11 +66,11 @@
              {{ employer }}
              {{/if}}
              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{ summary }}</p>
+            <p style="clear: both;">{{{ summary }}}</p>
            {{#if highlights}}
              <ul>
              {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
              {{/each}}
              </ul>
            {{/if}}
@ -84,7 +83,7 @@
            <ul>
            {{/compare}}

-            <li>{{ position }}, {{ employer }}</li>
+            <li>{{{ position }}}, {{{ employer }}}</li>

            {{#if @last}}
            </ul>
@ -101,7 +100,7 @@
        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
        </header>
        {{#each r.education.history}}
-          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
        {{/each}}

      </section>
@ -120,11 +119,11 @@
            {{ organization }}
            {{/if}}
            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
          {{#if highlights}}
            <ul>
            {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
            {{/each}}
            </ul>
          {{/if}}
@ -139,9 +138,9 @@
        <h2><span class="fa fa-book"></span> Writing</h2><hr>
        </header>
        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{ summary }}{{/if}}
+        {{# if summary}}{{{ summary }}}{{/if}}
        {{/each}}
      </section>
 {{/if}}
--- a/themes/compact/src/compact-pdf.css
+++ b/themes/compact/src/compact-pdf.css
@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Helvetica, sans-serif;
+  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
  font-size: 12px;
  margin: 0; padding: 0;
  display: block;
@ -26,6 +26,11 @@ h3 {
  font-size: 1em;
 }

+hr {
+  border: none;
+  border-top: 1px solid #B3B3B3;
+}
+
 main {
  padding: 15px;
  max-width: 700px;
@ -59,16 +64,22 @@ thead {
 main > header {
  width: 100%;
  float: left;
-  margin-bottom: 1em;
+  margin-bottom: 0;
+  position: relative;
 }


 main > header > h1 {
  float: left;
  font-size: 1.5em;
+  text-transform: uppercase;
+  line-height: 1;
 }
 #contact {
  float: right;
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }

 #contact > div {
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@ -3,26 +3,25 @@
  <head>
    <meta charset="utf-8">
    <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
    <style>
-    {{ cssInfo.data }}
+    {{{ cssInfo.data }}}
    </style>
  </head>
  <body>
    <main>
      <header>
-        <h1>{{ r.name }}</h1>
+        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
        </div>
      </header>


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

@ -68,11 +67,11 @@
              {{ employer }}
              {{/if}}
              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{ summary }}</p>
+            <p style="clear: both;">{{{ summary }}}</p>
            {{#if highlights}}
              <ul>
              {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
              {{/each}}
              </ul>
            {{/if}}
@ -85,7 +84,7 @@
            <ul>
            {{/compare}}

-            <li>{{ position }}, {{ employer }}</li>
+            <li>{{{ position }}}, {{{ employer }}}</li>

            {{#if @last}}
            </ul>
@ -102,7 +101,7 @@
        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
        </header>
        {{#each r.education.history}}
-          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
        {{/each}}

      </section>
@ -121,11 +120,11 @@
            {{ organization }}
            {{/if}}
            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
          {{#if highlights}}
            <ul>
            {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
            {{/each}}
            </ul>
          {{/if}}
@ -140,9 +139,9 @@
        <h2><span class="fa fa-book"></span> Writing</h2><hr>
        </header>
        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{ summary }}{{/if}}
+        {{# if summary}}{{{ summary }}}{{/if}}
        {{/each}}
      </section>
 {{/if}}
--- a/themes/compact/src/partials/employment.xml
+++ b/themes/compact/src/partials/employment.xml
@ -18,6 +18,9 @@
          <w:tab w:val="right" w:pos="9360"/>
        </w:tabs>
      </w:pPr>
+      <w:r>
+        <w:t>{{ position }}, </w:t>
+      </w:r>
      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
          {{#if url}}
--- a/themes/hello-world/README.md
+++ b/themes/hello-world/README.md
@ -1,3 +1,3 @@
 Theme: Hello-World
 ==================
-The simplest possible resume theme for FluentCV. For example purposes.
+The simplest possible résumé theme for FluentCV. For example purposes.
--- a/themes/minimist/README.md
+++ b/themes/minimist/README.md
@ -1,3 +1,3 @@
 Theme: Minimist
 ===============
-An unstyled resume theme for FluentCV.
+An unstyled résumé theme for FluentCV.
--- a/themes/modern/README.md
+++ b/themes/modern/README.md
@ -1,3 +1,5 @@
 Theme: Modern
 ===============
-A contemporary technical resume theme for FluentCV.
+A contemporary technical résumé theme for FluentCV.
+
+![](modern.png)
--- a/themes/modern/modern.json
+++ b/themes/modern/modern.json
@ -2,5 +2,5 @@
  "title": "modern",
  "description": "A contemporary resume template suitable for modern technical candidates and employees.",
  "author": "hacksalot <hacksalot@fluentdesk.com>",
-  "engine": "underscore"
+  "engine": "handlebars"
 }
--- a/themes/modern/modern.png
+++ b/themes/modern/modern.png
--- a/themes/modern/src/_img/fa-building.png
+++ b/themes/modern/src/_img/fa-building.png
--- a/themes/modern/src/_img/fa-child.png
+++ b/themes/modern/src/_img/fa-child.png
--- a/themes/modern/src/_img/fa-code.png
+++ b/themes/modern/src/_img/fa-code.png
--- a/themes/modern/src/_img/fa-mortar-board.png
+++ b/themes/modern/src/_img/fa-mortar-board.png
--- a/themes/modern/src/_img/fa-pencil.png
+++ b/themes/modern/src/_img/fa-pencil.png
--- a/themes/modern/src/_img/fa-person.png
+++ b/themes/modern/src/_img/fa-person.png
--- a/themes/modern/src/_img/fa-trophy.png
+++ b/themes/modern/src/_img/fa-trophy.png
--- a/themes/modern/src/doc.xml
+++ b/themes/modern/src/doc.xml
--- a/themes/modern/src/html.html
+++ b/themes/modern/src/html.html
@ -1,196 +0,0 @@
-<!DOCTYPE html>
-<!-- [[[
-title: Modern (HTML)
-description: An HTML resume template for FluentCV's "modern" theme.
-engine: Underscore
-]]] -->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{ headFragment }}
-    {% if( cssInfo.file ) { %}
-    <link href="{{ cssInfo.file }}" rel="stylesheet" type="text/css">
-    {% } else { %}
-    <style>
-    {{ cssInfo.data }}
-    </style>
-    {% } %}
-  </head>
-  <body>
-    <main id="main">
-      <div id="container">
-      <header>
-        <h1>{{ r.name }}</h1>
-        <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
-        </div>
-      </header>
-
-{% if ( r.info.brief && r.info.brief.length ) { %}
-      <hr>
-      <section id="summary">
-        <h3>About</h3>
-        <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief }}
-      </section>
-{% } %}
-
-
-{% if ( r.skills && r.skills.sets ) { %}
-      <hr>
-      <section id="skills">
-        <header>
-        <h3>Skills</h3>
-        </header>
-        <span class="fa fa-lg fa-code"></span>
-
-        <ul class="list-unstyled">
-          {% r.skills.sets.forEach( function(set) { %}
-            <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
-                <div class="skill-progress {{ set.level }}"></div>
-              </div>
-              <div class="skill-info">
-                <strong>{{ set.name }}</strong>
-                <div class="space-top labels">
-                  {% if( set.skills && set.skills.length ) { %}
-                    {% set.skills.forEach(function(kw) { %}
-                      <span class="label label-keyword">{{ kw }}</span>
-                    {% }); %}
-                  {% } %}
-                </div>
-              </div>
-            </li>
-          {% }); %}
-        </ul>
-
-
-      </section>
-{% } %}
-
-
-
-{% if ( r.employment.history && r.employment.history.length ) { %}
-      <hr>
-      <section id="employment">
-        <header>
-        <h3>Employment</h3>
-        </header>
-        <span class="fa fa-lg fa-building"></span>
-        {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url }}">{{ proj.employer }}</a></h4>
-          {% } else { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
-          {% } %}
-          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary }}
-          {% if( proj.highlights ) { %}
-            <ul>
-            {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-
-
-{% if ( r.education.history && r.education.history.length ) { %}
-      <hr>
-      <section id="education">
-        <header>
-        <h3>Education</h3>
-        </header>
-        <span class="fa fa-lg fa-mortar-board"></span>
-        {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h4>{{ edu.institution }}</h4>
-          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
-          {% if( edu.courses ) { %}
-            <ul>
-            {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-{% if( r.recognition && r.recognition.length ) { %}
-      <hr>
-      <section id="awards">
-        <header>
-        <h3>Awards</h3>
-        </header>
-        <span class="fa fa-lg fa-trophy"></span>
-        {% r.recognition.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
-          <span class="tenure">{{ award.date }}</span>
-          {{ award.summary }}
-        {% }); %}
-      </section>
-{% } %}
-
-{% if( r.writing && r.writing.length ) { %}
-      <hr>
-      <section id="publications">
-        <header>
-        <h3>Publications</h3>
-        </header>
-        <span class="fa fa-lg fa-pencil"></span>
-        {% r.writing.forEach( function( pub, idx, ar) { %}
-          <h4>
-            <span class="res-label">{{ filt.link(pub.title, pub.url) }}</span>&nbsp;{{ pub.publisher }}
-          </h4>
-        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
-
-
-
-        {% }); %}
-      </section>
-{% } %}
-
-{% if ( r.service.history && r.service.history.length ) { %}
-      <hr>
-      <section id="volunteer">
-        <header>
-        <h3>Volunteer Work</h3>
-        </header>
-        <span class="fa fa-lg fa-child"></span>
-        {% r.service.history.forEach( function( vol, idx, ar) { %}
-          {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
-          {% } else { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
-          {% } %}
-          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary }}
-          {% if( vol.highlights ) { %}
-            <ul>
-            {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-
-      </div>
-    </main>
-  </body>
-</html>
--- a/themes/modern/src/md.txt
+++ b/themes/modern/src/md.txt
@ -1,54 +0,0 @@
-# {{ r.name }}
-
-{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
-{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
-{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
-
-{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
-
-{% if ( r.skills && r.skills.sets ) { %}
-## Skills
-{% r.skills.sets.forEach( function( set, idx, ar) { %}
- **{{ set.name }}**: {{ set.skills.join(', ') }}
-{% }); } %}
-
-{% if ( r.employment.history && r.employment.history.length ) { %}
-## Employment
-{% r.employment.history.forEach( function( proj, idx, ar) { %}
-### *{{ proj.position }}*, {{ proj.employer }}
-<small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
-{{ proj.summary }}
-{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
- {{ high }}
-{% }); }  }); } %}
-
-{% if ( r.education.history && r.education.history.length ) { %}
-## Education
-{% r.education.history.forEach( function( edu, idx, ar) { %}
-### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }})
-{{ edu.area }}
-{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %}
- {{ course }}
-{% }); } }); } %}
-
-{% if ( r.writing && r.writing.length ) { %}
-## Publications
-{% r.writing.forEach( function( pub, idx, ar) { %}
-### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
-{{ pub.publisher }}
-{{ pub.summary }}
-{% }); } %}
-
-{% if ( r.service.history && r.service.history.length ) { %}
-## Volunteer
-{% r.service.history.forEach( function( vol, idx, ar) { %}
-### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }})
-{{ vol.summary }}
-{% }); } %}
-
-{% if ( r.recognition && r.recognition.length ) { %}
-## Recognition
-{% r.recognition.forEach( function( awd, idx, ar) { %}
-### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }})
-{{ awd.summary }}
-{% }); } %}
--- a/themes/modern/src/modern-doc.xml
+++ b/themes/modern/src/modern-doc.xml
@ -0,0 +1,503 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?mso-application progid="Word.Document"?>
+<w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
+  <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
+  <o:DocumentProperties>
+    <o:Title>Resume for {{ r.name }}</o:Title>
+    <o:Author>{{ r.name }}</o:Author>
+    <o:Keywords>resume;CV</o:Keywords>
+    <o:LastAuthor>{{ r.name }}</o:LastAuthor>
+    <o:Revision>1</o:Revision>
+    <o:TotalTime>60</o:TotalTime>
+    <o:Created>2015-12-16T17:38:00Z</o:Created>
+    <o:LastSaved>2015-12-16T18:32:00Z</o:LastSaved>
+    <o:Pages>1</o:Pages>
+    <o:Words>241</o:Words>
+    <o:Characters>1379</o:Characters>
+    <o:Lines>11</o:Lines>
+    <o:Paragraphs>3</o:Paragraphs>
+    <o:CharactersWithSpaces>1617</o:CharactersWithSpaces>
+    <o:Version>15</o:Version>
+  </o:DocumentProperties>
+  <w:fonts>
+    <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
+    <w:font w:name="Times New Roman">
+      <w:panose-1 w:val="02020603050405020304"/>
+      <w:charset w:val="00"/>
+      <w:family w:val="Roman"/>
+      <w:pitch w:val="variable"/>
+      <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
+    </w:font>
+    <w:font w:name="Calibri">
+      <w:panose-1 w:val="020F0502020204030204"/>
+      <w:charset w:val="00"/>
+      <w:family w:val="Swiss"/>
+      <w:pitch w:val="variable"/>
+      <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
+    </w:font>
+  </w:fonts>
+  <w:lists>
+    <w:listDef w:listDefId="1">
+      <w:lsid w:val="602C53DD"/>
+      <w:plt w:val="HybridMultilevel"/>
+      <w:tmpl w:val="61849B8C"/>
+      <w:lvl w:ilvl="0" w:tplc="DD7ED086">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="•"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="720" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="1" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="1440" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="2" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="2160" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="3" w:tplc="04090001" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="2880" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="4" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="3600" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="5" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="4320" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="6" w:tplc="04090001" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="5040" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="7" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="5760" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="8" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="6480" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+    </w:listDef>
+    <w:list w:ilfo="1">
+      <w:ilst w:val="1"/>
+    </w:list>
+  </w:lists>
+  <w:styles>
+    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
+      <w:name w:val="Normal"/>
+      <w:rsid w:val="002743C8"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <wx:font wx:val="Calibri"/>
+        <w:sz-cs w:val="24"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:pPr>
+        <w:jc w:val="both"/>
+      </w:pPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading1">
+      <w:name w:val="heading 1"/>
+      <wx:uiName wx:val="Heading 1"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading1Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:outlineLvl w:val="0"/>
+        <w:pBdr>
+          <w:top w:val="single" w:sz="6" w:space="1" w:color="#EEEEEE" />
+        </w:pBdr>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="40"/>
+        <w:sz-cs w:val="40"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading2">
+      <w:name w:val="heading 2"/>
+      <wx:uiName wx:val="Heading 2"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading2Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="120"/>
+        <w:outlineLvl w:val="1"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:caps/>
+        <w:sz-cs w:val="36"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading3">
+      <w:name w:val="heading 3"/>
+      <wx:uiName wx:val="Heading 3"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading3Char"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="240" w:after="100" w:after-autospacing="on"/>
+        <w:outlineLvl w:val="2"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
+      <w:name w:val="Default Paragraph Font"/>
+    </w:style>
+    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
+      <w:name w:val="Normal Table"/>
+      <wx:uiName wx:val="Table Normal"/>
+      <w:rPr>
+        <wx:font wx:val="Times New Roman"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:tblPr>
+        <w:tblInd w:w="0" w:type="dxa"/>
+        <w:tblCellMar>
+          <w:top w:w="0" w:type="dxa"/>
+          <w:left w:w="108" w:type="dxa"/>
+          <w:bottom w:w="0" w:type="dxa"/>
+          <w:right w:w="108" w:type="dxa"/>
+        </w:tblCellMar>
+      </w:tblPr>
+    </w:style>
+    <w:style w:type="list" w:default="on" w:styleId="NoList">
+      <w:name w:val="No List"/>
+    </w:style>
+    <w:style w:type="character" w:styleId="Hyperlink">
+      <w:name w:val="Hyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="0064BD"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="FollowedHyperlink">
+      <w:name w:val="FollowedHyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="7B0796"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading2Char">
+      <w:name w:val="Heading 2 Char"/>
+      <w:link w:val="Heading2"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:caps/>
+        <w:sz-cs w:val="36"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading3Char">
+      <w:name w:val="Heading 3 Char"/>
+      <w:link w:val="Heading3"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
+        <w:color w:val="1F4D78"/>
+        <w:sz w:val="24"/>
+        <w:sz-cs w:val="24"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="NormalWeb">
+      <w:name w:val="Normal (Web)"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+        <w:jc w:val="both"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading1Char">
+      <w:name w:val="Heading 1 Char"/>
+      <w:link w:val="Heading1"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="40"/>
+        <w:sz-cs w:val="40"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Strong">
+      <w:name w:val="Strong"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Emphasis">
+      <w:name w:val="Emphasis"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:i/>
+        <w:i-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="tenure">
+      <w:name w:val="tenure"/>
+      <w:basedOn w:val="DefaultParagraphFont"/>
+      <w:rsid w:val="001B7422"/>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Title">
+      <w:name w:val="Title"/>
+      <w:basedOn w:val="Normal"/>
+      <w:next w:val="Normal"/>
+      <w:link w:val="TitleChar"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:pPr>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+        <wx:font wx:val="Segoe UI"/>
+        <w:b/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="TitleChar">
+      <w:name w:val="Title Char"/>
+      <w:link w:val="Title"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="ListParagraph">
+      <w:name w:val="List Paragraph"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="00C146CA"/>
+      <w:pPr>
+        <w:ind w:left="720"/>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Summary">
+      <w:name w:val="Summary"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="SummaryChar"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:pPr>
+        <w:spacing w:before="120"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:color w:val="767171"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="SummaryChar">
+      <w:name w:val="Summary Char"/>
+      <w:link w:val="Summary"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:sz-cs w:val="24"/>
+      </w:rPr>
+    </w:style>
+  </w:styles>
+  <w:docPr>
+    <w:view w:val="print"/>
+    <w:zoom w:percent="98"/>
+    <w:doNotEmbedSystemFonts/>
+    <w:defaultTabStop w:val="720"/>
+    <w:characterSpacingControl w:val="DontCompress"/>
+    <w:webPageEncoding w:val="unicode"/>
+    <w:optimizeForBrowser/>
+    <w:allowPNG/>
+    <w:validateAgainstSchema/>
+    <w:saveInvalidXML w:val="off"/>
+    <w:ignoreMixedContent w:val="off"/>
+    <w:alwaysShowPlaceholderText w:val="off"/>
+    <w:compat>
+      <w:breakWrappedTables/>
+    </w:compat>
+    <wsp:rsids>
+      <wsp:rsidRoot wsp:val="00C146CA"/>
+      <wsp:rsid wsp:val="000A3AF0"/>
+      <wsp:rsid wsp:val="001B7422"/>
+      <wsp:rsid wsp:val="002743C8"/>
+      <wsp:rsid wsp:val="002865F0"/>
+      <wsp:rsid wsp:val="002D3B7B"/>
+      <wsp:rsid wsp:val="00397D4D"/>
+      <wsp:rsid wsp:val="00437135"/>
+      <wsp:rsid wsp:val="00505903"/>
+      <wsp:rsid wsp:val="00606071"/>
+      <wsp:rsid wsp:val="006C2CFB"/>
+      <wsp:rsid wsp:val="00771B3E"/>
+      <wsp:rsid wsp:val="007D096C"/>
+      <wsp:rsid wsp:val="009452CA"/>
+      <wsp:rsid wsp:val="00A210E1"/>
+      <wsp:rsid wsp:val="00B43FDC"/>
+      <wsp:rsid wsp:val="00C146CA"/>
+      <wsp:rsid wsp:val="00C77315"/>
+      <wsp:rsid wsp:val="00CD3781"/>
+      <wsp:rsid wsp:val="00E578D4"/>
+      <wsp:rsid wsp:val="00EA0B64"/>
+      <wsp:rsid wsp:val="00FE101B"/>
+    </wsp:rsids>
+  </w:docPr>
+  <w:body>
+    <wx:sect>
+      <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="007D096C" wsp:rsidP="00C146CA">
+        <w:pPr>
+          <w:pStyle w:val="Title"/>
+        </w:pPr>
+        <w:r>
+          <w:t>{{ r.name }}</w:t>
+        </w:r>
+      </w:p>
+      <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="00505903" wsp:rsidP="00C146CA">
+        <w:pPr>
+          <w:rPr>
+            <w:sz-cs w:val="20"/>
+          </w:rPr>
+          <!-- <w:jc w:val="right"/> -->
+        </w:pPr>
+        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+          <w:r wsp:rsidRPr="003876BF">
+            <w:rPr>
+              <w:rStyle w:val="Hyperlink"/>
+              <w:sz w:val="16"/>
+            </w:rPr>
+            <w:t>{{ r.contact.email }}<w:br/></w:t>
+          </w:r>
+        </w:hlink>
+        <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0">
+          <w:rPr>
+            <w:sz w:val="16"/>
+          </w:rPr>
+          <w:t>{{ r.contact.phone }}<w:br/></w:t>
+        </w:r>
+        <w:hlink w:dest="{{ r.contact.website }}">
+          <w:r wsp:rsidRPr="003876BF">
+            <w:rPr>
+              <w:rStyle w:val="Hyperlink"/>
+              <w:sz w:val="16"/>
+            </w:rPr>
+            <w:t>{{ r.contact.website }}</w:t>
+          </w:r>
+        </w:hlink>
+      </w:p>
+      {{> info }}
+      {{> skills }}
+      {{> employment }}
+      {{> education }}
+      {{> service }}
+      {{> writing }}
+      {{> recognition }}
+      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
+        <w:pgSz w:w="12240" w:h="15840"/>
+        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
+        <w:cols w:space="720"/>
+        <w:docGrid w:line-pitch="360"/>
+      </w:sectPr>
+    </wx:sect>
+  </w:body>
+</w:wordDocument>
--- a/themes/modern/src/modern-html.css
+++ b/themes/modern/src/modern-html.css
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ r.name }}</title>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link href="modern-html.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <main id="main">
+      <div id="container">
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+        </div>
+      </header>
+      </header>
+
+
+{{#if r.info.brief}}
+<hr>
+<section id="summary">
+  <h3>About</h3>
+  <span class="fa fa-lg fa-user"></span>
+  {{{ r.info.brief }}}
+</section>
+{{/if}}
+
+
+{{#if r.skills }}
+      <hr>
+      <section id="skills">
+        <header>
+        <h3>Skills</h3>
+        </header>
+        <span class="fa fa-lg fa-code"></span>
+
+        <ul class="list-unstyled">
+          {{#each r.skills.sets}}
+            <li class="card card-nested card-skills">
+              <div class="skill-level" rel="tooltip" title="{{ level }}" data-placement="left">
+                <div class="skill-progress {{toLower level }}"></div>
+              </div>
+              <div class="skill-info">
+                <strong>{{ name }}</strong>
+                <div class="space-top labels">
+                  {{#if skills}}
+                    {{#each skills}}
+                      <span class="label label-keyword">{{ this }}</span>
+                    {{/each}}
+                  {{/if}}
+                </div>
+              </div>
+            </li>
+          {{/each}}
+        </ul>
+
+
+      </section>
+{{/if}}
+
+
+
+{{#if r.employment}}
+<hr>
+<section id="employment">
+  <header>
+  <h3>Employment</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.employment.history}}
+    {{#if url}}
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{# if r.education}}
+<hr>
+<section id="education">
+  <header>
+  <h3>Education</h3>
+  </header>
+  <span class="fa fa-lg fa-mortar-board"></span>
+  {{#each r.education.history}}
+    <h4>{{ institution }}</h4>
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{#if courses}}
+      <ul>
+      {{#each courses}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{#if r.service}}
+<hr>
+<section id="volunteer">
+  <header>
+  <h3>Service</h3>
+  </header>
+  <span class="fa fa-lg fa-child"></span>
+  {{#each r.service.history}}
+    {{#if url}}
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ website }}}">{{ organization }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ organization }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM'}}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{#if r.writing}}
+<hr>
+<section id="publications">
+  <header>
+  <h3>Publications</h3>
+  </header>
+  <span class="fa fa-lg fa-pencil"></span>
+  {{#each r.writing}}
+  {{#if url}}
+  <h4><a href=""><span class="res-label">{{{ title }}}</span></a>, <span>{{{ publisher.name }}}</span></h4>
+  {{else}}
+  <h4><span class="res-label">{{{ title }}}</span>, <span class="defunct">{{{ publisher.name }}}</span></h4>
+  {{/if}}
+  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
+  {{/each}}
+</section>
+{{/if}}
+
+{{# if r.recognition}}
+<hr>
+<section id="awards">
+  <header>
+  <h3>Awards</h3>
+  </header>
+  <span class="fa fa-lg fa-trophy"></span>
+  {{#each r.recognition}}
+    <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}}</h4>
+    <span class="tenure">{{{ date }}}</span>
+    {{{ summary }}}
+  {{/each}}
+</section>
+{{/if}}
+
+      </div>
+    </main>
+  </body>
+</html>
--- a/themes/modern/src/modern-md.txt
+++ b/themes/modern/src/modern-md.txt
@ -0,0 +1,84 @@
+{{ r.name }}
+============
+{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+
+{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+
+{{#if r.skills}}
+## SKILLS
+
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/if}}
+
+{{#if r.employment}}
+## EMPLOYMENT
+
+{{#each r.employment.history }}
+  {{#compare @index 4 operator="<"}}
+### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+  {{/compare}}
+  {{#compare @index 4 operator=">="}}
+    {{#compare @index 4 operator="=="}}
+### Previously...
+Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
+    {{/compare}}
+  - {{{ position }}}, {{{ employer }}}
+  {{/compare}}
+{{/each}}
+{{/if}}
+
+{{#if r.education}}
+## EDUCATION
+
+{{#each r.education.history}}
+### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/if}}
+{{#if r.writing}}
+## WRITING
+
+{{#each r.writing}}
+### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
+
+{{#if r.service }}
+## SERVICE
+
+{{#each r.service.history}}
+### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/if}}
+{{#if r.recognition}}
+## RECOGNITION
+
+{{#each r.recognition}}
+### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
--- a/themes/modern/src/modern-pdf.css
+++ b/themes/modern/src/modern-pdf.css
@ -11,7 +11,7 @@ body {
  font-size: 15px;
  color: #333;
  line-height: 1.42857143;
-  background-color: #F0F0F0;
+  /*background-color: #F0F0F0;*/
  margin: 0;
  padding: 0;
 }
@ -27,7 +27,7 @@ the PDF case, <main> for the HTML case, and style both via an ID. */
  background-color: #FFF;
  margin: 10px;
  padding: 10px;
-  border: 1px solid #E6E6E6;
+  border: none;
 }

 body.pdf > #main {
--- a/themes/modern/src/modern-pdf.html
+++ b/themes/modern/src/modern-pdf.html
@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ r.name }}</title>
+    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{ headFragment }}
+    <style>
+    {{{ cssInfo.data }}}
+    </style>
+  </head>
+  <body>
+    <main id="main">
+      <div id="container">
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+        </div>
+      </header>
+      </header>
+
+
+{{#if r.info.brief}}
+<hr>
+<section id="summary">
+  <h3>About</h3>
+  <span class="fa fa-lg fa-user"></span>
+  {{{ r.info.brief }}}
+</section>
+{{/if}}
+
+
+{{#if r.skills }}
+      <hr>
+      <section id="skills">
+        <header>
+        <h3>Skills</h3>
+        </header>
+        <span class="fa fa-lg fa-code"></span>
+
+        <ul class="list-unstyled">
+          {{#each r.skills.sets}}
+            <li class="card card-nested card-skills">
+              <div class="skill-level" rel="tooltip" title="{{ level }}" data-placement="left">
+                <div class="skill-progress {{toLower level }}"></div>
+              </div>
+              <div class="skill-info">
+                <strong>{{ name }}</strong>
+                <div class="space-top labels">
+                  {{#if skills}}
+                    {{#each skills}}
+                      <span class="label label-keyword">{{ this }}</span>
+                    {{/each}}
+                  {{/if}}
+                </div>
+              </div>
+            </li>
+          {{/each}}
+        </ul>
+
+
+      </section>
+{{/if}}
+
+
+
+{{#if r.employment}}
+<hr>
+<section id="employment">
+  <header>
+  <h3>Employment</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.employment.history}}
+    {{#if url}}
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{# if r.education}}
+<hr>
+<section id="education">
+  <header>
+  <h3>Education</h3>
+  </header>
+  <span class="fa fa-lg fa-mortar-board"></span>
+  {{#each r.education.history}}
+    <h4>{{ institution }}</h4>
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{#if courses}}
+      <ul>
+      {{#each courses}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{#if r.service}}
+<hr>
+<section id="volunteer">
+  <header>
+  <h3>Service</h3>
+  </header>
+  <span class="fa fa-lg fa-child"></span>
+  {{#each r.service.history}}
+    {{#if url}}
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ website }}}">{{ organization }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ organization }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM'}}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{ this }}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/if}}
+
+{{#if r.writing}}
+<hr>
+<section id="publications">
+  <header>
+  <h3>Publications</h3>
+  </header>
+  <span class="fa fa-lg fa-pencil"></span>
+  {{#each r.writing}}
+  {{#if url}}
+  <h4><a href=""><span class="res-label">{{{ title }}}</span></a>, <span>{{{ publisher.name }}}</span></h4>
+  {{else}}
+  <h4><span class="res-label">{{{ title }}}</span>, <span class="defunct">{{{ publisher.name }}}</span></h4>
+  {{/if}}
+  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
+  {{/each}}
+</section>
+{{/if}}
+
+{{# if r.recognition}}
+<hr>
+<section id="awards">
+  <header>
+  <h3>Awards</h3>
+  </header>
+  <span class="fa fa-lg fa-trophy"></span>
+  {{#each r.recognition}}
+    <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}}</h4>
+    <span class="tenure">{{{ date }}}</span>
+    {{{ summary }}}
+  {{/each}}
+</section>
+{{/if}}
+
+      </div>
+    </main>
+  </body>
+</html>
--- a/themes/modern/src/modern-txt.txt
+++ b/themes/modern/src/modern-txt.txt
@ -0,0 +1,84 @@
+{{ r.name }}
+{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+================================================================================
+
+{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+
+{{#if r.skills}}
+SKILLS -------------------------------------------------------------------------
+
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/if}}
+
+{{#if r.employment}}
+EMPLOYMENT ---------------------------------------------------------------------
+
+{{#each r.employment.history }}
+  {{#compare @index 4 operator="<"}}
+{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+  {{/compare}}
+  {{#compare @index 4 operator=">="}}
+    {{#compare @index 4 operator="=="}}
+Previously...
+Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
+    {{/compare}}
+  - {{{ position }}}, {{{ employer }}}
+  {{/compare}}
+{{/each}}
+{{/if}}
+
+{{#if r.education}}
+EDUCATION ----------------------------------------------------------------------
+
+{{#each r.education.history}}
+{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/if}}
+{{#if r.writing}}
+WRITING ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
+
+{{#if r.service }}
+SERVICE ------------------------------------------------------------------------
+
+{{#each r.service.history}}
+{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/if}}
+{{#if r.recognition}}
+RECOGNITION --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/if}}
--- a/themes/modern/src/partials/education.xml
+++ b/themes/modern/src/partials/education.xml
@ -0,0 +1,94 @@
+<wx:sub-section>
+  <wx:pBdrGroup>
+    <wx:borders>
+      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+    </wx:borders>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <w:binData w:name="wordml://03000004.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaFQTFRFv8HDv8LIv8HGv8HEv8HKv8HMv8jXv8HOv8jZv8TT3dLS2c7Kw8HDwcbM08rIwcHDwcTKz9Lbz8jGy9DXy8bEyczTycTDxcrSx8LDw8jV2dDMxcHD3dLOw8jO1cTDx8rSwc7fzdLbz8LD1czK3dLTx8HD28jDy8HDy8zOz8rI0cLD3crD18jE0cjGyc7Z29LQz8rKxcLEw8LEw8TKy8zQ1djdzcHD1drk09bi09jm0dbizdz/xdLqy9jsxdTswc7i3ePs2eHo2+Ps2e3/z+H/3ev/2/X/3fn/2e//z+H71en/69zT6djS49LO/d7Q6drT4czD59TQ/97O/drM79LG5c7E8ePZ+eHS7eHX8+Pb/+/X/ePS8ePb//Xb9eXZ7+Pd///d/+nT/+HQ///7+evk8fX7///59+fi6/P5//v16ev1/f////nz5efz+////fXs+fv/+/Po9/n/6////evi9///8/n////q//nu4+fz///i+fHw9fX7///18//q4f/q8//i//nm6+/7///o+f//7///4///9+/w8+/w8/P5////rwMOhgAAAWBJREFUSMdj6CIaMIwqHVVKL6XJKVzmqUQoTUvn5mEAAl6LDLxKM8P4+BngQEAwKxu70hxvISR1EMAonJuHrjTfR4QBO2ASdShAKC30FWPAC8Qdi8BKwyUYiACSxUClJVLShFXyWpaCHZCcIoPXBbLmZUjeKpfDoYxZ3qkANQT8+FmcK/zRQ4tJtDIPPVyTAxgUQMGdGYGIA0ZF1BiAKq1SYnbpCgQHSVqkMjBmBawywJ5QcUVXGqXK4tYVAPQoOJ0kV9eAU4MUMBit0ZVG87C616pBYh5sXmaMMjjVYCiNVWdgYKuDBwKjhibcxehKg4Bi7PVYw8sGm6kNWsQo7QpmYPGo1cYWA57oSkMYmLy6GnUwVdpmoysNBbs/OU4XNbL0mjCiABROdpCsEK9vYGgEBMYmpmiRBVHaDPS8PXGZO8GMgYGjhSilicDEzdlKlNIkYOSwtxGlNK29o6OToFsBkPOxfsuGle0AAAAASUVORK5CYIJ=</w:binData>
+          <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000004.png" o:title="fa-mortar-board"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>EDUCATION</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+
+  {{#each r.education.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url }}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ institution }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    {{#either area studyType }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ area }}, {{ studyType }}</w:t>
+      </w:r>
+    </w:p>
+    {{/either}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r>
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- a/themes/modern/src/partials/employment.xml
+++ b/themes/modern/src/partials/employment.xml
@ -0,0 +1,105 @@
+<wx:sub-section>
+  <wx:pBdrGroup>
+    <wx:borders>
+      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+    </wx:borders>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <w:binData w:name="wordml://03000003.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASZQTFRFv8HDv8HOv8HGv8LIv8TTv8zdv8LOv8bVv8LEv8HEv8HKv8rbv8LQv8HIv8jXv8HMv8LKv8TQz8bEw8LEw8LGydDfyczOz8jGw8jOz8zKw8HDwcbMz8zOycTDy8zOzcHD1cTDxcHDz8LD3crEwcHDwcLEw8LDycHDx8HD0cLDy8HD1drb3dTMy9Tb3drTycLDwcrV3drb1cjE29rb287Izdz/z9zsxdDky9r7ydbs2/X/2/H/1eXw79LG79zQ69bK7dLG487E897Q89bK/+3d///d/+nT8+vd//XZ/+fT//HZ/ePS8+XV8+/f//vb9///4f//7//////q4evw8+/s6+/w7f/////o/f//4+/w8+/w7+/w4fv/4//////59+/w8/P5////sDySyAAAAP9JREFUSMdjSCQaMIwqHZJKXYSEsQARUX9MpbYMWAFjAD2VMomJMzBISEoxSMvIMjDLieNRyhLoKs8YEKTAYArksia6KeJWyhZsJ8Vk5q7EYB6izMAeaq9CHW+pqjEwcAAxpzDQQFUVvG71UOeyArrVAuxWTzxuZQnzUueyDgcpdWDgjvCWoncU8ET6aPDa+GoyWEY5MvBFO0nh85afFn8MUVEADixVYEBBAkuNOm4V0NZR4dTV02cwMDRiEDQ2oU5yIcFUUpMLHOANAVC4wlXidysothg4wLlahUBsgQCXFQoXn1KoHJWVkuAAuLdwK3XGEQWxmErj4qOwgQS4AgDkC738cGCe/AAAAABJRU5ErkJggk==</w:binData>
+          <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000003.png" o:title="fa-building"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>EMPLOYMENT</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+  <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>EMPLOYMENT</w:t>
+    </w:r>
+  </w:p> -->
+
+  {{#each r.employment.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ position }}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ employer }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+      <!-- <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ summary }}</w:t>
+      </w:r> -->
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- a/themes/modern/src/partials/info.xml
+++ b/themes/modern/src/partials/info.xml
@ -0,0 +1,49 @@
+<wx:sub-section>
+  {{!-- This pBdrGroup section creates an embedded font-awesome icon image. --}}
+  <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="00D1523B" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
+            <v:stroke joinstyle="miter"/>
+            <v:formulas>
+              <v:f eqn="if lineDrawn pixelLineWidth 0"/>
+              <v:f eqn="sum @0 1 0"/>
+              <v:f eqn="sum 0 0 @1"/>
+              <v:f eqn="prod @2 1 2"/>
+              <v:f eqn="prod @3 21600 pixelWidth"/>
+              <v:f eqn="prod @3 21600 pixelHeight"/>
+              <v:f eqn="sum @0 0 1"/>
+              <v:f eqn="prod @6 1 2"/>
+              <v:f eqn="prod @7 21600 pixelWidth"/>
+              <v:f eqn="sum @8 21600 0"/>
+              <v:f eqn="prod @7 21600 pixelHeight"/>
+              <v:f eqn="sum @10 21600 0"/>
+            </v:formulas>
+            <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
+            <o:lock v:ext="edit" aspectratio="t"/>
+          </v:shapetype>
+          <w:binData w:name="wordml://03000001.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAThQTFRFv8HDv8LOv8jXv8HEv8zdv8HGv8HIv8LQv8TTv8HOv8bVv8TM2dDOz8zO09bdxcHDw8jTw8HD3crDzcHDz8LDzcLDx8HDwcrZy8bExcrT1crGx8LGycrSy8LD1cjEw87f1cTDw8jM0dLZ3drZ1c7MycTD2cjDycHDz977wc7ixdLqz9rqydLix9buy9r11en/2+Xwz+H71ePx9d7Q7dTI5c7E5dTQ8drO+drM/drM79LG79TI4czE49DK7eHb/ePS///d/+nT/+vV//Hd/efV/evZ//XZ/+PS/+XS//v16ev1/f/////75/H/4fH/8//////1///i8fv///nu5+/7/e/i+//78/n///nz8+/w8/H1++3i9/////vo5fv////w7///4///4f/////x//vw+fHw9/n/////RIkD6QAAAP5JREFUSMdjSCcaMIwqHVVKL6Wedjy8fF7ehJX6GPMzgICALyGlPiYMUMDoR0CpvSBMKQOTP16lAUJwlQzMGniVOggjlDJo4lXqyI+klAWvUifilQaKICnVwqvUxxShklUff2A5iyJ85U0gtlzEoCrFg/BFQbCZhGRIqBRIIZt2mLm0jIE3DqWusqCA1wmPiIyM8o6WA+mQj8GqNFYBarWikrKKKpSti1WpBQMWwB6HRWm8GjalDHpYlLqpY1XKgkWpuyBWpRwJmEotsapk4EzEVGqFQ2kSRUqtiVfqgd1bXP6YSpNtsKlkNsQWWym2mOZyG+FIWT6pkaggDVkWALeXG64AV9ZXAAAAAElFTkSuQmCC</w:binData>
+          <v:shape id="_x0000_i1027" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000001.png" o:title="fa-person"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>ABOUT</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
+    <w:pPr>
+      <w:pStyle w:val="Summary"/>
+    </w:pPr>
+    {{{wpml r.info.brief true }}}
+  </w:p>
+</wx:sub-section>
--- a/themes/modern/src/partials/recognition.xml
+++ b/themes/modern/src/partials/recognition.xml
@ -0,0 +1,86 @@
+{{#if r.recognition}}
+<wx:sub-section>
+  <wx:pBdrGroup>
+    <wx:borders>
+      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+    </wx:borders>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <w:binData w:name="wordml://03000007.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUFQTFRFv8HDv8HEv8bVv8HOv8HMv8HKv8zdv8LSv8TTv8TSv8jZv8HGv8LIv8LQv8LKv8HI08zOz8zOz87TzcHDy8HDwcHDw8LEwcLE1cTDzcLDw87f18jExcHDx8LDwcTK3dTM0djb08LD0cbDw8rVwczdzdzxzdz/xdLmw9Dk0djkzdrw0droz97xwdDky9jo3eXw2+/w2e3/0+P/z+H/0+P71ePx7dLI79LG/dzO4crD4czE99zO89bK49LM8drO5dTM7dbK99rM5dDI7+HX///d8+/Z/eHQ//Xb//Xd8e3Z7+Pd//Hf///5/f/////77///4f//+/Pw8+/w9fX76f/////q6fv////o+f//+//////x6///9fv///nm4/Po//nu+fv/4+Ps///k/fXx8+/s9/n/6/n/5f//+fHw8/P5////sapGIwAAASVJREFUSMdjyCIaMIwqHVVKB6U+zgKCMCCk74tHqZ8ZAxJgVMWj1EUYWSkDkz/RSpkDsCoNDAICVxEUpSwGIMFgNKVuogy4AKshqlJzBkYxIEBTJQ4UEmVQQ1fKhulW9pCsrFAJopRy+GNTasHAGZaVFS6BopQrIivLXYTRCFWphySDemSWnyWKUo2srCgrBs5otMCyFmWQismyQYkt46xYaQZuE/RwBcUpj6YncsDyxtnKMDBq+WLElp+dDJZA5TPFGrHx9rJoCuW0E3AmwkAveVi08SskBuNP2n4OELXcOkTkAkeQWoS/8SlNUoSGPmGl4HjQJSobhkoQaWpyihM4pvSCUvEr9VZCClXlNDxKQ1FTlkoE0dmQN50qSv0ygpBBJqpbAYc7NrM+qyXXAAAAAElFTkSuQmCC</w:binData>
+          <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000007.png" o:title="fa-trophy"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>RECOGNITION</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+
+  {{#each r.recognition}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ title }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true }}}
+    </w:p>
+
+    {{#if highlights}}
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+    {{/if}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/modern/src/partials/service.xml
+++ b/themes/modern/src/partials/service.xml
@ -0,0 +1,99 @@
+{{#if r.service }}
+<wx:sub-section>
+  <wx:pBdrGroup>
+    <wx:borders>
+      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+    </wx:borders>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <w:binData w:name="wordml://03000005.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMxQTFRFv8HDv8HEv8jXv8HOv8LSv8TTv8zdv8LKv8bT3czIwcHDwcTM18bDxcHDw8zdx8HD08bDw8HDw8rZ3drbz8TDycHDzcHDw8LDwc7ixdLqzdzxxdLoxdTs1ePx0eH72+n//dzO79LG89bK+9rM997Q5drb/9zO7dbK5c7G/+nV++XT/+3X//Hf//HZ///d/+fT//nq///q8////fXx8+/z+///4f//9///6f///f//7/////Xk8fv///Hk/fXo5ef1///7///x6fX/////TAOGGAAAALpJREFUSMft1NcOgjAUBuCDe4Hixr33Xohb+/7vZCnEKC3ShEv4b5om30Xzn5wC4g741Keu6CqegGSdh65TgCM0OGgLSAKbv3S72yPUNmjwYN6ZdCyCpKKOQUNHNBGhrLFpFwtJnaYJVXQJ4RObnjPE9mR8ZC+6FCp2b70a9tbP3TVKWhog9pNfaS3r21ok1essbyfpEcwLJq06TmtRNKniZSqUuGlk4Hm6xCtQc6SPoRxtPkcQe7n4s96JF4yPwZXEugAAAABJRU5ErkJggk==</w:binData>
+          <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000005.png" o:title="fa-child"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>SERVICE</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+
+  {{#each r.service.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ position }}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ organization }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+      <!-- <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ summary }}</w:t>
+      </w:r> -->
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/modern/src/partials/skills.xml
+++ b/themes/modern/src/partials/skills.xml
@ -0,0 +1,137 @@
+{{#if r.skills }}
+<wx:sub-section>
+  {{!-- This pBdrGroup section creates an embedded font-awesome icon image. --}}
+  <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="00D1523B" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
+            <v:stroke joinstyle="miter"/>
+            <v:formulas>
+              <v:f eqn="if lineDrawn pixelLineWidth 0"/>
+              <v:f eqn="sum @0 1 0"/>
+              <v:f eqn="sum 0 0 @1"/>
+              <v:f eqn="prod @2 1 2"/>
+              <v:f eqn="prod @3 21600 pixelWidth"/>
+              <v:f eqn="prod @3 21600 pixelHeight"/>
+              <v:f eqn="sum @0 0 1"/>
+              <v:f eqn="prod @6 1 2"/>
+              <v:f eqn="prod @7 21600 pixelWidth"/>
+              <v:f eqn="sum @8 21600 0"/>
+              <v:f eqn="prod @7 21600 pixelHeight"/>
+              <v:f eqn="sum @10 21600 0"/>
+            </v:formulas>
+            <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
+            <o:lock v:ext="edit" aspectratio="t"/>
+          </v:shapetype>
+          <w:binData w:name="wordml://03000002.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_i1028" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000002.png" o:title="fa-code"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>SKILLS</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+
+  <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>SKILLS</w:t>
+    </w:r>
+  </w:p> -->
+  <w:tbl>
+    <w:tblPr>
+      <w:tblW w:w="0" w:type="auto"/>
+      <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:pPr>
+            <w:jc w:val="right"/>
+          </w:pPr>
+          <w:r>
+            <w:rPr>
+              <w:caps/>
+              <w:color w:val="989898"/>
+            </w:rPr>
+            <w:t>{{ name }}</w:t>
+          </w:r> -->
+          <w:r>
+            <w:rPr>
+              <w:noProof/>
+            </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>
+  {{/if}}
+</wx:sub-section>
--- a/themes/modern/src/partials/writing.xml
+++ b/themes/modern/src/partials/writing.xml
@ -0,0 +1,91 @@
+{{#if r.writing}}
+<wx:sub-section>
+  <wx:pBdrGroup>
+    <wx:borders>
+      <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+    </wx:borders>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="Heading1"/>
+      </w:pPr>
+      <w:r>
+        <w:pict>
+          <w:binData w:name="wordml://03000006.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAI1QTFRFv8HDv8HEv8bVv8jXv8LKv8HGv8HIv8zdv8rZv8TT18bDxcHD2dLd1cbDwczd2cjDxcLKwc7fxcTDx8HDz8TDy9jszdzxy9jmy9jo2ef72+n/1eX56dLI79LG/efT/+3X//Hf///59+/w9fX7//vo/f//9///7///8////fv7//nm8+/w8/H1/fXx////vxL+UwAAAMZJREFUSMft1NkSgjAMBdCL4i7uG+4KiIr2/z/PwghtsYk8+WSez2TuJJlAVC786Z/+mp7OQUUaduHMoypUSpgWnDQtRfc9lK2dhv1LYRcsDT0MCluLGSollK1faSqlsxzm1vXpAKlcbfO+Sn7SQmZ25NNz1WRqb/S2DAl3Td9ASfr0ubDSoLzU6Rep0XRHY0YqKmVjAkYqukNzc/cYqdOWEG9rlTptJ48os3apU6ATi8OUkmV6nJHSpHROG6Wlos8kq4D+Ni/aqw5+HvnsQQAAAABJRU5ErkJggk==</w:binData>
+          <v:shape id="_x0000_i1030" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+            <v:imagedata src="wordml://03000006.png" o:title="fa-pencil"/>
+          </v:shape>
+        </w:pict>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>WRITING</w:t>
+      </w:r>
+    </w:p>
+  </wx:pBdrGroup>
+
+  {{#each r.writing}}
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ title }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    {{#if summary}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/modern/src/pdf.html
+++ b/themes/modern/src/pdf.html
@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<!-- [[[
-title: Modern (PDF)
-description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
-engine: Underscore
-]]] -->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{ headFragment }}
-    <style>
-    {{ cssInfo.data }}
-    </style>
-  </head>
-  <body>
-    <main id="main">
-      <div id="container">
-      <header>
-        <h1>{{ r.name }}</h1>
-        <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
-        </div>
-      </header>
-
-{% if ( r.info.brief && r.info.brief.length ) { %}
-      <hr>
-      <section id="summary">
-        <h3>About</h3>
-        <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief }}
-      </section>
-{% } %}
-
-
-{% if ( r.skills && r.skills.sets ) { %}
-      <hr>
-      <section id="skills">
-        <header>
-        <h3>Skills</h3>
-        </header>
-        <span class="fa fa-lg fa-code"></span>
-
-        <ul class="list-unstyled">
-          {% r.skills.sets.forEach( function(set) { %}
-            <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
-                <div class="skill-progress {{ set.level }}"></div>
-              </div>
-              <div class="skill-info">
-                <strong>{{ set.name }}</strong>
-                <div class="space-top labels">
-                  {% if( set.skills && set.skills.length ) { %}
-                    {% set.skills.forEach(function(kw) { %}
-                      <span class="label label-keyword">{{ kw }}</span>
-                    {% }); %}
-                  {% } %}
-                </div>
-              </div>
-            </li>
-          {% }); %}
-        </ul>
-
-
-      </section>
-{% } %}
-
-
-
-{% if ( r.employment.history && r.employment.history.length ) { %}
-      <hr>
-      <section id="employment">
-        <header>
-        <h3>Employment</h3>
-        </header>
-        <span class="fa fa-lg fa-building"></span>
-        {% r.employment.history.forEach( function( proj, idx, ar) { %}
-          {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ RAW.employment.history[idx].url }}">{{ proj.employer }}</a></h4>
-          {% } else { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
-          {% } %}
-          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary }}
-          {% if( proj.highlights ) { %}
-            <ul>
-            {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-
-
-{% if ( r.education.history && r.education.history.length ) { %}
-      <hr>
-      <section id="education">
-        <header>
-        <h3>Education</h3>
-        </header>
-        <span class="fa fa-lg fa-mortar-board"></span>
-        {% r.education.history.forEach( function( edu, idx, ar) { %}
-          <h4>{{ edu.institution }}</h4>
-          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
-          {% if( edu.courses ) { %}
-            <ul>
-            {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-{% if( r.recognition && r.recognition.length ) { %}
-      <hr>
-      <section id="awards">
-        <header>
-        <h3>Awards</h3>
-        </header>
-        <span class="fa fa-lg fa-trophy"></span>
-        {% r.recognition.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
-          <span class="tenure">{{ award.date }}</span>
-          {{ award.summary }}
-        {% }); %}
-      </section>
-{% } %}
-
-{% if( r.writing && r.writing.length ) { %}
-      <hr>
-      <section id="publications">
-        <header>
-        <h3>Publications</h3>
-        </header>
-        <span class="fa fa-lg fa-pencil"></span>
-        {% r.writing.forEach( function( pub, idx, ar) { %}
-          <h4>
-            <span class="res-label">{{ filt.link(pub.title, pub.url) }}</span>&nbsp;{{ pub.publisher }}
-          </h4>
-        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
-
-
-
-        {% }); %}
-      </section>
-{% } %}
-
-{% if ( r.service.history && r.service.history.length ) { %}
-      <hr>
-      <section id="volunteer">
-        <header>
-        <h3>Volunteer Work</h3>
-        </header>
-        <span class="fa fa-lg fa-child"></span>
-        {% r.service.history.forEach( function( vol, idx, ar) { %}
-          {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
-          {% } else { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
-          {% } %}
-          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary }}
-          {% if( vol.highlights ) { %}
-            <ul>
-            {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high }}</li>
-            {% }); %}
-            </ul>
-          {% } %}
-        {% }); %}
-
-      </section>
-{% } %}
-
-
-      </div>
-    </main>
-  </body>
-</html>
--- a/themes/modern/src/txt.txt
+++ b/themes/modern/src/txt.txt
@ -1,54 +0,0 @@
-{#
-
-  modern/txt.txt
-  A plain text resume template for FluentCV's "modern" theme.
-
-#}
-{{ r.name }}
-{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
-{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
-{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
-
-***
-
-{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
-
-
-{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS
-{% r.skills.sets.forEach( function( set ) { %}
-  - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %}
-  {{ set.level }}
-{% }); %}
-{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %}
-
-{% } %}
-
-{% if ( r.employment && r.employment.history ) { %}EMPLOYMENT
-{% r.employment.history.forEach( function( proj, idx, ar) { %}
-{{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
-{{ proj.summary }}
-{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
-  - {{ high }}
-{% }); }  }); } %}
-
-{% if ( r.education && r.education.history ) { %}EDUCATION
-{% r.education.history.forEach( function( edu, idx, ar) { %}
-{{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
-{{ edu.summary }}
-{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
-  - {{ course }}
-{% }); } }); } %}
-
-{% if ( r.service && r.service.history ) { %}VOLUNTEER
-{% r.service.history.forEach( function( srv, idx, ar) { %}
-{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }})
-{{ srv.summary }}
-{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %}
-  - {{ high }}
-{% }); } }); } %}
-
-{% if ( r.writing && r.writing.length ) { %}WRITING
-{% r.writing.forEach( function( wri, idx, ar) { %}
-{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
-{{ wri.summary }}
-{% }); } %}
--- a/themes/positive/README.md
+++ b/themes/positive/README.md
@ -0,0 +1,5 @@
+Theme: Positive
+===============
+A dynamic technical résumé theme for FluentCV.
+
+![](positive.png)
--- a/themes/positive/positive.json
+++ b/themes/positive/positive.json
@ -0,0 +1,10 @@
+{
+  "title": "positive",
+  "description": "A conventional résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@fluentdesk.com>",
+  "engine": "handlebars",
+  "inherits": {
+    "text": "compact",
+    "md": "compact"
+  }
+}
--- a/themes/positive/positive.png
+++ b/themes/positive/positive.png
--- a/themes/positive/src/partials/education.xml
+++ b/themes/positive/src/partials/education.xml
@ -0,0 +1,81 @@
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>EDUCATION</w:t>
+    </w:r>
+  </w:p>
+
+  {{#each r.education.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url }}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ institution }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    {{#either area studyType }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ area }}, {{ studyType }}</w:t>
+      </w:r>
+    </w:p>
+    {{/either}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r>
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- a/themes/positive/src/partials/employment.xml
+++ b/themes/positive/src/partials/employment.xml
@ -0,0 +1,84 @@
+<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}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ position }}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ employer }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+      <!-- <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ summary }}</w:t>
+      </w:r> -->
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
--- a/themes/positive/src/partials/recognition.xml
+++ b/themes/positive/src/partials/recognition.xml
@ -0,0 +1,73 @@
+{{#if r.recognition}}
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>RECOGNITION</w:t>
+    </w:r>
+  </w:p>
+
+  {{#each r.recognition}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ title }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true }}}
+    </w:p>
+
+    {{#if highlights}}
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+    </w:p>
+    {{/each}}
+    {{/if}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/positive/src/partials/service.xml
+++ b/themes/positive/src/partials/service.xml
@ -0,0 +1,86 @@
+{{#if r.service }}
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>SERVICE</w:t>
+    </w:r>
+  </w:p>
+
+  {{#each r.service.history}}
+
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ position }}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ organization }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+      <!-- <w:r wsp:rsidRPr="000A3AF0">
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ summary }}</w:t>
+      </w:r> -->
+    </w:p>
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/positive/src/partials/skills.xml
+++ b/themes/positive/src/partials/skills.xml
@ -0,0 +1,63 @@
+{{#if r.skills }}
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>SKILLS</w:t>
+    </w:r>
+  </w:p>
+  <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="3000"/>
+      <w:gridCol w:w="8000"/>
+    </w:tblGrid>
+
+    {{#each r.skills.sets}}
+
+    <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:w="3000" 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:pPr>
+            <w:jc w:val="right"/>
+          </w:pPr>
+          <w:r>
+            <w:rPr>
+              <w:caps/>
+              <w:color w:val="989898"/>
+            </w:rPr>
+            <w:t>{{ name }}</w:t>
+          </w:r>
+        </w:p>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:w="8000" 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: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>
+  {{/if}}
+</wx:sub-section>
--- a/themes/positive/src/partials/writing.xml
+++ b/themes/positive/src/partials/writing.xml
@ -0,0 +1,78 @@
+{{#if r.writing}}
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>WRITING</w:t>
+    </w:r>
+  </w:p>
+
+  {{#each r.writing}}
+  <wx:sub-section>
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
+      <w:pPr>
+        <w:pStyle w:val="Heading2"/>
+        <w:tabs>
+          <w:tab w:val="right" w:pos="9360"/>
+        </w:tabs>
+      </w:pPr>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
+        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
+          {{#if url}}
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          {{/if}}
+          <w:t>{{ title }}</w:t>
+        </w:r>
+      {{#if url}}</w:hlink>{{/if}}
+      <w:r wsp:rsidR="00EA0B64">
+        <w:tab/>
+      </w:r>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
+      </w:r>
+    </w:p>
+    {{#if summary}}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml summary true}}}
+    </w:p>
+    {{/if}}
+
+    {{#each highlights }}
+    <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
+      <w:pPr>
+        <w:pStyle w:val="ListParagraph"/>
+        <w:listPr>
+          <w:ilvl w:val="0"/>
+          <w:ilfo w:val="1"/>
+          <wx:t wx:val="•"/>
+          <wx:font wx:val="Calibri"/>
+        </w:listPr>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+      </w:pPr>
+      {{{wpml this true}}}
+      <!-- <w:r>
+        <w:rPr>
+          <w:sz-cs w:val="20"/>
+        </w:rPr>
+        <w:t>{{ this }}</w:t>
+      </w:r> -->
+    </w:p>
+    {{/each}}
+
+  </wx:sub-section>
+
+  {{/each}}
+
+</wx:sub-section>
+{{/if}}
--- a/themes/positive/src/positive-doc.xml
+++ b/themes/positive/src/positive-doc.xml
@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?mso-application progid="Word.Document"?>
+<w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
+  <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
+  <o:DocumentProperties>
+    <o:Title>Resume for {{ r.name }}</o:Title>
+    <o:Author>{{ r.name }}</o:Author>
+    <o:Keywords>resume;CV</o:Keywords>
+    <o:LastAuthor>{{ r.name }}</o:LastAuthor>
+    <o:Revision>1</o:Revision>
+    <o:TotalTime>60</o:TotalTime>
+    <o:Created>2015-12-16T17:38:00Z</o:Created>
+    <o:LastSaved>2015-12-16T18:32:00Z</o:LastSaved>
+    <o:Pages>1</o:Pages>
+    <o:Words>241</o:Words>
+    <o:Characters>1379</o:Characters>
+    <o:Lines>11</o:Lines>
+    <o:Paragraphs>3</o:Paragraphs>
+    <o:CharactersWithSpaces>1617</o:CharactersWithSpaces>
+    <o:Version>15</o:Version>
+  </o:DocumentProperties>
+  <w:fonts>
+    <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
+    <w:font w:name="Times New Roman">
+      <w:panose-1 w:val="02020603050405020304"/>
+      <w:charset w:val="00"/>
+      <w:family w:val="Roman"/>
+      <w:pitch w:val="variable"/>
+      <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
+    </w:font>
+    <w:font w:name="Calibri">
+      <w:panose-1 w:val="020F0502020204030204"/>
+      <w:charset w:val="00"/>
+      <w:family w:val="Swiss"/>
+      <w:pitch w:val="variable"/>
+      <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
+    </w:font>
+  </w:fonts>
+  <w:lists>
+    <w:listDef w:listDefId="1">
+      <w:lsid w:val="602C53DD"/>
+      <w:plt w:val="HybridMultilevel"/>
+      <w:tmpl w:val="61849B8C"/>
+      <w:lvl w:ilvl="0" w:tplc="DD7ED086">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="•"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="720" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="1" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="1440" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="2" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="2160" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="3" w:tplc="04090001" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="2880" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="4" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="3600" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="5" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="4320" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="6" w:tplc="04090001" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="5040" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Symbol" w:h-ansi="Symbol" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="7" w:tplc="04090003" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val="o"/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="5760" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Courier New" w:h-ansi="Courier New" w:cs="Courier New" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+      <w:lvl w:ilvl="8" w:tplc="04090005" w:tentative="on">
+        <w:start w:val="1"/>
+        <w:nfc w:val="23"/>
+        <w:lvlText w:val=""/>
+        <w:lvlJc w:val="left"/>
+        <w:pPr>
+          <w:ind w:left="6480" w:hanging="360"/>
+        </w:pPr>
+        <w:rPr>
+          <w:rFonts w:ascii="Marlett" w:h-ansi="Marlett" w:hint="default"/>
+        </w:rPr>
+      </w:lvl>
+    </w:listDef>
+    <w:list w:ilfo="1">
+      <w:ilst w:val="1"/>
+    </w:list>
+  </w:lists>
+  <w:styles>
+    <w:style w:type="paragraph" w:default="on" w:styleId="Normal">
+      <w:name w:val="Normal"/>
+      <w:rsid w:val="002743C8"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <wx:font wx:val="Calibri"/>
+        <w:sz-cs w:val="24"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:pPr>
+        <w:jc w:val="both"/>
+      </w:pPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading1">
+      <w:name w:val="heading 1"/>
+      <wx:uiName wx:val="Heading 1"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading1Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:outlineLvl w:val="0"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="32"/>
+        <w:sz-cs w:val="48"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading2">
+      <w:name w:val="heading 2"/>
+      <wx:uiName wx:val="Heading 2"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading2Char"/>
+      <w:rsid w:val="00505903"/>
+      <w:pPr>
+        <w:spacing w:before="120"/>
+        <w:outlineLvl w:val="1"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:caps/>
+        <w:sz-cs w:val="36"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Heading3">
+      <w:name w:val="heading 3"/>
+      <wx:uiName wx:val="Heading 3"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="Heading3Char"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="240" w:after="100" w:after-autospacing="on"/>
+        <w:outlineLvl w:val="2"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont">
+      <w:name w:val="Default Paragraph Font"/>
+    </w:style>
+    <w:style w:type="table" w:default="on" w:styleId="TableNormal">
+      <w:name w:val="Normal Table"/>
+      <wx:uiName wx:val="Table Normal"/>
+      <w:rPr>
+        <wx:font wx:val="Times New Roman"/>
+        <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
+      </w:rPr>
+      <w:tblPr>
+        <w:tblInd w:w="0" w:type="dxa"/>
+        <w:tblCellMar>
+          <w:top w:w="0" w:type="dxa"/>
+          <w:left w:w="108" w:type="dxa"/>
+          <w:bottom w:w="0" w:type="dxa"/>
+          <w:right w:w="108" w:type="dxa"/>
+        </w:tblCellMar>
+      </w:tblPr>
+    </w:style>
+    <w:style w:type="list" w:default="on" w:styleId="NoList">
+      <w:name w:val="No List"/>
+    </w:style>
+    <w:style w:type="character" w:styleId="Hyperlink">
+      <w:name w:val="Hyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="0064BD"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="FollowedHyperlink">
+      <w:name w:val="FollowedHyperlink"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:strike w:val="off"/>
+        <w:dstrike w:val="off"/>
+        <w:color w:val="7B0796"/>
+        <w:u w:val="none"/>
+        <w:effect w:val="none"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading2Char">
+      <w:name w:val="Heading 2 Char"/>
+      <w:link w:val="Heading2"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:caps/>
+        <w:sz-cs w:val="36"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading3Char">
+      <w:name w:val="Heading 3 Char"/>
+      <w:link w:val="Heading3"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
+        <w:color w:val="1F4D78"/>
+        <w:sz w:val="24"/>
+        <w:sz-cs w:val="24"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="NormalWeb">
+      <w:name w:val="Normal (Web)"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="001B7422"/>
+      <w:pPr>
+        <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+        <w:jc w:val="both"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Heading1Char">
+      <w:name w:val="Heading 1 Char"/>
+      <w:link w:val="Heading1"/>
+      <w:rsid w:val="00505903"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:b/>
+        <w:b-cs/>
+        <w:color w:val="AEAAAA"/>
+        <w:kern w:val="36"/>
+        <w:sz w:val="32"/>
+        <w:sz-cs w:val="48"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Strong">
+      <w:name w:val="Strong"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:b/>
+        <w:b-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="Emphasis">
+      <w:name w:val="Emphasis"/>
+      <w:rsid w:val="001B7422"/>
+      <w:rPr>
+        <w:i/>
+        <w:i-cs/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="tenure">
+      <w:name w:val="tenure"/>
+      <w:basedOn w:val="DefaultParagraphFont"/>
+      <w:rsid w:val="001B7422"/>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Title">
+      <w:name w:val="Title"/>
+      <w:basedOn w:val="Normal"/>
+      <w:next w:val="Normal"/>
+      <w:link w:val="TitleChar"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:pPr>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
+        <wx:font wx:val="Calibri Light"/>
+        <w:caps/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="TitleChar">
+      <w:name w:val="Title Char"/>
+      <w:link w:val="Title"/>
+      <w:rsid w:val="002D3B7B"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
+        <w:caps/>
+        <w:spacing w:val="-10"/>
+        <w:kern w:val="28"/>
+        <w:sz w:val="48"/>
+        <w:sz-cs w:val="56"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="ListParagraph">
+      <w:name w:val="List Paragraph"/>
+      <w:basedOn w:val="Normal"/>
+      <w:rsid w:val="00C146CA"/>
+      <w:pPr>
+        <w:ind w:left="720"/>
+        <w:contextualSpacing/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="paragraph" w:styleId="Summary">
+      <w:name w:val="Summary"/>
+      <w:basedOn w:val="Normal"/>
+      <w:link w:val="SummaryChar"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:pPr>
+        <w:spacing w:before="120"/>
+      </w:pPr>
+      <w:rPr>
+        <wx:font wx:val="Calibri"/>
+        <w:color w:val="767171"/>
+      </w:rPr>
+    </w:style>
+    <w:style w:type="character" w:styleId="SummaryChar">
+      <w:name w:val="Summary Char"/>
+      <w:link w:val="Summary"/>
+      <w:rsid w:val="00A210E1"/>
+      <w:rPr>
+        <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+        <w:sz-cs w:val="24"/>
+      </w:rPr>
+    </w:style>
+  </w:styles>
+  <w:docPr>
+    <w:view w:val="print"/>
+    <w:zoom w:percent="98"/>
+    <w:doNotEmbedSystemFonts/>
+    <w:defaultTabStop w:val="720"/>
+    <w:characterSpacingControl w:val="DontCompress"/>
+    <w:webPageEncoding w:val="unicode"/>
+    <w:optimizeForBrowser/>
+    <w:allowPNG/>
+    <w:validateAgainstSchema/>
+    <w:saveInvalidXML w:val="off"/>
+    <w:ignoreMixedContent w:val="off"/>
+    <w:alwaysShowPlaceholderText w:val="off"/>
+    <w:compat>
+      <w:breakWrappedTables/>
+    </w:compat>
+    <wsp:rsids>
+      <wsp:rsidRoot wsp:val="00C146CA"/>
+      <wsp:rsid wsp:val="000A3AF0"/>
+      <wsp:rsid wsp:val="001B7422"/>
+      <wsp:rsid wsp:val="002743C8"/>
+      <wsp:rsid wsp:val="002865F0"/>
+      <wsp:rsid wsp:val="002D3B7B"/>
+      <wsp:rsid wsp:val="00397D4D"/>
+      <wsp:rsid wsp:val="00437135"/>
+      <wsp:rsid wsp:val="00505903"/>
+      <wsp:rsid wsp:val="00606071"/>
+      <wsp:rsid wsp:val="006C2CFB"/>
+      <wsp:rsid wsp:val="00771B3E"/>
+      <wsp:rsid wsp:val="007D096C"/>
+      <wsp:rsid wsp:val="009452CA"/>
+      <wsp:rsid wsp:val="00A210E1"/>
+      <wsp:rsid wsp:val="00B43FDC"/>
+      <wsp:rsid wsp:val="00C146CA"/>
+      <wsp:rsid wsp:val="00C77315"/>
+      <wsp:rsid wsp:val="00CD3781"/>
+      <wsp:rsid wsp:val="00E578D4"/>
+      <wsp:rsid wsp:val="00EA0B64"/>
+      <wsp:rsid wsp:val="00FE101B"/>
+    </wsp:rsids>
+  </w:docPr>
+  <w:body>
+    <wx:sect>
+      <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="007D096C" wsp:rsidP="00C146CA">
+        <w:pPr>
+          <w:pStyle w:val="Title"/>
+          <w:tabs>
+            <w:tab w:val="right" w:pos="9360"/>
+          </w:tabs>
+        </w:pPr>
+        <w:r>
+          <w:t>{{initialWords r.name }} </w:t>
+        </w:r>
+        <w:r>
+          <w:rPr>
+            <w:color w:val="C00000"/>
+          </w:rPr>
+          <w:t>{{lastWord r.name }}</w:t>
+        </w:r>
+        <w:r>
+          <w:tab/>
+        </w:r>
+        <w:r>
+          <w:rPr>
+            <w:color w:val="DADADA"/>
+          </w:rPr>
+          <w:t>{{ r.info.label }}</w:t>
+        </w:r>
+      </w:p>
+      <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="00505903" wsp:rsidP="00C146CA">
+        <w:pPr>
+          <w:rPr>
+            <w:sz-cs w:val="20"/>
+          </w:rPr>
+          <w:jc w:val="right"/>
+        </w:pPr>
+        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+          <w:r wsp:rsidRPr="003876BF">
+            <w:rPr>
+              <w:rStyle w:val="Hyperlink"/>
+              <w:sz w:val="16"/>
+            </w:rPr>
+            <w:t>{{ r.contact.email }}</w:t>
+          </w:r>
+        </w:hlink>
+        <w:r>
+          <w:rPr>
+            <w:sz w:val="16"/>
+          </w:rPr>
+          <w:t> - </w:t>
+        </w:r>
+        <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0">
+          <w:rPr>
+            <w:sz w:val="16"/>
+          </w:rPr>
+          <w:t>{{ r.contact.phone }}</w:t>
+        </w:r>
+        <w:r>
+          <w:rPr>
+            <w:sz w:val="16"/>
+          </w:rPr>
+          <w:t> - </w:t>
+        </w:r>
+        <w:hlink w:dest="{{ r.contact.website }}">
+          <w:r wsp:rsidRPr="003876BF">
+            <w:rPr>
+              <w:rStyle w:val="Hyperlink"/>
+              <w:sz w:val="16"/>
+            </w:rPr>
+            <w:t>{{ r.contact.website }}</w:t>
+          </w:r>
+        </w:hlink>
+      </w:p>
+      <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
+        <w:pPr>
+          <w:pStyle w:val="Summary"/>
+        </w:pPr>
+        {{{wpml r.info.brief true }}}
+        <!-- <w:r wsp:rsidRPr="000A3AF0">
+          <w:t>{{ r.info.brief }}</w:t>
+        </w:r> -->
+      </w:p>
+      {{> skills }}
+      {{> employment }}
+      {{> education }}
+      {{> service }}
+      {{> writing }}
+      {{> recognition }}
+      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
+        <w:pgSz w:w="12240" w:h="15840"/>
+        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
+        <w:cols w:space="720"/>
+        <w:docGrid w:line-pitch="360"/>
+      </w:sectPr>
+    </wx:sect>
+  </w:body>
+</w:wordDocument>
--- a/themes/positive/src/positive-html.css
+++ b/themes/positive/src/positive-html.css
@ -0,0 +1,125 @@
+html, body, main, section, header, ul, p, h1, h2, h3 {
+  font-family: Calibri, 'Open Sans', sans-serif;
+  font-size: 14px;
+  margin: 0; padding: 0;
+  display: block;
+}
+
+a {
+  color: #0064BD;
+  text-decoration: none;
+}
+
+a:visited {
+  color: #7B0796;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+h1 {
+  text-transform: uppercase;
+  font-size:
+}
+
+h2 {
+  text-transform: uppercase;
+  color: #898989;
+  font-size: 2em;
+  position: relative;
+  font-weight: 400;
+}
+
+h3 {
+  font-size: 1em;
+}
+
+table {
+  width: 100%;
+  text-transform: uppercase;
+  font-size: 1.3em;
+}
+
+td:first-child {
+  text-align: right;
+  color: #A9A9A9;
+  letter-spacing: 5px;
+  font-weight: bold;
+}
+
+td:last-child {
+  text-align: justify; /* HTML justification sucks, but in this case... */
+}
+
+main {
+  padding: 15px;
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+section {
+  margin-top: 1em;
+}
+
+li {
+  margin-left: 2em;
+}
+
+h3 {
+  margin-top: 1em;
+}
+
+p, li {
+  text-align: justify;
+}
+
+.tenure {
+  float: right;
+}
+
+thead {
+  display: none;
+}
+
+main > header {
+  width: 100%;
+  float: left;
+  margin-bottom: 1em;
+}
+
+
+main > header > h1 {
+  float: left;
+}
+
+main > header > h1, .label {
+  font-size: 2.5em;
+  text-transform: uppercase;
+  font-weight: 300;
+  font-family: 'Open Sans', 'Segoe UI', sans-serif;
+}
+
+#contact {
+ clear: both;
+ float: right;
+}
+
+h2 > span.fa {
+  text-align: center;
+  margin-right: 3px;
+  position: absolute;
+  width: 40px;
+  transform: translateX(-110%);
+  color: #DADADA;
+}
+
+.label {
+  float: right;
+  color: #DADADA;
+}
+
+#summary {
+  color: #717171;
+  font-size: 1.25em;  
+}
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ r.name }}</title>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link href="positive-html.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{initialWords r.name }} <span style="color: #C00000;">{{lastWord r.name }}</span></h1>
+        <span class="label">{{{ r.info.label }}}</span>
+        <p id="contact">
+          {{#if r.contact.email}}<span class="email"><a href="mailto:{{ RAW.contact.email }}">{{{ r.contact.email }}}</a></span>{{/if}}
+          {{#if r.contact.phone}}<span class="phone">{{{ r.contact.phone }}}</span>{{/if}}
+          {{#if r.contact.website}}<span class="website"><a href="{{ RAW.contact.website }}">{{{ r.contact.website }}}</a></span>{{/if}}
+        </p>
+      </header>
+
+
+{{#if r.info.brief}}
+      <section id="summary">
+        {{{ r.info.brief }}}
+      </section>
+{{/if}}
+
+
+{{#if r.skills}}
+      <section id="skills">
+        <header>
+        <h2><span class="fa fa-code"></span> Skills</h2>
+        </header>
+        <table>
+          <thead>
+            <tr>
+              <th>Skill</th>
+              <th>Keywords</th>
+            </tr>
+          </thead>
+          <tbody>
+            {{#each r.skills.sets}}
+            <tr>
+              <td style="width: 33%;">{{{ name }}}</td>
+              <td class="keywords">{{#each skills}}{{{ this }}} {{/each}}</td>
+            </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      </section>
+{{/if}}
+
+
+
+{{#if r.employment}}
+      <section id="employment">
+        <header>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        </header>
+
+        {{#each r.employment.history }}
+          {{#compare @index 4 operator="<"}}
+            <h3><em>{{ position }}</em>,
+              {{#if url }}
+              <a href="{{ url }}">{{ employer }}</a>
+              {{else}}
+              {{ employer }}
+              {{/if}}
+              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+            <p style="clear: both;">{{{ summary }}}</p>
+            {{#if highlights}}
+              <ul>
+              {{#each highlights}}
+                <li>{{{ this }}}</li>
+              {{/each}}
+              </ul>
+            {{/if}}
+          {{/compare}}
+          {{#compare @index 4 operator=">="}}
+
+            {{#compare @index 4 operator="=="}}
+            <h3>Previously...</h3>
+            <p style="clear: both;">Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.</p>
+            <ul>
+            {{/compare}}
+
+            <li>{{{ position }}}, {{{ employer }}}</li>
+
+            {{#if @last}}
+            </ul>
+            {{/if}}
+          {{/compare}}
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{# if r.education}}
+      <section id="education">
+        <header>
+        <h2><span class="fa fa-mortar-board"></span> Education</h2>
+        </header>
+        {{#each r.education.history}}
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{#if r.service}}
+      <section id="volunteer">
+        <header>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
+        </header>
+        {{#each r.service.history}}
+          <h3><em>{{ position }}</em>,
+            {{#if url}}
+            <a href="{{ url }}">{{ organization }}</a>
+            {{else}}
+            {{ organization }}
+            {{/if}}
+            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <p style="clear: both;">{{{ summary }}}</p>
+          {{#if highlights}}
+            <ul>
+            {{#each highlights}}
+              <li>{{ this }}</li>
+            {{/each}}
+            </ul>
+          {{/if}}
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{#if r.writing}}
+      <section id="publications">
+        <header>
+        <h2><span class="fa fa-book"></span> Writing</h2>
+        </header>
+        {{#each r.writing }}
+          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+            {{{ publisher.name }}} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+        {{# if summary}}{{{ summary }}}{{/if}}
+        {{/each}}
+      </section>
+{{/if}}
+
+{{# if r.recognition}}
+      <section id="awards">
+        <header>
+        <h2><span class="fa fa-trophy"></span> Awards</h2>
+        </header>
+        {{#each r.recognition}}
+          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+          {{{ summary }}}
+        {{/each}}
+      </section>
+{{/if}}
+
+    </main>
+  </body>
+</html>
--- a/themes/positive/src/positive-pdf.css
+++ b/themes/positive/src/positive-pdf.css
@ -0,0 +1,125 @@
+html, body, main, section, header, ul, p, h1, h2, h3 {
+  font-family: Calibri, 'Open Sans', sans-serif;
+  font-size: 14px;
+  margin: 0; padding: 0;
+  display: block;
+}
+
+a {
+  color: #0064BD;
+  text-decoration: none;
+}
+
+a:visited {
+  color: #7B0796;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+h1 {
+  text-transform: uppercase;
+  font-size:
+}
+
+h2 {
+  text-transform: uppercase;
+  color: #898989;
+  font-size: 2em;
+  position: relative;
+  font-weight: 400;
+}
+
+h3 {
+  font-size: 1em;
+}
+
+table {
+  width: 100%;
+  text-transform: uppercase;
+  font-size: 1.3em;
+}
+
+td:first-child {
+  text-align: right;
+  color: #A9A9A9;
+  /*letter-spacing: 5px;*/
+  font-weight: bold;
+}
+
+td:last-child {
+  text-align: justify; /* HTML justification sucks, but in this case... */
+}
+
+main {
+  padding: 15px;
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+section {
+  margin-top: 1em;
+}
+
+li {
+  margin-left: 2em;
+}
+
+h3 {
+  margin-top: 1em;
+}
+
+p, li {
+  text-align: justify;
+}
+
+.tenure {
+  float: right;
+}
+
+thead {
+  display: none;
+}
+
+main > header {
+  width: 100%;
+  float: left;
+  margin-bottom: 1em;
+}
+
+
+main > header > h1 {
+  float: left;
+}
+
+main > header > h1, .label {
+  font-size: 2.5em;
+  text-transform: uppercase;
+  font-weight: 300;
+  font-family: 'Open Sans', 'Segoe UI', sans-serif;
+}
+
+#contact {
+ clear: both;
+ float: right;
+}
+
+h2 > span.fa {
+  text-align: center;
+  margin-right: 3px;
+  position: absolute;
+  width: 40px;
+  transform: translateX(-110%);
+  color: #DADADA;
+}
+
+.label {
+  float: right;
+  color: #DADADA;
+}
+
+#summary {
+  color: #717171;
+  font-size: 1.25em;
+}
--- a/themes/positive/src/positive-pdf.html
+++ b/themes/positive/src/positive-pdf.html
@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ r.name }}</title>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <style>
+    {{{ cssInfo.data }}}
+    </style>
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{initialWords r.name }} <span style="color: #C00000;">{{lastWord r.name }}</span></h1>
+        <span class="label">{{{ r.info.label }}}</span>
+        <p id="contact">
+          {{#if r.contact.email}}<span class="email"><a href="mailto:{{ RAW.contact.email }}">{{{ r.contact.email }}}</a></span>{{/if}}
+          {{#if r.contact.phone}}<span class="phone">{{{ r.contact.phone }}}</span>{{/if}}
+          {{#if r.contact.website}}<span class="website"><a href="{{ RAW.contact.website }}">{{{ r.contact.website }}}</a></span>{{/if}}
+        </p>
+      </header>
+
+
+{{#if r.info.brief}}
+      <section id="summary">
+        {{{ r.info.brief }}}
+      </section>
+{{/if}}
+
+
+{{#if r.skills}}
+      <section id="skills">
+        <header>
+        <h2><span class="fa fa-code"></span> Skills</h2>
+        </header>
+        <table>
+          <thead>
+            <tr>
+              <th>Skill</th>
+              <th>Keywords</th>
+            </tr>
+          </thead>
+          <tbody>
+            {{#each r.skills.sets}}
+            <tr>
+              <td style="width: 33%;">{{{ name }}}</td>
+              <td class="keywords">{{#each skills}}{{{ this }}} {{/each}}</td>
+            </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      </section>
+{{/if}}
+
+
+
+{{#if r.employment}}
+      <section id="employment">
+        <header>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        </header>
+
+        {{#each r.employment.history }}
+          {{#compare @index 4 operator="<"}}
+            <h3><em>{{ position }}</em>,
+              {{#if url }}
+              <a href="{{ url }}">{{ employer }}</a>
+              {{else}}
+              {{ employer }}
+              {{/if}}
+              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+            <p style="clear: both;">{{{ summary }}}</p>
+            {{#if highlights}}
+              <ul>
+              {{#each highlights}}
+                <li>{{{ this }}}</li>
+              {{/each}}
+              </ul>
+            {{/if}}
+          {{/compare}}
+          {{#compare @index 4 operator=">="}}
+
+            {{#compare @index 4 operator="=="}}
+            <h3>Previously...</h3>
+            <p style="clear: both;">Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.</p>
+            <ul>
+            {{/compare}}
+
+            <li>{{{ position }}}, {{{ employer }}}</li>
+
+            {{#if @last}}
+            </ul>
+            {{/if}}
+          {{/compare}}
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{# if r.education}}
+      <section id="education">
+        <header>
+        <h2><span class="fa fa-mortar-board"></span> Education</h2>
+        </header>
+        {{#each r.education.history}}
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{#if r.service}}
+      <section id="volunteer">
+        <header>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
+        </header>
+        {{#each r.service.history}}
+          <h3><em>{{ position }}</em>,
+            {{#if url}}
+            <a href="{{ url }}">{{ organization }}</a>
+            {{else}}
+            {{ organization }}
+            {{/if}}
+            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <p style="clear: both;">{{{ summary }}}</p>
+          {{#if highlights}}
+            <ul>
+            {{#each highlights}}
+              <li>{{ this }}</li>
+            {{/each}}
+            </ul>
+          {{/if}}
+        {{/each}}
+
+      </section>
+{{/if}}
+
+{{#if r.writing}}
+      <section id="publications">
+        <header>
+        <h2><span class="fa fa-book"></span> Writing</h2>
+        </header>
+        {{#each r.writing }}
+          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+            {{{ publisher.name }}} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+        {{# if summary}}{{{ summary }}}{{/if}}
+        {{/each}}
+      </section>
+{{/if}}
+
+{{# if r.recognition}}
+      <section id="awards">
+        <header>
+        <h2><span class="fa fa-trophy"></span> Awards</h2>
+        </header>
+        {{#each r.recognition}}
+          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+          {{{ summary }}}
+        {{/each}}
+      </section>
+{{/if}}
+
+    </main>
+  </body>
+</html>