Remove unused files.

Continue refactoring.
Reorganize.
2025-07-06 10:11:05 +01:00 · 2016-01-06 10:30:08 -05:00 · 2016-01-06 10:23:40 -05:00 · 2016-01-06 06:47:56 -05:00 · 2016-01-06 06:45:28 -05:00 · 2016-01-06 06:37:39 -05:00
74 changed files with 1592 additions and 1113 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +1,7 @@
 The MIT License
 ===============

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

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 fresh-themes
 ============

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

 - [positive][t-positive]: A visually dense/compact theme.
 - [modern][t-modern]: A middle of the road theme with a modern look 'n feel.
@ -12,15 +12,63 @@ Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
 - [hello-world][t-hello]: A simple-as-possible example theme.
 - New themes weekly.

+## Use
+
+1. Install [HackMyResume][hmr] or a similar tool.
+
+2. Create a [FRESH][f] or [JRS][jrs] résumé.
+
+3. Run `hackmyresume build <your-resume.json> to <final-resume>.all -t
+<theme-name>` to generate all formats for a particular theme. For example:
+
+    ```bash
+    hackmyresume BUILD resume.json TO out/resume.all -t positive
+    ```
+
 ## 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...
+The **fresh-themes** repo is automatically installed when you install
+HackMyResume. For development or testing purposes, you can install the
+standalone version via NPM:

-`[sudo] npm install fluent-themes --save`
+`[sudo] npm install fresh-themes [--save]`

-...or fork and clone it as usual.
+...or fork and clone it from GitHub as usual.
+
+## How It Works
+
+FRESH themes are powered by the same templates you're familiar with from Jekyll,
+Handlebars, MS Word, or your server-side web language of choice. You create a
+FRESH theme the same way you would any other template: by intermixing markup
+(HTML, XML, plain text, whatever) with special tags or placeholders:
+
+```html
+<h3>{{ job.title }}</h3>
+<p>{{ job.summary }}</p>
+```
+
+Run it through a tool, and you get finished markup suitable for display or
+saving as a document:
+
+```html
+<h3>Ninja</h3>
+<p>Performed covert ops in feudal Japan.</p>
+```
+
+The only difference between a FRESH theme and your Jekyll blog or MS Word
+template is that FRESH themes are:
+
+- **Multiformat**. Each FRESH theme can declare multiple formats: HTML, Word,
+PDF, Markdown, or other future formats.
+- **Markdown-friendly**. All FRESH themes support inline Markdown/HTML
+formatting.
+- **Inheritable**. FRESH themes can inherit or "borrow" formats from other
+themes.
+- **Agnostic**. FRESH themes don't mandate that you use a particular templating
+engine or style: you can use Handlebars, Underscore, or other engines in the
+future.
+
+If you can do `{{ r.name }}` or `{% highlight html %}` in a template file you can work with FRESH themes.

 ## Structure

@ -34,8 +82,7 @@ multiple formats. Each theme lives in a separate folder and consists of:

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

 ## Contribute

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

 [1]: http://fluentcv.com
 [2]: https://github.com/fluentdesk/fluentcv
