diff --git a/partials/html/header-simple.html b/partials/html/header-simple.html
new file mode 100644
index 0000000..fe8d7b0
--- /dev/null
+++ b/partials/html/header-simple.html
@@ -0,0 +1,3 @@
+<header>
+<h2>{{{sectionTitle _title _section}}}</h2>
+</header>
diff --git a/partials/html/highlights.html b/partials/html/highlights.html
new file mode 100644
index 0000000..f453c8f
--- /dev/null
+++ b/partials/html/highlights.html
@@ -0,0 +1,7 @@
+{{#if highlights}}
+<ul>
+  {{#each highlights}}
+  <li>{{{ this }}}</li>
+  {{/each}}
+</ul>
+{{/if}}
diff --git a/partials/html/section/education.html b/partials/html/section/education.html
index b46fd1f..8883abf 100644
--- a/partials/html/section/education.html
+++ b/partials/html/section/education.html
@@ -1,14 +1,15 @@
 {{#section "education"}}
 <hr>
 <section id="education">
-  <header>
-    <h2>{{{sectionTitle "Education"}}}</h2>
+  {{#> header-education }}
+    {{> header-simple _title="EDUCATION" _section="education" }}
     {{#> icon-education }}{{/icon-education}}
-  </header>
+  {{/header-education}}
   {{#each r.education.history}}
     <div>
     <h3>{{{ institution }}}</h3>
     <span class="tenure">{{dateRange .}}</span>
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/employment.html b/partials/html/section/employment.html
index bb0f12f..b52a4c0 100644
--- a/partials/html/section/employment.html
+++ b/partials/html/section/employment.html
@@ -1,10 +1,11 @@
 {{#section "employment"}}
 <hr>
 <section id="employment">
-  <header>
-  <h2>{{{sectionTitle "Employment"}}}</h2>
-  {{#> icon-employment }}{{/icon-employment}}
-  </header>
+  {{#> header-employment }}
+    {{> header-simple _title="EMPLOYMENT" _section="employment" }}
+    {{#> icon-employment }}{{/icon-employment}}
+  {{/header-employment}}
+
   {{#each r.employment.history}}
     <div>
       <h3><em>{{ position }}</em>,
@@ -18,14 +19,8 @@
         {{#if keywords}}
         | <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
         {{/if}}
-      <p style="clear: both;">{{{ summary }}}</p>
-      {{#if highlights}}
-        <ul>
-        {{#each highlights}}
-          <li>{{{ this }}}</li>
-        {{/each}}
-        </ul>
-      {{/if}}
+      <p>{{{ summary }}}</p>
+      {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/projects.html b/partials/html/section/projects.html
index 7cefc13..ae5069d 100644
--- a/partials/html/section/projects.html
+++ b/partials/html/section/projects.html
@@ -1,10 +1,10 @@
 {{#section 'projects'}}
 <hr>
 <section id="projects">
-  <header>
-  <h2>{{{sectionTitle "Projects"}}}</h2>
-  {{#> icon-projects }}{{/icon-projects}}
-  </header>
+  {{#> header-projects }}
+    {{> header-simple _title="PROJECTS" _section="projects" }}
+    {{#> icon-projects }}{{/icon-projects}}
+  {{/header-projects}}
   {{#each r.projects }}
     <div>
     <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
@@ -19,13 +19,7 @@
     {{#if start}}| {{/if}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
     {{/if}}
     {{{ summary }}}
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{{ this }}}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/recognition.html b/partials/html/section/recognition.html
index dcc526c..d8f9285 100644
--- a/partials/html/section/recognition.html
+++ b/partials/html/section/recognition.html
@@ -1,14 +1,15 @@
 {{#section "recognition"}}
 <hr>
-<section id="awards">
-  <header>
-  <h2>{{{sectionTitle "recognition" "Awards"}}}</h2>
-  {{#> icon-recognition }}{{/icon-recognition}}
-  </header>
+<section id="recognition">
+  {{#> header-recognition }}
+    {{> header-simple _title="RECOGNITION" _section="recognition" }}
+    {{#> icon-recognition }}{{/icon-recognition}}
+  {{/header-recognition}}
   {{#each r.recognition}}
     <div>
     <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
     {{ summary }}
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/references.html b/partials/html/section/references.html
index 080de1d..141ad59 100644
--- a/partials/html/section/references.html
+++ b/partials/html/section/references.html
@@ -1,10 +1,10 @@
 {{#section "references"}}
 <hr>
-<section id="awards">
-  <header>
-  <h2>{{{sectionTitle "references" "References"}}}</h2>
-  {{#> icon-references }}{{/icon-references}}
-  </header>
+<section id="references">
+  {{#> header-references }}
+    {{> header-simple _title="REFERENCES" _section="references" }}
+    {{#> icon-references }}{{/icon-references}}
+  {{/header-references}}
   {{#each r.references}}
     <div>
     <h3><em>{{ name }}</em></h3>
diff --git a/partials/html/section/samples.html b/partials/html/section/samples.html
index 7407385..af79ad6 100644
--- a/partials/html/section/samples.html
+++ b/partials/html/section/samples.html
@@ -1,10 +1,10 @@
 {{#section 'samples'}}
 <hr>
 <section id="samples">
-  <header>
-  <h2>{{{sectionTitle "Samples"}}}</h2>
-  {{#> icon-samples }}{{/icon-samples}}
-  </header>
+  {{#> header-samples }}
+    {{> header-simple _title="SAMPLES" _section="samples" }}
+    {{#> icon-samples }}{{/icon-samples}}
+  {{/header-samples}}
   {{#each r.samples}}
     <div>
     <h3>
@@ -15,13 +15,7 @@
     {{/if}}
     <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span></h3>
     {{{ summary }}}
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{{ this }}}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/service.html b/partials/html/section/service.html
index a5a9b1a..eca6e14 100644
--- a/partials/html/section/service.html
+++ b/partials/html/section/service.html
@@ -1,10 +1,10 @@
 {{#section "service"}}
 <hr>
-<section id="volunteer">
-  <header>
-  <h2>{{{sectionTitle "Service"}}}</h2>
-  {{#> icon-service }}{{/icon-service}}
-  </header>
+<section id="service">
+  {{#> header-samples }}
+    {{> header-simple _title="SERVICE" _section="service" }}
+    {{#> icon-service }}{{/icon-service}}
+  {{/header-samples}}
   {{#each r.service.history}}
     <div>
     <h3><em>{{ position }}</em>,
@@ -16,13 +16,7 @@
     </h3>
     <span class="tenure">{{dateRange .}}</span>
     <p style="clear: both;">{{{ summary }}}</p>
-    {{#if highlights}}
-      <ul>
-      {{#each highlights}}
-        <li>{{{ this }}}</li>
-      {{/each}}
-      </ul>
-    {{/if}}
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/skills.html b/partials/html/section/skills.html
index a36a262..7d59035 100644
--- a/partials/html/section/skills.html
+++ b/partials/html/section/skills.html
@@ -1,10 +1,10 @@
 {{#section "skills"}}
 <hr>
 <section id="skills">
-  <header>
-  <h2>{{{sectionTitle "Skills"}}}</h2>
-  {{#> icon-skills }}{{/icon-skills}}  
-  </header>
+  {{#> header-skills }}
+    {{> header-simple _title="SKILLS" _section="skills" }}
+    {{#> icon-skills }}{{/icon-skills}}
+  {{/header-skills}}
   <table>
     <thead>
       <tr>
diff --git a/partials/html/section/speaking.html b/partials/html/section/speaking.html
index 7b31dc4..b6f7d65 100644
--- a/partials/html/section/speaking.html
+++ b/partials/html/section/speaking.html
@@ -1,14 +1,15 @@
 {{#section "speaking"}}
 <hr>
 <section id="speaking">
-  <header>
-  <h2>{{{sectionTitle "speaking" "Speaking Engagements"}}}</h2>
-  {{#> icon-speaking }}{{/icon-speaking}}
-  </header>
+  {{#> header-speaking }}
+    {{> header-simple _title="SPEAKING" _section="speaking" }}
+    {{#> icon-speaking }}{{/icon-speaking}}
+  {{/header-speaking}}
   {{#each r.speaking}}
     <div>
     <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
     {{ summary }}
+    {{> highlights }}
     </div>
   {{/each}}
 </section>
diff --git a/partials/html/section/testimonials.html b/partials/html/section/testimonials.html
index bb41065..f53dcbe 100644
--- a/partials/html/section/testimonials.html
+++ b/partials/html/section/testimonials.html
@@ -1,10 +1,10 @@
 {{#section "testimonials"}}
 <hr>
-<section id="awards">
-  <header>
-  <h2>{{{sectionTitle "testimonials" "Testimonials"}}}</h2>
-  {{#> icon-testimonials }}{{/icon-testimonials}}
-  </header>
+<section id="testimonials">
+  {{#> header-testimonials }}
+    {{> header-simple _title="TESTIMONIALS" _section="testimonials" }}
+    {{#> icon-testimonials }}{{/icon-testimonials}}
+  {{/header-testimonials}}
   {{#each r.testimonials}}
     <div>
     <h3><em>{{ name }}</em></h3>
diff --git a/partials/html/section/writing.html b/partials/html/section/writing.html
index ca6095d..e7ea8ed 100644
--- a/partials/html/section/writing.html
+++ b/partials/html/section/writing.html
@@ -1,16 +1,17 @@
 {{#section "writing"}}
 <hr>
-<section id="publications">
-  <header>
-  <h2>{{{sectionTitle "Writing"}}}</h2>
-  {{#> icon-writing }}{{/icon-writing}}
-  </header>
+<section id="writing">
+  {{#> header-writing }}
+    {{> header-simple _title="WRITING" _section="writing" }}
+    {{#> icon-writing }}{{/icon-writing}}
+  {{/header-writing}}
   {{#each r.writing }}
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
       {{ publisher.name }}</h3>
       <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
       {{{ summary }}}
+      {{> highlights }}
     </div>
   {{/each}}
 </section>