diff --git a/partials/html/header-icon.html b/partials/html/header-icon.html
new file mode 100644
index 0000000..63b0140
--- /dev/null
+++ b/partials/html/header-icon.html
@@ -0,0 +1,6 @@
+<header>
+  {{#if _icon}}
+  {{> (lookup . '_hdricon') }}
+  {{/if}}
+  <h2>{{{sectionTitle _title _section}}}</h2>
+</header>
diff --git a/partials/html/highlights.html b/partials/html/highlights.html
index f453c8f..e06e47a 100644
--- a/partials/html/highlights.html
+++ b/partials/html/highlights.html
@@ -1,7 +1,7 @@
 {{#if highlights}}
 <ul>
   {{#each highlights}}
-  <li>{{{ this }}}</li>
+  <li>{{{ . }}}</li>
   {{/each}}
 </ul>
 {{/if}}
diff --git a/partials/html/section/education.html b/partials/html/section/education.html
index 8883abf..b634c2f 100644
--- a/partials/html/section/education.html
+++ b/partials/html/section/education.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="education">
   {{#> header-education }}
-    {{> header-simple _title="EDUCATION" _section="education" }}
-    {{#> icon-education }}{{/icon-education}}
+    {{> header-icon _title="EDUCATION" _section="education" _hdricon=(lookup . '_icon') }}
   {{/header-education}}
   {{#each r.education.history}}
     <div>
diff --git a/partials/html/section/employment.html b/partials/html/section/employment.html
index a1f0652..83629df 100644
--- a/partials/html/section/employment.html
+++ b/partials/html/section/employment.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="employment">
   {{#> header-employment }}
-    {{> header-simple _title="EMPLOYMENT" _section="employment" }}
-    {{#> icon-employment }}{{/icon-employment}}
+    {{> header-icon _title="EMPLOYMENT" _section="employment" _hdricon=(lookup . '_icon') }}
   {{/header-employment}}
 
   {{#each r.employment.history}}
diff --git a/partials/html/section/projects.html b/partials/html/section/projects.html
index ae5069d..f2c05c0 100644
--- a/partials/html/section/projects.html
+++ b/partials/html/section/projects.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="projects">
   {{#> header-projects }}
-    {{> header-simple _title="PROJECTS" _section="projects" }}
-    {{#> icon-projects }}{{/icon-projects}}
+    {{> header-icon _title="PROJECTS" _section="projects" _hdricon=(lookup . '_icon') }}
   {{/header-projects}}
   {{#each r.projects }}
     <div>
diff --git a/partials/html/section/recognition.html b/partials/html/section/recognition.html
index d8f9285..ea30bf8 100644
--- a/partials/html/section/recognition.html
+++ b/partials/html/section/recognition.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="recognition">
   {{#> header-recognition }}
-    {{> header-simple _title="RECOGNITION" _section="recognition" }}
-    {{#> icon-recognition }}{{/icon-recognition}}
+    {{> header-icon _title="RECOGNITION" _section="recognition" _hdricon=(lookup . '_icon') }}
   {{/header-recognition}}
   {{#each r.recognition}}
     <div>
diff --git a/partials/html/section/references.html b/partials/html/section/references.html
index 141ad59..e27d024 100644
--- a/partials/html/section/references.html
+++ b/partials/html/section/references.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="references">
   {{#> header-references }}
-    {{> header-simple _title="REFERENCES" _section="references" }}
-    {{#> icon-references }}{{/icon-references}}
+    {{> header-icon _title="REFERENCES" _section="references" _hdricon=(lookup . '_icon') }}
   {{/header-references}}
   {{#each r.references}}
     <div>
diff --git a/partials/html/section/samples.html b/partials/html/section/samples.html
index af79ad6..ec02658 100644
--- a/partials/html/section/samples.html
+++ b/partials/html/section/samples.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="samples">
   {{#> header-samples }}
-    {{> header-simple _title="SAMPLES" _section="samples" }}
-    {{#> icon-samples }}{{/icon-samples}}
+    {{> header-icon _title="SAMPLES" _section="samples" _hdricon=(lookup . '_icon') }}
   {{/header-samples}}
   {{#each r.samples}}
     <div>
diff --git a/partials/html/section/service.html b/partials/html/section/service.html
index e7f6672..497744e 100644
--- a/partials/html/section/service.html
+++ b/partials/html/section/service.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="service">
   {{#> header-samples }}
-    {{> header-simple _title="SERVICE" _section="service" }}
-    {{#> icon-service }}{{/icon-service}}
+    {{> header-icon _title="SERVICE" _section="service" _hdricon=(lookup . '_icon') }}
   {{/header-samples}}
   {{#each r.service.history}}
     <div>
diff --git a/partials/html/section/skills.html b/partials/html/section/skills.html
index 7d59035..58ecf65 100644
--- a/partials/html/section/skills.html
+++ b/partials/html/section/skills.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="skills">
   {{#> header-skills }}
-    {{> header-simple _title="SKILLS" _section="skills" }}
-    {{#> icon-skills }}{{/icon-skills}}
+    {{> header-icon _title="SKILLS" _section="skills" _hdricon=(lookup . '_icon') }}
   {{/header-skills}}
   <table>
     <thead>
@@ -16,7 +15,7 @@
       {{#each r.skills.sets}}
       <tr>
         <td style="width: 25%;">{{ name }}</td>
-        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+        <td class="keywords">{{#each skills}}{{ . }} {{/each}}</td>
       </tr>
       {{/each}}
     </tbody>
diff --git a/partials/html/section/speaking.html b/partials/html/section/speaking.html
index b6f7d65..9690625 100644
--- a/partials/html/section/speaking.html
+++ b/partials/html/section/speaking.html
@@ -2,13 +2,12 @@
 <hr>
 <section id="speaking">
   {{#> header-speaking }}
-    {{> header-simple _title="SPEAKING" _section="speaking" }}
-    {{#> icon-speaking }}{{/icon-speaking}}
+    {{> header-icon _title="SPEAKING" _section="speaking" _hdricon=(lookup . '_icon') }}
   {{/header-speaking}}
   {{#each r.speaking}}
     <div>
     <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
-    {{ summary }}
+    {{{ summary }}}
     {{> highlights }}
     </div>
   {{/each}}
diff --git a/partials/html/section/testimonials.html b/partials/html/section/testimonials.html
index f53dcbe..8f3d12e 100644
--- a/partials/html/section/testimonials.html
+++ b/partials/html/section/testimonials.html
@@ -2,13 +2,12 @@
 <hr>
 <section id="testimonials">
   {{#> header-testimonials }}
-    {{> header-simple _title="TESTIMONIALS" _section="testimonials" }}
-    {{#> icon-testimonials }}{{/icon-testimonials}}
+    {{> header-icon _title="TESTIMONIALS" _section="testimonials" _hdricon=(lookup . '_icon') }}
   {{/header-testimonials}}
   {{#each r.testimonials}}
     <div>
     <h3><em>{{ name }}</em></h3>
-    {{{ quote }}}
+    <p>{{{ quote }}}</p>
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/writing.html b/partials/html/section/writing.html
index e7ea8ed..8727d71 100644
--- a/partials/html/section/writing.html
+++ b/partials/html/section/writing.html
@@ -2,8 +2,7 @@
 <hr>
 <section id="writing">
   {{#> header-writing }}
-    {{> header-simple _title="WRITING" _section="writing" }}
-    {{#> icon-writing }}{{/icon-writing}}
+    {{> header-icon _title="WRITING" _section="writing" _hdricon=(lookup . '_icon') }}
   {{/header-writing}}
   {{#each r.writing }}
     <div>
diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html
index 411bcc9..c1867bd 100644
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@@ -68,34 +68,34 @@
 -->}}
 
 {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-{{> section/employment }}
+{{> section/employment _icon="icon-employment"}}
 
 {{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-{{> section/projects }}
+{{> section/projects _icon="icon-projects"}}
 
 {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-{{> section/education }}
+{{> section/education _icon="icon-education"}}
 
 {{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
-{{> section/service }}
+{{> section/service _icon="icon-service"}}
 
 {{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
-{{> section/samples }}
+{{> section/samples _icon="icon-samples"}}
 
 {{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
-{{> section/writing }}
+{{> section/writing _icon="icon-writing"}}
 
 {{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
-{{> section/recognition }}
+{{> section/recognition _icon="icon-recognition"}}
 
 {{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
-{{> section/speaking }}
+{{> section/speaking _icon="icon-speaking"}}
 
 {{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-{{> section/testimonials }}
+{{> section/testimonials _icon="icon-testimonials"}}
 
 {{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-{{> section/references }}
+{{> section/references _icon="icon-references"}}
 
       </div>
     </main>
diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html
index 4ae67ef..55dab6b 100644
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@@ -35,37 +35,37 @@
       -->}}
 
       {{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-      {{> section/skills }}
+      {{> section/skills _icon="icon-skills"}}
 
       {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-      {{> section/employment }}
+      {{> section/employment _icon="icon-employment" }}
 
       {{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-      {{> section/projects }}
+      {{> section/projects _icon="icon-projects"}}
 
       {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-      {{> section/education }}
+      {{> section/education _icon="icon-education"}}
 
       {{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
-      {{> section/service }}
+      {{> section/service _icon="icon-service"}}
 
       {{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
-      {{> section/samples }}
+      {{> section/samples _icon="icon-samples"}}
 
       {{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
-      {{> section/writing }}
+      {{> section/writing _icon="icon-writing"}}
 
       {{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
-      {{> section/recognition }}
+      {{> section/recognition _icon="icon-recognition"}}
 
       {{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
-      {{> section/speaking }}
+      {{> section/speaking _icon="icon-speaking"}}
 
       {{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-      {{> section/testimonials }}
+      {{> section/testimonials _icon="icon-testimonials"}}
 
       {{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-      {{> section/references }}
+      {{> section/references _icon="icon-references"}}
 
     </main>
   </body>
diff --git a/themes/positive/src/positive-pdf.html b/themes/positive/src/positive-pdf.html
index 8d22b45..3d0a98f 100644
--- a/themes/positive/src/positive-pdf.html
+++ b/themes/positive/src/positive-pdf.html
@@ -36,37 +36,37 @@
       -->}}
 
       {{#*inline "icon-skills"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-      {{> section/skills }}
+      {{> section/skills _icon="icon-skills"}}
 
       {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-      {{> section/employment }}
+      {{> section/employment _icon="icon-employment" }}
 
       {{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-      {{> section/projects }}
+      {{> section/projects _icon="icon-projects"}}
 
       {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-      {{> section/education }}
+      {{> section/education _icon="icon-education"}}
 
       {{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
-      {{> section/service }}
+      {{> section/service _icon="icon-service"}}
 
       {{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
-      {{> section/samples }}
+      {{> section/samples _icon="icon-samples"}}
 
       {{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
-      {{> section/writing }}
+      {{> section/writing _icon="icon-writing"}}
 
       {{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
-      {{> section/recognition }}
+      {{> section/recognition _icon="icon-recognition"}}
 
       {{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
-      {{> section/speaking }}
+      {{> section/speaking _icon="icon-speaking"}}
 
       {{#*inline "icon-testimonials"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-      {{> section/testimonials }}
+      {{> section/testimonials _icon="icon-testimonials"}}
 
       {{#*inline "icon-references"}}<span class="fa fa-lg fa-thumbs-o-up"></span>{{/inline}}
-      {{> section/references }}
+      {{> section/references _icon="icon-references"}}
 
     </main>
   </body>