-[3]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[3]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
-[t-awesome]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/awesome
-[t-minimist]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/minimist
-[t-modern]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/modern
-[t-hello]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/hello-world
-[t-compact]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/compact
-[t-positive]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/positive
+[t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
+[t-minimist]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/minimist
+[t-modern]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/modern
+[t-hello]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/hello-world
+[t-compact]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/compact
+[t-positive]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/positive
+[hmr]: https://github.com/hacksalot/hackmyresume
--- a/package.json
+++ b/package.json
@ -1,12 +1,12 @@
 {
  "name": "fresh-themes",
-  "version": "0.9.1-beta",
+  "version": "0.12.0-beta",
  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
  "repository": {
    "type": "git",
    "url": "https://github.com/fluentdesk/fresh-themes.git"
  },
-  "main": "themes/README.md",
+  "main": "README.md",
  "keywords": [
    "résumé",
    "resume",
--- a/partials/doc/header-icon.xml
+++ b/partials/doc/header-icon.xml
@ -0,0 +1,17 @@
+{{! A resume heading with prefixed font-awesome icon. }}
+<wx:pBdrGroup>
+  <wx:borders>
+    <wx:top wx:val="solid" wx:bdrwidth="15" wx:space="1" wx:color="EEEEEE"/>
+  </wx:borders>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00693C5A" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r>
+      {{> (lookup . '_icon') }}
+    </w:r>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle _title}}}</w:t>
+    </w:r>
+  </w:p>
+</wx:pBdrGroup>
--- a/partials/doc/pict/edu.xml
+++ b/partials/doc/pict/edu.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000004.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaFQTFRFv8HDv8LIv8HGv8HEv8HKv8HMv8jXv8HOv8jZv8TT3dLS2c7Kw8HDwcbM08rIwcHDwcTKz9Lbz8jGy9DXy8bEyczTycTDxcrSx8LDw8jV2dDMxcHD3dLOw8jO1cTDx8rSwc7fzdLbz8LD1czK3dLTx8HD28jDy8HDy8zOz8rI0cLD3crD18jE0cjGyc7Z29LQz8rKxcLEw8LEw8TKy8zQ1djdzcHD1drk09bi09jm0dbizdz/xdLqy9jsxdTswc7i3ePs2eHo2+Ps2e3/z+H/3ev/2/X/3fn/2e//z+H71en/69zT6djS49LO/d7Q6drT4czD59TQ/97O/drM79LG5c7E8ePZ+eHS7eHX8+Pb/+/X/ePS8ePb//Xb9eXZ7+Pd///d/+nT/+HQ///7+evk8fX7///59+fi6/P5//v16ev1/f////nz5efz+////fXs+fv/+/Po9/n/6////evi9///8/n////q//nu4+fz///i+fHw9fX7///18//q4f/q8//i//nm6+/7///o+f//7///4///9+/w8+/w8/P5////rwMOhgAAAWBJREFUSMdj6CIaMIwqHVVKL6XJKVzmqUQoTUvn5mEAAl6LDLxKM8P4+BngQEAwKxu70hxvISR1EMAonJuHrjTfR4QBO2ASdShAKC30FWPAC8Qdi8BKwyUYiACSxUClJVLShFXyWpaCHZCcIoPXBbLmZUjeKpfDoYxZ3qkANQT8+FmcK/zRQ4tJtDIPPVyTAxgUQMGdGYGIA0ZF1BiAKq1SYnbpCgQHSVqkMjBmBawywJ5QcUVXGqXK4tYVAPQoOJ0kV9eAU4MUMBit0ZVG87C616pBYh5sXmaMMjjVYCiNVWdgYKuDBwKjhibcxehKg4Bi7PVYw8sGm6kNWsQo7QpmYPGo1cYWA57oSkMYmLy6GnUwVdpmoysNBbs/OU4XNbL0mjCiABROdpCsEK9vYGgEBMYmpmiRBVHaDPS8PXGZO8GMgYGjhSilicDEzdlKlNIkYOSwtxGlNK29o6OToFsBkPOxfsuGle0AAAAASUVORK5CYIJ=</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000004.png" o:title="fa-mortar-board"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/emp.xml
+++ b/partials/doc/pict/emp.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000003.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASZQTFRFv8HDv8HOv8HGv8LIv8TTv8zdv8LOv8bVv8LEv8HEv8HKv8rbv8LQv8HIv8jXv8HMv8LKv8TQz8bEw8LEw8LGydDfyczOz8jGw8jOz8zKw8HDwcbMz8zOycTDy8zOzcHD1cTDxcHDz8LD3crEwcHDwcLEw8LDycHDx8HD0cLDy8HD1drb3dTMy9Tb3drTycLDwcrV3drb1cjE29rb287Izdz/z9zsxdDky9r7ydbs2/X/2/H/1eXw79LG79zQ69bK7dLG487E897Q89bK/+3d///d/+nT8+vd//XZ/+fT//HZ/ePS8+XV8+/f//vb9///4f//7//////q4evw8+/s6+/w7f/////o/f//4+/w8+/w7+/w4fv/4//////59+/w8/P5////sDySyAAAAP9JREFUSMdjSCQaMIwqHZJKXYSEsQARUX9MpbYMWAFjAD2VMomJMzBISEoxSMvIMjDLieNRyhLoKs8YEKTAYArksia6KeJWyhZsJ8Vk5q7EYB6izMAeaq9CHW+pqjEwcAAxpzDQQFUVvG71UOeyArrVAuxWTzxuZQnzUueyDgcpdWDgjvCWoncU8ET6aPDa+GoyWEY5MvBFO0nh85afFn8MUVEADixVYEBBAkuNOm4V0NZR4dTV02cwMDRiEDQ2oU5yIcFUUpMLHOANAVC4wlXidysothg4wLlahUBsgQCXFQoXn1KoHJWVkuAAuLdwK3XGEQWxmErj4qOwgQS4AgDkC738cGCe/AAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1026" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000003.png" o:title="fa-building"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/rec.xml
+++ b/partials/doc/pict/rec.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000007.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUFQTFRFv8HDv8HEv8bVv8HOv8HMv8HKv8zdv8LSv8TTv8TSv8jZv8HGv8LIv8LQv8LKv8HI08zOz8zOz87TzcHDy8HDwcHDw8LEwcLE1cTDzcLDw87f18jExcHDx8LDwcTK3dTM0djb08LD0cbDw8rVwczdzdzxzdz/xdLmw9Dk0djkzdrw0droz97xwdDky9jo3eXw2+/w2e3/0+P/z+H/0+P71ePx7dLI79LG/dzO4crD4czE99zO89bK49LM8drO5dTM7dbK99rM5dDI7+HX///d8+/Z/eHQ//Xb//Xd8e3Z7+Pd//Hf///5/f/////77///4f//+/Pw8+/w9fX76f/////q6fv////o+f//+//////x6///9fv///nm4/Po//nu+fv/4+Ps///k/fXx8+/s9/n/6/n/5f//+fHw8/P5////sapGIwAAASVJREFUSMdjyCIaMIwqHVVKB6U+zgKCMCCk74tHqZ8ZAxJgVMWj1EUYWSkDkz/RSpkDsCoNDAICVxEUpSwGIMFgNKVuogy4AKshqlJzBkYxIEBTJQ4UEmVQQ1fKhulW9pCsrFAJopRy+GNTasHAGZaVFS6BopQrIivLXYTRCFWphySDemSWnyWKUo2srCgrBs5otMCyFmWQismyQYkt46xYaQZuE/RwBcUpj6YncsDyxtnKMDBq+WLElp+dDJZA5TPFGrHx9rJoCuW0E3AmwkAveVi08SskBuNP2n4OELXcOkTkAkeQWoS/8SlNUoSGPmGl4HjQJSobhkoQaWpyihM4pvSCUvEr9VZCClXlNDxKQ1FTlkoE0dmQN50qSv0ygpBBJqpbAYc7NrM+qyXXAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000007.png" o:title="fa-trophy"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/srv.xml
+++ b/partials/doc/pict/srv.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000005.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMxQTFRFv8HDv8HEv8jXv8HOv8LSv8TTv8zdv8LKv8bT3czIwcHDwcTM18bDxcHDw8zdx8HD08bDw8HDw8rZ3drbz8TDycHDzcHDw8LDwc7ixdLqzdzxxdLoxdTs1ePx0eH72+n//dzO79LG89bK+9rM997Q5drb/9zO7dbK5c7G/+nV++XT/+3X//Hf//HZ///d/+fT//nq///q8////fXx8+/z+///4f//9///6f///f//7/////Xk8fv///Hk/fXo5ef1///7///x6fX/////TAOGGAAAALpJREFUSMft1NcOgjAUBuCDe4Hixr33Xohb+/7vZCnEKC3ShEv4b5om30Xzn5wC4g741Keu6CqegGSdh65TgCM0OGgLSAKbv3S72yPUNmjwYN6ZdCyCpKKOQUNHNBGhrLFpFwtJnaYJVXQJ4RObnjPE9mR8ZC+6FCp2b70a9tbP3TVKWhog9pNfaS3r21ok1essbyfpEcwLJq06TmtRNKniZSqUuGlk4Hm6xCtQc6SPoRxtPkcQe7n4s96JF4yPwZXEugAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1029" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000005.png" o:title="fa-child"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/star.xml
+++ b/partials/doc/pict/star.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000001.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1QTFRFv8HEv8HDv8jZv8HGv8rbv8HIv8HOv8zdv8bVv8TOv8TMv8LK08TD1cTD2dDOz8rIw8LDwcLGycrOz9DX0crIw8LEwcHDw8LGycrTx8HD2cjDzcHDw8bQ29zZz8TDxcHDy8TDx8LD3drizdzxz97xzdz/xdTs09zqz+H70+P70+X/0eH/0+Px1eX51+v/3ef11+Hw1en/99jK+drM49rb7dTI7dbK8djM9drO99zO89bK5c7E/9zO79rQ8dTI7drO69zi/efZ/+/X/+HQ///d/+vV8+HT///7+fX5///m9//////q+f///fXx8+vk6+/w9/n/5fH/4//////w7////f/////54f//+/////v1//Hm4+Hq//vw8fv/////A0CiDgAAARBJREFUSMdjiCMRMIxqGNUwqoHaGtw9SNRgxKBBkgZPHkYmL1I0GDMyMmuSoAFoASNOKxiwW4DbCgYcFuC0ggGHBUArtIjU4M0L0cDI4kNQg6+fCR+/ACMMCAoJK/kH4NLgKCIqxogNMIhLBGLTYMyIEzBoY9PgbopTvTJ2P7ibiRGhHtnT2HUwq+AOJXdzTB2sOviC1d1CjJB69IizRNXBqksopp0kUTSwBRHS4Ixmgx4hDVZoflAlpMEaTYMaAQ3BUmga2AlocJGGqJORlYMwOELwa3CVB6ni1A+NC3NTAAdTOH4NNkA1XAahYHaYrSIwYRji12DHyK0eAedF2stjBhOqhqjoCBR+jEMs/UtvAMiRyWLg7gtIAAAAAElFTkSuQmCC</w:binData>
+  <v:shape id="_x0000_i1031" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000001.png" o:title="star-icon"/>
+  </v:shape>
+</w:pict>
--- a/partials/doc/pict/wri.xml
+++ b/partials/doc/pict/wri.xml
@ -0,0 +1,6 @@
+<w:pict>
+  <w:binData w:name="wordml://03000006.png" xml:space="preserve">iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAMAAADyHTlpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAI1QTFRFv8HDv8HEv8bVv8jXv8LKv8HGv8HIv8zdv8rZv8TT18bDxcHD2dLd1cbDwczd2cjDxcLKwc7fxcTDx8HDz8TDy9jszdzxy9jmy9jo2ef72+n/1eX56dLI79LG/efT/+3X//Hf///59+/w9fX7//vo/f//9///7///8////fv7//nm8+/w8/H1/fXx////vxL+UwAAAMZJREFUSMft1NkSgjAMBdCL4i7uG+4KiIr2/z/PwghtsYk8+WSez2TuJJlAVC786Z/+mp7OQUUaduHMoypUSpgWnDQtRfc9lK2dhv1LYRcsDT0MCluLGSollK1faSqlsxzm1vXpAKlcbfO+Sn7SQmZ25NNz1WRqb/S2DAl3Td9ASfr0ubDSoLzU6Rep0XRHY0YqKmVjAkYqukNzc/cYqdOWEG9rlTptJ48os3apU6ATi8OUkmV6nJHSpHROG6Wlos8kq4D+Ni/aqw5+HvnsQQAAAABJRU5ErkJggk==</w:binData>
+  <v:shape id="_x0000_i1030" type="#_x0000_t75" style="width:31.5pt;height:31.5pt">
+    <v:imagedata src="wordml://03000006.png" o:title="fa-pencil"/>
+  </v:shape>
+</w:pict>
--- a/themes/positive/src/partials/education.xml
+++ b/themes/positive/src/partials/education.xml
@ -4,7 +4,7 @@
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EDUCATION</w:t>
+      <w:t>{{{sectionTitle "EDUCATION"}}}</w:t>
    </w:r>
  </w:p>

--- a/themes/positive/src/partials/employment.xml
+++ b/themes/positive/src/partials/employment.xml
@ -4,7 +4,7 @@
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EMPLOYMENT</w:t>
+      <w:t>{{{sectionTitle "EMPLOYMENT"}}}</w:t>
    </w:r>
  </w:p>

