diff --git a/partials/doc/doc-styles.hbs b/partials/doc/doc-styles.hbs
index 191496d..300e155 100644
--- a/partials/doc/doc-styles.hbs
+++ b/partials/doc/doc-styles.hbs
@@ -64,7 +64,7 @@
       <w:outlineLvl w:val="2"/>
     </w:pPr>
     <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{fontFace 'heading3'}}"/>
       <w:b/>
       <w:b-cs/>
     </w:rPr>
@@ -98,7 +98,7 @@
     <w:rPr>
       <w:strike w:val="off"/>
       <w:dstrike w:val="off"/>
-      <w:color w:val="0064BD"/>
+      <w:color w:val="{{{color 'hyperlink' '0064BD'}}}"/>
       <w:u w:val="none"/>
       <w:effect w:val="none"/>
     </w:rPr>
@@ -194,8 +194,8 @@
       <w:contextualSpacing/>
     </w:pPr>
     <w:rPr>
-      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
-      <wx:font wx:val="Segoe UI"/>
+      <w:rFonts w:ascii="{{fontFace 'title'}}" w:h-ansi="{{fontFace 'title'}}"/>
+      <wx:font wx:val="{{fontFace 'title'}}"/>
       <w:b/>
       <w:spacing w:val="-10"/>
       <w:kern w:val="28"/>
@@ -208,7 +208,7 @@
     <w:link w:val="Title"/>
     <w:rsid w:val="002D3B7B"/>
     <w:rPr>
-      <w:rFonts w:ascii="Segoe UI" w:h-ansi="Segoe UI"/>
+      <w:rFonts w:ascii="{{fontFace 'title'}}" w:h-ansi="{{fontFace 'title'}}"/>
       <w:spacing w:val="-10"/>
       <w:kern w:val="28"/>
       <w:sz w:val="48"/>
