diff --git a/model/json.go b/model/json.go
index 7eb6e87..0f21cd5 100644
--- a/model/json.go
+++ b/model/json.go
@@ -93,18 +93,23 @@ type SocialProfile struct {
 	URL      string `json:"url"`
 }
 
+type JobHighlight struct {
+	Title string   `json:"title"`
+	Items []string `json:"items"`
+}
+
 // Work is the work details of the resume owner.
 type Work struct {
-	Name         string     `json:"name"`
-	WorkLocation string     `json:"location"`
-	Description  string     `json:"description"`
-	Position     string     `json:"position"`
-	URL          string     `json:"url"`
-	StartDate    ResumeDate `json:"startDate"`
-	EndDate      ResumeDate `json:"endDate"`
-	Summary      string     `json:"summary"`
-	Highlights   []string   `json:"highlights"`
-	Keywords     []string   `json:"keywords"`
+	Name         string         `json:"name"`
+	WorkLocation string         `json:"location"`
+	Description  string         `json:"description"`
+	Position     string         `json:"position"`
+	URL          string         `json:"url"`
+	StartDate    ResumeDate     `json:"startDate"`
+	EndDate      ResumeDate     `json:"endDate"`
+	Summary      string         `json:"summary"`
+	Highlights   []JobHighlight `json:"highlights"`
+	Keywords     []string       `json:"keywords"`
 }
 
 // Volunteer is the volunteer details of the resume owner.
diff --git a/themes/kendall/resume.template b/themes/kendall/resume.template
index b5074bd..5e1b272 100644
--- a/themes/kendall/resume.template
+++ b/themes/kendall/resume.template
@@ -62,7 +62,14 @@
                       <div class="highlights"></div>
                       <ul class="list-group">
                         {{range .Highlights -}}
-                        <li class="list-group-item">{{.}}</li>
+                        <li class="list-group-item">
+				{{.Title}}
+				{{if .Items -}}
+				<ul>
+					{{range .Items}}<li>{{.}}</li>{{end}}
+				</ul>
+				{{- end}}
+			</li>
                         {{- end}}
                       </ul>
                       {{- end}}
diff --git a/themes/kendallfr/resume.template b/themes/kendallfr/resume.template
index 2978a3b..eb5777f 100644
--- a/themes/kendallfr/resume.template
+++ b/themes/kendallfr/resume.template
@@ -63,7 +63,14 @@
                       <div class="highlights"></div>
                       <ul class="list-group">
                         {{range .Highlights -}}
-                        <li class="list-group-item">{{.}}</li>
+                        <li class="list-group-item">
+				{{.Title}}
+				{{if .Items -}}
+				<ul>
+					{{range .Items}}<li>{{.}}</li>{{end}}
+				</ul>
+				{{- end}}
+			</li>
                         {{- end}}
                       </ul>
                       {{- end}}
diff --git a/themes/stackoverflow/resume.template b/themes/stackoverflow/resume.template
index bfed6c1..a2ca59a 100644
--- a/themes/stackoverflow/resume.template
+++ b/themes/stackoverflow/resume.template
@@ -156,7 +156,15 @@
 							{{if $w.Summary}}<div class="summary"><p>{{$w.Summary}}</p></div>{{end}}
 							{{if $w.Highlights -}}
 							<ul class="highlights">
-								{{range $w.Highlights}}<li>{{.}}</li>{{end}}
+								{{range $w.Highlights -}}
+								<li>{{.Title}}
+									{{if .Items -}}
+									<ul>
+										{{range .Items}}<li>{{.}}</li>{{end}}
+									</ul>
+									{{- end}}
+								</li>
+								{{- end}}
 							</ul>{{end}}
 						</div>
 					</section>
diff --git a/themes/stackoverflowfr/resume.template b/themes/stackoverflowfr/resume.template
index 8481df1..f365b3c 100644
--- a/themes/stackoverflowfr/resume.template
+++ b/themes/stackoverflowfr/resume.template
@@ -156,7 +156,15 @@
 							{{if $w.Summary}}<div class="summary"><p>{{$w.Summary}}</p></div>{{end}}
 							{{if $w.Highlights -}}
 							<ul class="highlights">
-								{{range $w.Highlights}}<li>{{.}}</li>{{end}}
+								{{range $w.Highlights -}}
+								<li>{{.Title}}
+									{{if .Items -}}
+									<ul>
+										{{range .Items}}<li>{{.}}</li>{{end}}
+									</ul>
+									{{- end}}
+								</li>
+								{{- end}}
 							</ul>{{end}}
 						</div>
 					</section>