--- a/partials/doc/section/info.xml
+++ b/partials/doc/section/info.xml
@ -0,0 +1,16 @@
+<wx:sub-section>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle "info" "ABOUT}}}</w:t>
+    </w:r>
+  </w:p>
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
+    <w:pPr>
+      <w:pStyle w:val="Summary"/>
+    </w:pPr>
+    {{{wpml r.info.brief true }}}
+  </w:p>
+</wx:sub-section>
--- a/themes/compact/src/partials/employment.xml
+++ b/themes/compact/src/partials/employment.xml
@ -4,11 +4,11 @@
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EMPLOYMENT</w:t>
+      <w:t>{{{sectionTitle "PROJECTS"}}}</w:t>
    </w:r>
  </w:p>

-  {{#each r.employment.history}}
+  {{#each r.projects}}

  <wx:sub-section>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
@ -18,24 +18,24 @@
          <w:tab w:val="right" w:pos="9360"/>
        </w:tabs>
      </w:pPr>
-      <w:r>
-        <w:t>{{ position }}, </w:t>
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ role }}, </w:t>
      </w:r>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
          {{#if url}}
          <w:rPr>
            <w:rStyle w:val="Hyperlink"/>
          </w:rPr>
          {{/if}}
-          <w:t>{{ employer }}</w:t>
+          <w:t>{{ title }}</w:t>
        </w:r>
      {{#if url}}</w:hlink>{{/if}}
      <w:r wsp:rsidR="00EA0B64">
        <w:tab/>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'YYYY-MM'}} — {{formatDate safe.end 'YYYY-MM'}}</w:t>
+        <w:t>{{dateRange .}}</w:t>
      </w:r>
    </w:p>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@ -44,7 +44,7 @@
          <w:sz-cs w:val="20"/>
        </w:rPr>
      </w:pPr>
-      {{{wpml summary true }}}
+      {{{wpml summary true}}}
      <!-- <w:r wsp:rsidRPr="000A3AF0">
        <w:rPr>
          <w:sz-cs w:val="20"/>
--- a/themes/positive/src/partials/recognition.xml
+++ b/themes/positive/src/partials/recognition.xml
@ -1,14 +1,15 @@
-{{#if r.recognition}}
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
    <w:pPr>
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>RECOGNITION</w:t>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle "RECOGNITION"}}}</w:t>
    </w:r>
  </w:p>

+
  {{#each r.recognition}}

  <wx:sub-section>
@ -70,4 +71,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/themes/positive/src/partials/service.xml
+++ b/themes/positive/src/partials/service.xml
@ -1,14 +1,14 @@
-{{#if r.service }}
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
    <w:pPr>
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SERVICE</w:t>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle "SERVICE"}}}</w:t>
    </w:r>
  </w:p>

+
  {{#each r.service.history}}

  <wx:sub-section>
@ -83,4 +83,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/partials/doc/section/skills.xml
+++ b/partials/doc/section/skills.xml
@ -0,0 +1,104 @@
+<wx:sub-section>
+
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00D1523B" wsp:rsidP="00C146CA">
+    <w:pPr>
+      <w:pStyle w:val="Heading1"/>
+    </w:pPr>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
+    </w:r>
+  </w:p>
+
+
+  <!-- <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>
+</wx:sub-section>
--- a/themes/positive/src/partials/writing.xml
+++ b/themes/positive/src/partials/writing.xml
@ -1,14 +1,14 @@
-{{#if r.writing}}
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
+  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00851045" wsp:rsidP="00C146CA">
    <w:pPr>
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>WRITING</w:t>
+    <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+      <w:t>{{{sectionTitle "WRITING"}}}</w:t>
    </w:r>
  </w:p>

+
  {{#each r.writing}}
  <wx:sub-section>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
@ -75,4 +75,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/partials/html/sections/education.html
+++ b/partials/html/sections/education.html
@ -0,0 +1,10 @@
+{{#section "education"}}
+<section id="education">
+  <header>
+  <h2>{{{sectionTitle "Education"}}}</h2><hr>
+  </header>
+  {{#each r.education.history}}
+    <h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/employment.html
+++ b/partials/html/sections/employment.html
@ -0,0 +1,24 @@
+{{#section "employment"}}
+<section id="employment">
+  <header>
+  <h2>{{{sectionTitle "Employment"}}}</h2><hr>
+  </header>
+  {{#each r.employment.history}}
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        <span class="tenure">{{dateRange .}}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
+        <ul>
+        {{#each highlights}}
+          <li>{{{ this }}}</li>
+        {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/projects.html
+++ b/partials/html/sections/projects.html
@ -0,0 +1,25 @@
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h2>{{{sectionTitle "Projects"}}}</h2>
+  </header>
+  {{#each r.projects}}
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    <span class="tenure">{{dateRange .}}</span></h3>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/recognition.html
+++ b/partials/html/sections/recognition.html
@ -0,0 +1,11 @@
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2>{{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/service.html
+++ b/partials/html/sections/service.html
@ -0,0 +1,24 @@
+{{#section "service"}}
+<section id="volunteer">
+  <header>
+  <h2>{{{sectionTitle "Service"}}}</h2><hr>
+  </header>
+  {{#each r.service.history}}
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{ url }}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+      <span class="tenure">{{dateRange .}}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
--- a/partials/html/sections/skills.html
+++ b/partials/html/sections/skills.html
@ -0,0 +1,23 @@
+{{#section "skills"}}
+<section id="skills">
+  <header>
+  <h2>{{{sectionTitle "Skills"}}}</h2><hr>
+  </header>
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}
--- a/partials/html/sections/writing.html
+++ b/partials/html/sections/writing.html
@ -0,0 +1,12 @@
+{{#section "writing"}}
+<section id="publications">
+  <header>
+  <h2>{{{sectionTitle "Writing"}}}</h2><hr>
+  </header>
+  {{#each r.writing }}
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
--- a/themes/README.md
+++ b/themes/README.md
@ -2,8 +2,10 @@
 ========
 FRESH resume themes live here, one per folder.

- [`minimist`](minimist): A no-frills theme.
 - [`modern`](modern): A middle of the road theme with a modern look 'n feel.
- [`hello-world`](hello-world): A simple-as-possible example theme.
 - [`compact`](compact): A compact theme.
 - [`positive`](positive): A theme that partakes of that which is positive.
+- [`awesome`][awesome]: A LaTeX theme based on Awesome-CV.
+- [`minimist`](minimist): An unstyled starter theme.
+- [`basis`](minimist): An unstyled starter theme.
+- [`hello-world`](hello-world): A simple-as-possible example theme.
--- a/themes/awesome/README.md
+++ b/themes/awesome/README.md
@ -5,8 +5,9 @@ An experimental resume theme based on [Byungjin Park's][author] awesome

 ## Use

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

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

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

 ## License

@ -34,5 +35,5 @@ MIT. See [LICENSE.md][lic].
 [m]: http://miktex.org/download
 [desk]: http://fluentcv.com
 [cli]: https://github.com/fluentdesk/fluentcv
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [author]: https://github.com/posquit0
--- a/themes/awesome/awesome.json
+++ b/themes/awesome/awesome.json
@ -1,5 +1,5 @@
 {
-  "title": "compact",
+  "title": "awesome",
  "description": "A technical résumé theme based on Awesome-CV for LaTeX.",
  "engine": "underscore",
  "url": "https://github.com/posquit0/Awesome-CV",
@ -10,6 +10,7 @@
    "evaluate": "\\[~([\\s\\S]+?)~]",
    "comment": "\\[\\#([\\s\\S]+?)\\#\\]"
  },
+  "leaf": true,
  "formats": {
    "latex": {
      "transform": [
@ -38,5 +39,5 @@
      }
    }
  },
-  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fluent-themes/blob/master/themes/awesome/README.md."
+  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fresh-themes/blob/master/themes/awesome/README.md."
 }
--- a/themes/basis/README.md
+++ b/themes/basis/README.md
@ -0,0 +1,16 @@
+Theme: Basis
+============
+A basis résumé theme for HackMyResume, FluentCV, and other FRESH-compatible
+resume tools.
+
+## Use
+
+The basis theme contains default theme files for use in other themes. Other
+FRESH themes can inherit from the basis theme (or any theme) in order to provide
+default formats that the theme author(s) may not necessarily be interested in.
+
+## License
+
+MIT. See [LICENSE.md][lic] for details.
+
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/basis/src/html.css
+++ b/themes/basis/src/html.css
@ -0,0 +1 @@
+/* An empty CSS file. */
--- a/themes/basis/src/html.html
+++ b/themes/basis/src/html.html
@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ RAW.name }}</title>
+    {{{styleSheet "html.css"}}}
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
+        </div>
+      </header>
+
+
+
+{{#has "info.brief"}}
+<section id="summary">
+  {{{ r.info.brief }}}
+</section>
+{{/has}}
+
+
+
+{{#section "skills"}}
+<section id="skills">
+  <header>
+  <h2>{{{sectionTitle "Skills"}}}</h2><hr>
+  </header>
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}
+
+
+
+{{#section "employment"}}
+<section id="employment">
+  <header>
+  <h2>{{{sectionTitle "Employment"}}}</h2><hr>
+  </header>
+  {{#each r.employment.history}}
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        <span class="tenure">{{dateRange .}}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
+        <ul>
+        {{#each highlights}}
+          <li>{{{ this }}}</li>
+        {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h2>{{{sectionTitle "Projects"}}}</h2>
+  </header>
+  {{#each r.projects}}
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    <span class="tenure">{{dateRange .}}</span></h3>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "education"}}
+<section id="education">
+  <header>
+  <h2>{{{sectionTitle "Education"}}}</h2><hr>
+  </header>
+  {{#each r.education.history}}
+    <h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "service"}}
+<section id="volunteer">
+  <header>
+  <h2>{{{sectionTitle "Service"}}}</h2><hr>
+  </header>
+  {{#each r.service.history}}
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{ url }}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+      <span class="tenure">{{dateRange .}}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "writing"}}
+<section id="publications">
+  <header>
+  <h2>{{{sectionTitle "Writing"}}}</h2><hr>
+  </header>
+  {{#each r.writing }}
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2>{{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+    </main>
+  </body>
+</html>
--- a/themes/basis/src/md.txt
+++ b/themes/basis/src/md.txt
@ -0,0 +1,108 @@
+{{ r.name }}
+============
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+
+{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}}
+
+{{#section "skills"}}
+## {{{sectionTitle "SKILLS"}}}
+
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/section}}
+
+{{#section "employment"}}
+## {{{sectionTitle "EMPLOYMENT"}}}
+
+{{#each r.employment.history }}
+
+{{#if url}}
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section 'projects'}}
+## {{{sectionTitle "PROJECTS"}}}
+
+{{#each r.projects }}
+{{#if url }}
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section 'education'}}
+## {{{sectionTitle "EDUCATION"}}}
+
+{{#each r.education.history}}
+{{#if url}}
+### [{{{ institution }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/section}}
+{{#section 'writing'}}
+## WRITING
+
+{{#each r.writing}}
+### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}
+
+{{#section 'service'}}
+## {{{sectionTitle "SERVICE"}}}
+
+{{#each r.service.history }}
+{{#if url}}
+### [{{{ organization }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section 'recognition'}}
+## {{{sectionTitle "RECOGNITION"}}}
+
+{{#each r.recognition}}
+### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}
--- a/themes/basis/src/txt.txt
+++ b/themes/basis/src/txt.txt
@ -0,0 +1,94 @@
+{{ r.name }}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+================================================================================
+
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
+
+{{#section "skills"}}
+{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
+
+{{#each r.skills.sets}}
+- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/section}}
+
+{{#section "employment"}}
+{{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
+
+{{#each r.employment.history }}
+{{{ position }}}, {{{ employer }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section 'projects'}}
+{{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
+
+{{#each r.projects }}
+{{{ title }}}, {{{ role }}} ({{dateRange .}})
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section "education"}}
+{{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
+
+{{#each r.education.history}}
+{{{ institution }}} ({{dateRange .}})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section "writing"}}
+{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{{ summary }}}
+{{/each}}
+{{/section}}
+
+{{#section "service" }}
+{{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
+
+{{#each r.service.history}}
+{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section "recognition"}}
+{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}
--- a/themes/basis/theme.json
+++ b/themes/basis/theme.json
@ -0,0 +1,7 @@
+{
+  "title": "basis",
+  "description": "A theme that is a basis for other themes.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "message": "This theme contains default unstyled formats that can be used by other themes or as a starting point for a custom theme."
+}
--- a/themes/compact/README.md
+++ b/themes/compact/README.md
@ -15,4 +15,4 @@ job entries in order for this theme to make sense.

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

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/compact/compact.json
+++ b/themes/compact/compact.json
@ -1,6 +0,0 @@
-{
-  "title": "compact",
-  "description": "A compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
-  "engine": "handlebars"
-}
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@ -504,18 +504,14 @@
          </w:r>
        </w:hlink>
      </w:p>
-      <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
-        <w:pPr>
-          <w:pStyle w:val="Summary"/>
-        </w:pPr>
-        <w:r wsp:rsidRPr="000A3AF0">
-          <w:t>{{ r.info.brief }}</w:t>
-        </w:r>
-      </w:p> -->
-      {{{wpml r.info.brief }}}
-      {{> skills }}
-      {{> employment }}
-      {{> education }}
+      {{{wpml RAW.info.brief }}}
+      {{#section "skills"}}{{> skills }}{{/section}}
+      {{#section "employment"}}{{> section/employment }}{{/section}}
+      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "education"}}{{> section/education }}{{/section}}
+      {{#section "service"}}{{> section/service }}{{/section}}
+      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "recognition"}}{{> section/recognition }}{{/section}}
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@ -4,158 +4,177 @@
    <meta charset="utf-8">
    <title>{{ RAW.name }}</title>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{{styleSheet "compact-html.css"}}}    
+    {{{styleSheet "html.css"}}}
  </head>
  <body>
    <main>
      <header>
        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>


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

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



-{{#if r.employment}}
-      <section id="employment">
-        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
-        </header>
+{{#section "skills"}}
+<section id="skills">
+  <header>
+  <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
+  </header>
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}

-        {{#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}}
+{{#section "employment"}}
+<section id="employment">
+  <header>
+  <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
+  </header>
+  {{#each r.employment.history}}
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        <span class="tenure">{{dateRange .}}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
+        <ul>
+        {{#each highlights}}
+          <li>{{{ this }}}</li>
        {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
+</section>
+{{/section}}

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

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

-      </section>
-{{/if}}
+{{#section 'projects'}}
+<section id="projects">
+  <header>
+  <h2><span class="fa fa-star"></span>{{{sectionTitle "Projects"}}}</h2><hr>
+  </header>
+  {{#each r.projects}}
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    <span class="tenure">{{dateRange .}}</span></h3>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}

-{{#if r.service}}
-      <section id="volunteer">
-        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
-        </header>
-        {{#each r.service.history}}
-          <h3><em>{{ position }}</em>,
-            {{#if url}}
-            <a href="{{ url }}">{{ organization }}</a>
-            {{else}}
-            {{ organization }}
-            {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
-          {{/if}}
-        {{/each}}

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

-{{#if r.writing}}
-      <section id="publications">
-        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
-        </header>
-        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{{ summary }}}{{/if}}
-        {{/each}}
-      </section>
-{{/if}}
+{{#section "education"}}
+<section id="education">
+  <header>
+  <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
+  </header>
+  {{#each r.education.history}}
+    <h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "service"}}
+<section id="volunteer">
+  <header>
+  <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
+  </header>
+  {{#each r.service.history}}
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{ url }}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+      <span class="tenure">{{dateRange .}}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "writing"}}
+<section id="publications">
+  <header>
+  <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
+  </header>
+  {{#each r.writing }}
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
+

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

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


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

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



-{{#if r.employment}}
-      <section id="employment">
-        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
-        </header>
+{{#section "skills"}}
+<section id="skills">
+  <header>
+  <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
+  </header>
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}

-        {{#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}}
+{{#section "employment"}}
+<section id="employment">
+  <header>
+  <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
+  </header>
+  {{#each r.employment.history}}
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        <span class="tenure">{{dateRange .}}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
+        <ul>
+        {{#each highlights}}
+          <li>{{{ this }}}</li>
        {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
+</section>
+{{/section}}

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

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

-      </section>
-{{/if}}
+{{#section 'projects'}}
+<section id="projects">
+  <header>
+  <h2><span class="fa fa-star"></span>{{{sectionTitle "Projects"}}}</h2><hr>
+  </header>
+  {{#each r.projects}}
+    <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
+    {{#if url}}
+    <a href="{{{ url }}}">{{ title }}</a>
+    {{else}}
+    {{ title }}
+    {{/if}}
+    <span class="tenure">{{dateRange .}}</span></h3>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}

-{{#if r.service}}
-      <section id="volunteer">
-        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
-        </header>
-        {{#each r.service.history}}
-          <h3><em>{{ position }}</em>,
-            {{#if url}}
-            <a href="{{ url }}">{{ organization }}</a>
-            {{else}}
-            {{ organization }}
-            {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
-          {{/if}}
-        {{/each}}

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

-{{#if r.writing}}
-      <section id="publications">
-        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
-        </header>
-        {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{{ summary }}}{{/if}}
-        {{/each}}
-      </section>
-{{/if}}
+{{#section "education"}}
+<section id="education">
+  <header>
+  <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
+  </header>
+  {{#each r.education.history}}
+    <h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "service"}}
+<section id="volunteer">
+  <header>
+  <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
+  </header>
+  {{#each r.service.history}}
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{ url }}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+      <span class="tenure">{{dateRange .}}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "writing"}}
+<section id="publications">
+  <header>
+  <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
+  </header>
+  {{#each r.writing }}
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
+

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

    </main>
  </body>
--- a/themes/compact/src/compact-txt.txt
+++ b/themes/compact/src/compact-txt.txt
@ -1,90 +0,0 @@
-{{!
-
-  compact/txt.txt
-  A plain text resume template for FluentCV's "compact" theme.
-
-}}
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/compact/src/partials/skills.xml
+++ b/themes/compact/src/partials/skills.xml
@ -5,7 +5,7 @@
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
    </w:r>
  </w:p>
  <w:tbl>
--- a/themes/compact/theme.json
+++ b/themes/compact/theme.json
@ -0,0 +1,10 @@
+{
+  "title": "compact",
+  "description": "A compact résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "inherits": {
+    "txt": "basis",
+    "md": "basis"
+  }
+}
--- a/themes/hello-world/README.md
+++ b/themes/hello-world/README.md
@ -6,4 +6,4 @@ A simple résumé theme for example purposes.

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

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/hello-world/hello-world.json
+++ b/themes/hello-world/hello-world.json
@ -1,6 +0,0 @@
-{
-  "title": "minimist",
-  "description": "An unstyled starter résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "handlebars"
-}
--- a/themes/hello-world/theme.json
+++ b/themes/hello-world/theme.json
@ -0,0 +1,6 @@
+{
+  "title": "hello-world",
+  "description": "An unstyled starter résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars"
+}
--- a/themes/minimist/README.md
+++ b/themes/minimist/README.md
@ -1,9 +1,10 @@
 Theme: Minimist
 ===============
-An unstyled résumé theme.
+An unstyled résumé theme. Unlike most other FRESH themes, Minimist uses the
+Underscore.js templating engine (instead of Handlebars).

 ## License

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

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/minimist/minimist.json
+++ b/themes/minimist/minimist.json
@ -1,6 +0,0 @@
-{
-  "title": "awesome",
-  "description": "A visually compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "underscore"
-}
--- a/themes/minimist/src/doc.xml
+++ b/themes/minimist/src/doc.xml
@ -740,7 +740,7 @@ engine: Underscore
              <w:i w:val="off"/>
              <w:i-cs w:val="off"/>
            </w:rPr>
-            <w:t>Skills</w:t>
+            <w:t>{% print(h.sectionTitle('Skills')) %}</w:t>
          </w:r>
        </w:p>
        <w:tbl>
@ -792,7 +792,7 @@ engine: Underscore
            <w:pStyle w:val="Heading1"/>
          </w:pPr>
          <w:r>
-            <w:t>Employment</w:t>
+            <w:t>{% print(h.sectionTitle('Employment')) %}</w:t>
          </w:r>
        </w:p>
        <w:tbl>
@ -917,7 +917,7 @@ engine: Underscore
            <w:pStyle w:val="Heading1"/>
          </w:pPr>
          <w:r>
-            <w:t>Education</w:t>
+            <w:t>{% print(h.sectionTitle('Education')) %}</w:t>
          </w:r>
        </w:p>
        <w:tbl>
--- a/themes/minimist/src/html.html
+++ b/themes/minimist/src/html.html
@ -13,8 +13,7 @@ engine: Underscore
    <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 }}
-    {{{styleSheet "html.css"}}}
-    {% } %}
+    {% print( h.styleSheet('html.css') ) %}
  </head>
  <body>
    <main id="main">
@ -31,7 +30,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
      <hr>
      <section id="summary">
-        <h3>About</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
        <span class="fa fa-lg fa-user"></span>
        {{ r.info.brief }}
      </section>
@ -42,7 +41,7 @@ engine: Underscore
      <hr>
      <section id="skills">
        <header>
-        <h3>Skills</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
        </header>
        <span class="fa fa-lg fa-code"></span>

@ -76,7 +75,7 @@ engine: Underscore
      <hr>
      <section id="employment">
        <header>
-        <h3>Employment</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
        </header>
        <span class="fa fa-lg fa-building"></span>
        {% r.employment.history.forEach( function( proj, idx, ar) { %}
@ -105,7 +104,7 @@ engine: Underscore
      <hr>
      <section id="education">
        <header>
-        <h3>Education</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
        </header>
        <span class="fa fa-lg fa-mortar-board"></span>
        {% r.education.history.forEach( function( edu, idx, ar) { %}
@ -127,7 +126,7 @@ engine: Underscore
      <hr>
      <section id="awards">
        <header>
-        <h3>Awards</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
        </header>
        <span class="fa fa-lg fa-trophy"></span>
        {% r.recognition.forEach( function( award, idx, ar) { %}
@ -142,7 +141,7 @@ engine: Underscore
      <hr>
      <section id="publications">
        <header>
-        <h3>Publications</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
        </header>
        <span class="fa fa-lg fa-pencil"></span>
        {% r.writing.forEach( function( pub, idx, ar) { %}
@ -161,7 +160,7 @@ engine: Underscore
      <hr>
      <section id="volunteer">
        <header>
-        <h3>Volunteer Work</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
        </header>
        <span class="fa fa-lg fa-child"></span>
        {% r.service.history.forEach( function( vol, idx, ar) { %}
--- a/themes/minimist/src/md.txt
+++ b/themes/minimist/src/md.txt
@ -7,13 +7,13 @@
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}

 {% if ( r.skills && r.skills.sets ) { %}
-## Skills
+## {% print(h.sectionTitle('Skills')) %}
 {% r.skills.sets.forEach( function( set, idx, ar) { %}
 - **{{ set.name }}**: {{ set.skills.join(', ') }}
 {% }); } %}

 {% if ( r.employment.history && r.employment.history.length ) { %}
-## Employment
+## {% print(h.sectionTitle('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>
@ -23,7 +23,7 @@
 {% }); }  }); } %}

 {% if ( r.education.history && r.education.history.length ) { %}
-## Education
+## {% print(h.sectionTitle('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 }}
@ -32,7 +32,7 @@
 {% }); } }); } %}

 {% if ( r.writing && r.writing.length ) { %}
-## Publications
+## {% print(h.sectionTitle('publications', 'Writing')) %}
 {% r.writing.forEach( function( pub, idx, ar) { %}
 ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
 {{ pub.publisher }}
@ -40,14 +40,14 @@
 {% }); } %}

 {% if ( r.service.history && r.service.history.length ) { %}
-## Volunteer
+## {% print(h.sectionTitle('service','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
+## {% print(h.sectionTitle('Recognition')) %}
 {% r.recognition.forEach( function( awd, idx, ar) { %}
 ### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }})
 {{ awd.summary }}
--- a/themes/minimist/src/pdf.html
+++ b/themes/minimist/src/pdf.html
@ -32,7 +32,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
      <hr>
      <section id="summary">
-        <h3>About</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
        <span class="fa fa-lg fa-user"></span>
        {{ r.info.brief }}
      </section>
@ -43,7 +43,7 @@ engine: Underscore
      <hr>
      <section id="skills">
        <header>
-        <h3>Skills</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
        </header>
        <span class="fa fa-lg fa-code"></span>

@ -77,7 +77,7 @@ engine: Underscore
      <hr>
      <section id="employment">
        <header>
-        <h3>Employment</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
        </header>
        <span class="fa fa-lg fa-building"></span>
        {% r.employment.history.forEach( function( proj, idx, ar) { %}
@ -106,7 +106,7 @@ engine: Underscore
      <hr>
      <section id="education">
        <header>
-        <h3>Education</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
        </header>
        <span class="fa fa-lg fa-mortar-board"></span>
        {% r.education.history.forEach( function( edu, idx, ar) { %}
@ -128,7 +128,7 @@ engine: Underscore
      <hr>
      <section id="awards">
        <header>
-        <h3>Awards</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
        </header>
        <span class="fa fa-lg fa-trophy"></span>
        {% r.recognition.forEach( function( award, idx, ar) { %}
@ -143,7 +143,7 @@ engine: Underscore
      <hr>
      <section id="publications">
        <header>
-        <h3>Publications</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
        </header>
        <span class="fa fa-lg fa-pencil"></span>
        {% r.writing.forEach( function( pub, idx, ar) { %}
@ -158,11 +158,11 @@ engine: Underscore
      </section>
 {% } %}

-{% if ( r.service.history && r.service.history.length ) { %}
+{% if ( r.service && r.service.history && r.service.history.length ) { %}
      <hr>
      <section id="volunteer">
        <header>
-        <h3>Volunteer Work</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
        </header>
        <span class="fa fa-lg fa-child"></span>
        {% r.service.history.forEach( function( vol, idx, ar) { %}
--- a/themes/minimist/src/txt.txt
+++ b/themes/minimist/src/txt.txt
@ -1,9 +1,3 @@
-{#
-
-  minimist/txt.txt
-  A plain text resume template for FluentCV's "minimist" theme.
-
-#}
 {{ r.name }}
 {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
 {% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
@ -23,23 +17,31 @@

 {% } %}

-{% if ( r.employment && r.employment.history ) { %}EMPLOYMENT
+{% if ( r.employment && r.employment.history ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
-{{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
+{{ proj.employer }} {{ h.dateRange(proj) }}
 {{ proj.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
  - {{ high }}
 {% }); }  }); } %}

-{% if ( r.education && r.education.history ) { %}EDUCATION
+{% if ( r.education && r.education.history ) { %}{% print(h.sectionTitle('EDUCATION')) %}
 {% r.education.history.forEach( function( edu, idx, ar) { %}
-{{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
+{{ edu.institution }} {% print(h.dateRange(edu)) %}
 {{ edu.summary }}
 {% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
  - {{ course }}
 {% }); } }); } %}

-{% if ( r.service && r.service.history ) { %}VOLUNTEER
+{% if ( r.projects && r.projects.length ) { %}{% print(h.sectionTitle('PROJECTS')) %}
+{% r.projects.forEach( function( proj, idx, ar) { %}
+{{ proj.title }} {{ h.dateRange( proj ) }}
+{{ proj.summary }}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
+
+{% if ( r.service && r.service.history ) { %}{% print(h.sectionTitle('service', '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 }}
@ -47,7 +49,7 @@
  - {{ high }}
 {% }); } }); } %}

-{% if ( r.writing && r.writing.length ) { %}WRITING
+{% if ( r.writing && r.writing.length ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
 {% r.writing.forEach( function( wri, idx, ar) { %}
 {{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
 {{ wri.summary }}
--- a/themes/minimist/theme.json
+++ b/themes/minimist/theme.json
@ -0,0 +1,6 @@
+{
+  "title": "minimist",
+  "description": "A unstyled résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "underscore"
+}
--- a/themes/modern/README.md
+++ b/themes/modern/README.md
@ -33,4 +33,4 @@ or a number between 1 and 10.

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

-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
--- a/themes/modern/src/modern-doc.xml
+++ b/themes/modern/src/modern-doc.xml
@ -485,13 +485,14 @@
          </w:r>
        </w:hlink>
      </w:p>
-      {{> info }}
-      {{> skills }}
-      {{> employment }}
-      {{> education }}
-      {{> service }}
-      {{> writing }}
-      {{> recognition }}
+      {{#section "info"}}{{> info }}{{/section}}
+      {{#section "skills"}}{{> skills }}{{/section}}
+      {{#section "employment"}}{{> employment }}{{/section}}
+      {{#section "projects"}}{{> projects }}{{/section}}
+      {{#section "education"}}{{> education }}{{/section}}
+      {{#section "service"}}{{> service }}{{/section}}
+      {{#section "writing"}}{{> writing }}{{/section}}
+      {{#section "recognition"}}{{> recognition }}{{/section}}
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@ -13,9 +13,9 @@
      <header>
        <h1>{{{ r.name }}}</h1>
        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+          {{#has r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/has}}
        </div>
      </header>

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


-{{#if r.skills }}
+{{#section 'skills' }}
      <hr>
      <section id="skills">
        <header>
-        <h3>Skills</h3>
+        <h3>{{{sectionTitle "Skills"}}}</h3>
        </header>
        <span class="fa fa-lg fa-code"></span>

@ -60,20 +60,20 @@


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



-{{#if r.employment}}
+{{#section 'employment'}}
 <hr>
 <section id="employment">
  <header>
-  <h3>Employment</h3>
+  <h3>{{{sectionTitle "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>
+    <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}}
@ -82,20 +82,74 @@
    {{#if proj.highlights}}
      <ul>
      {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-star"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'education'}}
 <hr>
 <section id="education">
  <header>
-  <h3>Education</h3>
+  <h3>{{{sectionTitle "Education"}}}</h3>
  </header>
  <span class="fa fa-lg fa-mortar-board"></span>
  {{#each r.education.history}}
@ -104,20 +158,20 @@
    {{#if courses}}
      <ul>
      {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{#if r.service}}
+{{#section 'service'}}
 <hr>
 <section id="volunteer">
  <header>
-  <h3>Service</h3>
+  <h3>{{{sectionTitle "Service"}}}</h3>
  </header>
  <span class="fa fa-lg fa-child"></span>
  {{#each r.service.history}}
@ -131,20 +185,20 @@
    {{#if highlights}}
      <ul>
      {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{#if r.writing}}
+{{#section 'writing'}}
 <hr>
 <section id="publications">
  <header>
-  <h3>Publications</h3>
+  <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
  </header>
  <span class="fa fa-lg fa-pencil"></span>
  {{#each r.writing}}
@ -156,13 +210,13 @@
  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
  {{/each}}
 </section>
-{{/if}}
+{{/section}}

-{{# if r.recognition}}
+{{#section 'recognition'}}
 <hr>
 <section id="awards">
  <header>
-  <h3>Awards</h3>
+  <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
  </header>
  <span class="fa fa-lg fa-trophy"></span>
  {{#each r.recognition}}
@ -171,7 +225,7 @@
    {{{ summary }}}
  {{/each}}
 </section>
-{{/if}}
+{{/section}}

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


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


-{{#if r.skills }}
+{{#section 'skills' }}
      <hr>
      <section id="skills">
        <header>
-        <h3>Skills</h3>
+        <h3>{{{sectionTitle "Skills"}}}</h3>
        </header>
        <span class="fa fa-lg fa-code"></span>

@ -66,20 +65,20 @@


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



-{{#if r.employment}}
+{{#section 'employment'}}
 <hr>
 <section id="employment">
  <header>
-  <h3>Employment</h3>
+  <h3>{{{sectionTitle "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>
+    <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}}
@ -88,20 +87,74 @@
    {{#if proj.highlights}}
      <ul>
      {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'education'}}
 <hr>
 <section id="education">
  <header>
-  <h3>Education</h3>
+  <h3>{{{sectionTitle "Education"}}}</h3>
  </header>
  <span class="fa fa-lg fa-mortar-board"></span>
  {{#each r.education.history}}
@ -110,20 +163,20 @@
    {{#if courses}}
      <ul>
      {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{#if r.service}}
+{{#section 'service'}}
 <hr>
 <section id="volunteer">
  <header>
-  <h3>Service</h3>
+  <h3>{{{sectionTitle "Service"}}}</h3>
  </header>
  <span class="fa fa-lg fa-child"></span>
  {{#each r.service.history}}
@ -137,20 +190,20 @@
    {{#if highlights}}
      <ul>
      {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
      {{/each}}
      </ul>
    {{/if}}
  {{/each}}

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

-{{#if r.writing}}
+{{#section 'writing'}}
 <hr>
 <section id="publications">
  <header>
-  <h3>Publications</h3>
+  <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
  </header>
  <span class="fa fa-lg fa-pencil"></span>
  {{#each r.writing}}
@ -162,13 +215,13 @@
  <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
  {{/each}}
 </section>
-{{/if}}
+{{/section}}

-{{# if r.recognition}}
+{{#section 'recognition'}}
 <hr>
 <section id="awards">
  <header>
-  <h3>Awards</h3>
+  <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
  </header>
  <span class="fa fa-lg fa-trophy"></span>
  {{#each r.recognition}}
@ -177,7 +230,7 @@
    {{{ summary }}}
  {{/each}}
 </section>
-{{/if}}
+{{/section}}

      </div>
    </main>
--- a/themes/modern/src/modern-txt.txt
+++ b/themes/modern/src/modern-txt.txt
@ -1,84 +0,0 @@
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
--- a/themes/modern/src/partials/education.xml
+++ b/themes/modern/src/partials/education.xml
@ -1,25 +1,6 @@
 <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>
+
+  {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}

  {{#each r.education.history}}

--- a/themes/modern/src/partials/employment.xml
+++ b/themes/modern/src/partials/employment.xml
@ -1,33 +1,6 @@
 <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> -->
+
+  {{> header-icon _title="EMPLOYMENT" _section="employment" _icon="pict/emp" }}

  {{#each r.employment.history}}

@ -66,12 +39,6 @@
        </w:rPr>
      </w:pPr>
      {{{wpml summary true}}}
-      <!-- <w:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
    </w:p>

    {{#each highlights }}
--- a/themes/modern/src/partials/info.xml
+++ b/themes/modern/src/partials/info.xml
@ -36,7 +36,7 @@
        </w:pict>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>ABOUT</w:t>
+        <w:t>{{{sectionTitle "info" "ABOUT"}}}</w:t>
      </w:r>
    </w:p>
  </wx:pBdrGroup>
--- a/themes/compact/src/partials/education.xml
+++ b/themes/compact/src/partials/education.xml
@ -1,14 +1,8 @@
 <wx:sub-section>
-  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EDUCATION</w:t>
-    </w:r>
-  </w:p>

-  {{#each r.education.history}}
+  {{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }}
+
+  {{#each r.projects}}

  <wx:sub-section>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00606071" wsp:rsidP="00E578D4">
@ -18,21 +12,24 @@
          <w:tab w:val="right" w:pos="9360"/>
        </w:tabs>
      </w:pPr>
-      {{#if url}}<w:hlink w:dest="https://veridiandynamics.com">{{/if}}
+      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
+        <w:t>{{ role }}, </w:t>
+      </w:r>
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
        <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
-          {{#if url }}
+          {{#if url}}
          <w:rPr>
            <w:rStyle w:val="Hyperlink"/>
          </w:rPr>
          {{/if}}
-          <w:t>{{ this.institution }}</w:t>
+          <w:t>{{ title }}</w:t>
        </w:r>
      {{#if url}}</w:hlink>{{/if}}
      <w:r wsp:rsidR="00EA0B64">
        <w:tab/>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
+        <w:t>{{dateRange .}}</w:t>
      </w:r>
    </w:p>
    <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
@ -41,12 +38,7 @@
          <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>
+      {{{wpml summary true}}}
    </w:p>

    {{#each highlights }}
@ -63,12 +55,7 @@
          <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>
+      {{{wpml this true}}}
    </w:p>
    {{/each}}

--- a/themes/modern/src/partials/recognition.xml
+++ b/themes/modern/src/partials/recognition.xml
@ -1,26 +1,6 @@
-{{#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>
+
+  {{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }}

  {{#each r.recognition}}

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

 </wx:sub-section>
-{{/if}}
--- a/themes/modern/src/partials/service.xml
+++ b/themes/modern/src/partials/service.xml
@ -1,26 +1,6 @@
-{{#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>
+
+  {{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }}

  {{#each r.service.history}}

@ -59,12 +39,6 @@
        </w:rPr>
      </w:pPr>
      {{{wpml summary true}}}
-      <!-- <w:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
    </w:p>

    {{#each highlights }}
@ -82,12 +56,6 @@
        </w:rPr>
      </w:pPr>
      {{{wpml this true}}}
-      <!-- <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
    </w:p>
    {{/each}}

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

 </wx:sub-section>
-{{/if}}
--- a/themes/modern/src/partials/skills.xml
+++ b/themes/modern/src/partials/skills.xml
@ -37,19 +37,11 @@
        </w:pict>
      </w:r>
      <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>SKILLS</w:t>
+        <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
      </w:r>
    </w:p>
  </wx:pBdrGroup>

-  <!-- <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
-    <w:pPr>
-      <w:pStyle w:val="Heading1"/>
-    </w:pPr>
-    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
-    </w:r>
-  </w:p> -->
  <w:tbl>
    <w:tblPr>
      <w:tblW w:w="0" w:type="auto"/>
@ -72,16 +64,6 @@
          <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
        </w:tcPr>
        <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
-          <!-- <w:pPr>
-            <w:jc w:val="right"/>
-          </w:pPr>
-          <w:r>
-            <w:rPr>
-              <w:caps/>
-              <w:color w:val="989898"/>
-            </w:rPr>
-            <w:t>{{ name }}</w:t>
-          </w:r> -->
          <w:r>
            <w:rPr>
              <w:noProof/>
--- a/themes/modern/src/partials/writing.xml
+++ b/themes/modern/src/partials/writing.xml
@ -1,26 +1,6 @@
-{{#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>
+
+  {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}

  {{#each r.writing}}
  <wx:sub-section>
@ -74,12 +54,6 @@
        </w:rPr>
      </w:pPr>
      {{{wpml this true}}}
-      <!-- <w:r>
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ this }}</w:t>
-      </w:r> -->
    </w:p>
    {{/each}}

@ -88,4 +62,3 @@
  {{/each}}

 </wx:sub-section>
-{{/if}}
--- a/themes/modern/modern.json
+++ b/themes/modern/modern.json
@ -1,10 +1,14 @@
 {
  "title": "modern",
  "description": "A contemporary resume template suitable for modern technical candidates and employees.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
  "engine": "handlebars",
  "palette": {
    "skillLevels": [ "#FFFFFF", "#5CB85C", "#F1C40F", "#428BCA", "#C00000" ]
  },
-  "message": "To get colored skill progress bars, make sure your resume includes a `level` element for each skill!"
+  "message": "To get colored skill progress bars, make sure your resume includes a `level` element for each skill!",
+  "inherits": {
+    "txt": "basis",
+    "md": "basis"
+  }
 }
--- a/themes/positive/src/partials/skills.xml
+++ b/themes/positive/src/partials/skills.xml
@ -1,11 +1,10 @@
-{{#if r.skills }}
 <wx:sub-section>
  <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
    <w:pPr>
      <w:pStyle w:val="Heading1"/>
    </w:pPr>
    <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
    </w:r>
  </w:p>
  <w:tbl>
@ -59,5 +58,4 @@
    {{/each}}

  </w:tbl>
-  {{/if}}
 </wx:sub-section>
--- a/themes/positive/src/positive-doc.xml
+++ b/themes/positive/src/positive-doc.xml
@ -517,21 +517,21 @@
          </w:r>
        </w:hlink>
      </w:p>
+      {{#has "info.brief"}}
      <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 }}
+      {{/has}}
+      {{#section "skills"}}{{> skills }}{{/section}}
+      {{#section "employment"}}{{> section/employment }}{{/section}}
+      {{#section "education"}}{{> section/education }}{{/section}}
+      {{#section "projects"}}{{> section/projects }}{{/section}}
+      {{#section "service"}}{{> section/service }}{{/section}}
+      {{#section "writing"}}{{> section/writing }}{{/section}}
+      {{#section "recognition"}}{{> section/recognition }}{{/section}}
      <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
        <w:pgSz w:w="12240" w:h="15840"/>
        <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@ -20,14 +20,14 @@
      </header>


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


-{{#if r.skills}}
+{{#section "skills"}}
      <section id="skills">
        <header>
        <h2><span class="fa fa-code"></span> Skills</h2>
@ -35,7 +35,7 @@
        <table>
          <thead>
            <tr>
-              <th>Skill</th>
+              <th>{{{sectionTitle "Skills"}}}</th>
              <th>Keywords</th>
            </tr>
          </thead>
@ -49,69 +49,107 @@
          </tbody>
        </table>
      </section>
-{{/if}}
+{{/section}}



-{{#if r.employment}}
+{{#section "employment"}}
      <section id="employment">
        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "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>
+          <h3><em>{{ position }}</em>,
+            {{#if url }}
+            <a href="{{ url }}">{{{ employer }}}</a>
+            {{else}}
+            {{{ employer }}}
            {{/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>
+            <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>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
+            {{#each highlights}}
+              <li>{{{ this }}}</li>
+            {{/each}}
            </ul>
-            {{/if}}
-          {{/compare}}
+          {{/if}}
        {{/each}}

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

-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section "education"}}
      <section id="education">
        <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2>
+        <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "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}}
+{{/section}}

-{{#if r.service}}
+{{#section "service"}}
      <section id="volunteer">
        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2>
        </header>
        {{#each r.service.history}}
          <h3><em>{{{ position }}}</em>,
@ -132,12 +170,12 @@
        {{/each}}

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

-{{#if r.writing}}
+{{#section "writing"}}
      <section id="publications">
        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2>
+        <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
        </header>
        {{#each r.writing }}
          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
@ -145,19 +183,19 @@
        {{# if summary}}{{{ summary }}}{{/if}}
        {{/each}}
      </section>
-{{/if}}
+{{/section}}

-{{# if r.recognition}}
+{{#section "recognition"}}
      <section id="awards">
        <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2>
+        <h2><span class="fa fa-trophy"></span> {{{"sectionTitle" "recognition" "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}}
+{{/section}}

    </main>
  </body>
--- a/themes/positive/src/positive-pdf.html
+++ b/themes/positive/src/positive-pdf.html
@ -11,7 +11,7 @@
  <body>
    <main>
      <header>
-        <h1>{{initialWords r.name }} <span style="color: #C00000;">{{lastWord r.name }}</span></h1>
+        <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}}
@ -21,14 +21,14 @@
      </header>


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


-{{#if r.skills}}
+{{#section "skills"}}
      <section id="skills">
        <header>
        <h2><span class="fa fa-code"></span> Skills</h2>
@ -36,7 +36,7 @@
        <table>
          <thead>
            <tr>
-              <th>Skill</th>
+              <th>{{{sectionTitle "Skills"}}}</th>
              <th>Keywords</th>
            </tr>
          </thead>
@ -50,115 +50,153 @@
          </tbody>
        </table>
      </section>
-{{/if}}
+{{/section}}



-{{#if r.employment}}
+{{#section "employment"}}
      <section id="employment">
        <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "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>
+            {{#if url }}
+            <a href="{{ url }}">{{{ employer }}}</a>
            {{else}}
-            {{ organization }}
+            {{{ employer }}}
            {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+            <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>
+              <li>{{{ this }}}</li>
            {{/each}}
            </ul>
          {{/if}}
        {{/each}}

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

-{{#if r.writing}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</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>
+{{/section}}
+
+{{#section "education"}}
+      <section id="education">
+        <header>
+        <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "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>
+{{/section}}
+
+{{#section "service"}}
+      <section id="volunteer">
+        <header>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "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>
+{{/section}}
+
+{{#section "writing"}}
      <section id="publications">
        <header>
-        <h2><span class="fa fa-book"></span> Writing</h2>
+        <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
        </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.name }}} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
        {{# if summary}}{{{ summary }}}{{/if}}
        {{/each}}
      </section>
-{{/if}}
+{{/section}}

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

    </main>
  </body>
--- a/themes/positive/positive.json
+++ b/themes/positive/positive.json
@ -1,10 +1,10 @@
 {
  "title": "positive",
  "description": "A conventional résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
  "engine": "handlebars",
  "inherits": {
-    "text": "compact",
-    "md": "compact"
+    "txt": "basis",
+    "md": "basis"
  }
 }
Author	SHA1	Message	Date
hacksalot	06e458eab7	Remove unused files.	2016-01-06 10:30:08 -05:00
hacksalot	66d6c14436	Continue refactoring.	2016-01-06 10:23:40 -05:00
hacksalot	1e2a8476b3	Reorganize.	2016-01-06 06:47:56 -05:00
hacksalot	795dfe42c0	Reorganize.	2016-01-06 06:45:28 -05:00
hacksalot	368af772c2	Modern: MS Word: Adjust star icon height.	2016-01-06 06:37:39 -05:00
hacksalot	3e833234f7	Word: Refactor embedded FA icons.	2016-01-06 06:28:25 -05:00
hacksalot	b9a7848cf1	Update README.	2016-01-06 05:44:05 -05:00
hacksalot	50017c43e9	Continue fleshing out themes. Add sections and increase DRY.	2016-01-06 04:56:16 -05:00
hacksalot	b4a93020ec	Introduce global theme partials.	2016-01-06 03:51:13 -05:00
hacksalot	9fd0ce9695	...	2016-01-05 10:22:50 -05:00
hacksalot	b43e520f40	Use explicit HTML format for Compact theme.	2016-01-05 09:02:14 -05:00
hacksalot	aaf5755556	Tweak heading in Basis theme.	2016-01-05 08:59:58 -05:00
hacksalot	3261c01075	Remove Font Awesome references from Basis theme.	2016-01-05 08:58:40 -05:00
hacksalot	dad62fe610	Adjust message for Basis theme.	2016-01-05 08:48:32 -05:00
hacksalot	c15a60d576	Update author info.	2016-01-05 08:48:09 -05:00
hacksalot	e48a3f493f	Continue fleshing out themes.	2016-01-05 07:56:40 -05:00
hacksalot	2eaa34ff3f	Fix COMPACT and POSITIVE theme inheritance.	2016-01-05 06:42:26 -05:00
hacksalot	d243f5f472	Remove explicit TXT and MD formats. Themes will now inherit these formats from the Basis theme by default.	2016-01-05 06:27:52 -05:00
hacksalot	d6a9880717	Introduce "Basis" theme.	2016-01-05 06:26:39 -05:00
hacksalot	45d4cd2675	All: Better section handling & add projects.	2016-01-05 04:50:43 -05:00
hacksalot	6f2a71070e	Fix: Positive: Generation error.	2016-01-05 00:28:34 -05:00
hacksalot	27b7273228	Update license info.	2016-01-05 00:24:27 -05:00
hacksalot	e483144436	Bump version to 0.11.0-beta.	2016-01-05 00:24:18 -05:00
hacksalot	f06f97d364	Start using {{hasSection}} helper.	2016-01-05 00:24:07 -05:00
hacksalot	cf1360bc77	Patch Minimist theme.	2016-01-04 17:29:21 -05:00
hacksalot	f49df02d6a	Allow user-specified section headings.	2016-01-04 17:07:30 -05:00
hacksalot	4954079a6f	Fix: Modern: Double-encoding issue. Fixes hacksalot/hackmyresume#57.	2016-01-04 15:07:46 -05:00
hacksalot	68c1afd98b	Update package.json.	2016-01-04 07:31:42 -05:00
hacksalot	06016b8883	Bump version to 0.10.0-beta.	2016-01-04 04:08:37 -05:00
hacksalot	2c5611850b	Rename [theme-name].json to theme.json.	2016-01-04 04:08:25 -05:00
hacksalot	8d28b11fb3	Compact: Tweak Word document WPML.	2016-01-04 04:03:37 -05:00
hacksalot	c0783a4bd2	Bump version.	2015-12-30 20:29:33 -05:00
hacksalot	0d115f15ba	Merge pull request #22 from fluentdesk/dev Fix minimist stylesheet glitch.	2015-12-30 20:19:20 -05:00
hacksalot	ad939ae0fc	Minimist: Use stylesheet helper.	2015-12-30 20:14:50 -05:00
hacksalot	08dadb6f79	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2015-12-30 20:14:27 -05:00
hacksalot	8361cfa12d	Merge branch 'master' of https://github.com/fluentdesk/fresh-themes	2015-12-30 18:37:10 -05:00
hacksalot	0bdecd83f2	Bump version to 0.9.2-beta.	2015-12-30 18:37:05 -05:00
hacksalot	4458059c6f	Update docs with new name.	2015-12-30 18:35:11 -05:00
hacksalot	c74388171d	Merge remote-tracking branch 'refs/remotes/origin/master' into dev	2015-12-30 18:34:39 -05:00
hacksalot	4433f5daca	Merge pull request #21 from fluentdesk/dev dev	2015-12-30 18:27:42 -05:00