diff --git a/themes/positive/src/partials/education.hbs b/themes/positive/src/partials/education.hbs
new file mode 100644
index 0000000..fc64252
--- /dev/null
+++ b/themes/positive/src/partials/education.hbs
@@ -0,0 +1,20 @@
+{{#section "education"}}
+<hr>
+<section id="education">
+  {{#> header-education }}
+    {{> header-icon _title="EDUCATION" _section="education" _hdricon=(lookup . '_icon') }}
+  {{/header-education}}
+  {{#each r.education.history}}
+    {{#> body-education }}
+    <div>
+      <h3>{{#if title}}<em>{{{ title }}}</em>, {{/if}}{{{ institution }}}</h3>
+      <span class="tenure">{{dateRange .}}</span>
+      <span class="location">{{location}}</span>
+      {{{ summary }}}
+      {{> highlights }}
+      {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-education}}
+  {{/each}}
+</section>
+{{/section}}
diff --git a/themes/positive/src/partials/employment.hbs b/themes/positive/src/partials/employment.hbs
new file mode 100644
index 0000000..5f6d8d8
--- /dev/null
+++ b/themes/positive/src/partials/employment.hbs
@@ -0,0 +1,26 @@
+{{#section "employment"}}
+<hr>
+<section id="employment">
+  {{#> header-employment }}
+    {{> header-icon _title="EMPLOYMENT" _section="employment" _hdricon=(lookup . '_icon') }}
+  {{/header-employment}}
+  {{#each r.employment.history}}
+    {{#> body-employment }}
+    <div>
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{{ url }}}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        </h3>
+        <span class="tenure">{{dateRange .}}</span>        
+        <span class="location">{{location}}</span>
+      <p>{{{ summary }}}</p>
+      {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
+    </div>
+    {{/body-employment}}
+  {{/each}}
+</section>
+{{/section}}
diff --git a/themes/positive/src/partials/service.hbs b/themes/positive/src/partials/service.hbs
new file mode 100644
index 0000000..727daa6
--- /dev/null
+++ b/themes/positive/src/partials/service.hbs
@@ -0,0 +1,25 @@
+{{#section "service"}}
+<hr>
+<section id="service">
+  {{#> header-samples }}
+    {{> header-icon _title="SERVICE" _section="service" _hdricon=(lookup . '_icon') }}
+  {{/header-samples}}
+  {{#each r.service.history}}
+    {{#> body-service }}
+    <div>
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{{ url }}}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+    </h3>
+    <span class="tenure">{{dateRange .}}</span>
+    <span class="location">{{location}}</span>
+    <p>{{{ summary }}}</p>
+    {{> highlights }}
+    </div>
+    {{/body-service }}
+  {{/each}}
+</section>
+{{/section}}
diff --git a/themes/positive/src/positive-html.css b/themes/positive/src/positive-html.css
index b1a63f1..2a38a02 100644
--- a/themes/positive/src/positive-html.css
+++ b/themes/positive/src/positive-html.css
@@ -34,27 +34,25 @@ h2 {
 
 h3, .tenure {
   font-size: 1.5em;
-  font-weight: 300;
+  font-weight: 400;
 }
 
 h3 {
   margin-top: 0;
   margin-bottom: 5px;
-  width: 85%;
+  /*width: 85%;*/
   float: left;
 }
 
 table {
   width: 100%;
   text-transform: uppercase;
-  font-size: 1.3em;
 }
 
 td:first-child {
-  text-align: right;
-  color: #c00000;
   letter-spacing: 2px;
-  font-weight: bold;
+  color: #bd5b5b;
+  font-size: 1.35rem;
 }
 
 td:last-child {
@@ -76,7 +74,7 @@ section {
 }
 
 section > div {
-  margin-top: 1em;
+  margin-top: 2em;
   overflow: hidden; /* Clear floated children */
 }
 
@@ -111,11 +109,26 @@ p, li {
   border-radius: 6px;
   padding: 4px 6px;
   font-size: 85%;
+  font-weight: 600;
+  margin-top: 3px;
 }
 
 .location {
-  line-height: 2em;
-  color: #6F6F6F;
+  border: #e2aaaa dashed 1px;
+  background-color: #ffffff;
+  padding: 3px 6px;
+  border-radius: 6px;
+  float: right;
+  margin-right: 5px;
+  float: right;
+  font-size: 85%;
+  color: #717171;
+  font-weight: 600;
+  margin-top: 3px;
+}
+
+.light-bubble {
+
 }
 
 span.keywords {
diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html
index 9d0b41a..e6763f8 100644
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@@ -38,19 +38,19 @@
       {{> section/skills _icon="icon-skills"}}
 
       {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-      {{> section/employment _icon="icon-employment" }}
+      {{> employment _icon="icon-employment"}}
 
       {{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
       {{> section/projects _icon="icon-projects"}}
 
       {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-      {{> section/education _icon="icon-education"}}
+      {{> 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"}}
+      {{> service _icon="icon-service"}}
 
       {{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
       {{> section/samples _icon="icon-samples"}}
diff --git a/themes/positive/theme.json b/themes/positive/theme.json
index d2e3639..51c41aa 100644
--- a/themes/positive/theme.json
+++ b/themes/positive/theme.json
@@ -12,7 +12,7 @@
   },
   "fonts": {
     "all": {
-      "default": [ "Calibri", "Open Sans", "sans-serif" ],
+      "default": [ "Open Sans", "sans-serif" ],
       "heading1": [ "Open Sans", "Helvetica Neue", "Helvetica", "Lato", "sans-serif" ],
       "heading2": [ "Helvetica Neue", "Helvetica", "Lato", "sans-serif" ]
     },