diff --git a/themes/positive/src/positive-doc.xml b/themes/positive/src/positive-doc.xml
index a410140..4ac584d 100644
--- a/themes/positive/src/positive-doc.xml
+++ b/themes/positive/src/positive-doc.xml
@@ -99,6 +99,16 @@
       {{/inline}}
       {{#section "projects"}}{{> section/projects }}{{/section}}
 
+      {{#*inline "header-governance"}}
+      {{> header-icon _title="GOVERNANCE" _section="governance" _icon="pict/justice-scales" }}
+      {{/inline}}
+      {{#section "governance"}}{{> section/governance }}{{/section}}
+
+      {{#*inline "header-affiliation"}}
+      {{> header-icon _title="AFFILIATION" _section="affiliation" _icon="pict/share-alt" }}
+      {{/inline}}
+      {{#section "affiliation"}}{{> section/affiliation }}{{/section}}
+
       {{#*inline "header-education"}}
       {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}
       {{/inline}}
@@ -115,7 +125,7 @@
       {{#section "writing"}}{{> section/writing }}{{/section}}
 
       {{#*inline "header-reading"}}
-      {{> header-icon _title="READING" _section="reading" _icon="pict/wri" }}
+      {{> header-icon _title="READING" _section="reading" _icon="pict/book" }}
       {{/inline}}
       {{#section "reading"}}{{> section/reading }}{{/section}}
 
@@ -125,15 +135,20 @@
       {{#section "recognition"}}{{> section/recognition }}{{/section}}
 
       {{#*inline "header-speaking"}}
-      {{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }}
+      {{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/group" }}
       {{/inline}}
       {{#section "speaking"}}{{> section/speaking }}{{/section}}
 
       {{#*inline "header-references"}}
-      {{> header-icon _title="REFERENCES" _section="references" _icon="pict/arrow" }}
+      {{> header-icon _title="REFERENCES" _section="references" _icon="pict/thumbs-up" }}
       {{/inline}}
       {{#section "references"}}{{> section/references }}{{/section}}
 
+      {{#*inline "header-interests"}}
+      {{> header-icon _title="INTERESTS" _section="interests" _icon="pict/bicycle" }}
+      {{/inline}}
+      {{#section "interests"}}{{> section/interests }}{{/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"/>
diff --git a/themes/positive/src/positive-html.css b/themes/positive/src/positive-html.css
index f8c0cc6..342d217 100644
--- a/themes/positive/src/positive-html.css
+++ b/themes/positive/src/positive-html.css
@@ -1,12 +1,12 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Calibri, 'Open Sans', sans-serif;
+  font-family: {{{fontList 'default'}}};
   font-size: 14px;
   margin: 0; padding: 0;
   display: block;
 }
 
 a {
-  color: #0064BD;
+  color: #{{color 'hyperlink'}};
   text-decoration: none;
 }
 
@@ -130,7 +130,7 @@ h1, h2, .label {
   font-size: 2.5em;
   text-transform: uppercase;
   font-weight: 300;
-  font-family: 'Open Sans', 'Segoe UI', sans-serif;
+  font-family: {{{fontList 'heading1'}}}
 }
 
 #contact {
@@ -145,7 +145,8 @@ header > span.fa {
   width: 40px;
   top: 10px;
   font-size: 30px;
-  transform: translateX(-110%);
+  /*transform: translateX(-110%); PDF no likey */
+  margin-left: -50px;
   color: #DADADA;
 }
 
diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html
index deeabf6..9d0b41a 100644
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@@ -34,7 +34,7 @@
         icon into the global partial. For this theme, we're using Font Awesome.
       -->}}
 
-      {{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
+      {{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
       {{> section/skills _icon="icon-skills"}}
 
       {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
diff --git a/themes/positive/src/positive-pdf.css b/themes/positive/src/positive-pdf.css
index cc766e2..9f498ec 100644
--- a/themes/positive/src/positive-pdf.css
+++ b/themes/positive/src/positive-pdf.css
@@ -127,7 +127,8 @@ header > span.fa {
   width: 40px;
   top: 10px;
   font-size: 30px;
-  transform: translateX(-110%);
+  /*transform: translateX(-110%); PDF no likey */
+  margin-left: -50px;
   color: #DADADA;
 }
 
diff --git a/themes/positive/src/positive-pdf.html b/themes/positive/src/positive-pdf.html
index 111c124..3d63c75 100644
--- a/themes/positive/src/positive-pdf.html
+++ b/themes/positive/src/positive-pdf.html
@@ -3,10 +3,9 @@
   <head>
     <meta charset="utf-8">
     <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
-    <style>
-    {{{ cssInfo.data }}}
-    </style>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{{styleSheet "positive-pdf.css"}}}
   </head>
   <body>
     <main>
@@ -35,7 +34,7 @@
         icon into the global partial. For this theme, we're using Font Awesome.
       -->}}
 
-      {{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
+      {{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
       {{> section/skills _icon="icon-skills"}}
 
       {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
@@ -47,6 +46,9 @@
       {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
       {{> section/education _icon="icon-education"}}
 
+      {{#*inline "icon-affiliation"}}<span class="fa fa-lg fa-share-alt"></span>{{/inline}}
+      {{> section/affiliation _icon="icon-affiliation"}}
+
       {{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
       {{> section/service _icon="icon-service"}}
 
@@ -65,12 +67,12 @@
       {{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
       {{> section/speaking _icon="icon-speaking"}}
 
-      {{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
+      {{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-quote-left"></span>{{/inline}}
       {{> section/testimonials _icon="icon-testimonials"}}
 
       {{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
       {{> section/references _icon="icon-references"}}
 
-    </main>
-  </body>
+    </div>
+  </main>
 </html>
diff --git a/themes/positive/theme.json b/themes/positive/theme.json
index 583d227..02cacb2 100644
--- a/themes/positive/theme.json
+++ b/themes/positive/theme.json
@@ -7,19 +7,20 @@
     "txt": "basis",
     "md": "basis"
   },
+  "colors": {
+    "hyperlink": "C00000"
+  },
   "fonts": {
-    "default": [
-      "Calibri",
-      "Open Sans",
-      "sans-serif"
-    ],
-    "default-html": [
-      "Helvetica Neue"
-      "Helvetica",
-      "Lato",
-      "sans-serif"
-    ],
-    "heading1": ["xkcd"],
-    "heading2": ["xkcd"]
+    "all": {
+      "default": [ "Calibri", "Open Sans", "sans-serif" ],
+      "heading1": [ "Open Sans", "Helvetica Neue", "Helvetica", "Lato", "sans-serif" ],
+      "heading2": [ "Helvetica Neue", "Helvetica", "Lato", "sans-serif" ]
+    },
+    "doc": {
+      "title": "Open Sans Light",
+      "heading1": "Open Sans Light",
+      "heading2": "Open Sans Light",
+      "default": "Calibri"
+    }
   }
 }