diff --git a/layouts/partials/docs/post-meta.html b/layouts/partials/docs/post-meta.html
index 527431a..01adf8b 100644
--- a/layouts/partials/docs/post-meta.html
+++ b/layouts/partials/docs/post-meta.html
@@ -1,4 +1,4 @@
-{{ with .Date}}
+{{ with .Date }}
   <h5>{{ partial "docs/date" (dict "Date" . "Format" $.Site.Params.BookDateFormat) }}</h5>
 {{ end }}
 
@@ -12,12 +12,12 @@
   {{ end }}
 {{ end }}
 
+{{ if .Params.image }}
 <p>
-{{ if .Params.image}}
   {{ with .Resources.GetMatch .Params.image }}
     <img src={{ .RelPermalink }} />
   {{ else }}
     <img src={{ .Params.image | relURL }} />
   {{ end }}
-{{ end }}
 </p>
+{{ end }}
diff --git a/layouts/posts/list.html b/layouts/posts/list.html
index 12207c8..badf0f6 100644
--- a/layouts/posts/list.html
+++ b/layouts/posts/list.html
@@ -2,7 +2,7 @@
   {{ range sort .Paginator.Pages }}
   <article class="markdown book-post">
     <h2>
-      <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+      <a href="{{ .RelPermalink }}">{{ partial "docs/title.html" . }}</a>
     </h2>
     {{ partial "docs/post-meta" . }}
     <p>
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 79cd303..301ca1e 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
 <article class="markdown">
   <h1>
-    <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+    <a href="{{ .RelPermalink }}">{{ partial "docs/title.html" . }}</a>
   </h1>
   {{ partial "docs/post-meta" . }}
   {{- .Content -}}
diff --git a/layouts/taxonomy/taxonomy.html b/layouts/taxonomy/taxonomy.html
index 12207c8..badf0f6 100644
--- a/layouts/taxonomy/taxonomy.html
+++ b/layouts/taxonomy/taxonomy.html
@@ -2,7 +2,7 @@
   {{ range sort .Paginator.Pages }}
   <article class="markdown book-post">
     <h2>
-      <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+      <a href="{{ .RelPermalink }}">{{ partial "docs/title.html" . }}</a>
     </h2>
     {{ partial "docs/post-meta" . }}
     <p>