diff --git a/layouts/partials/data/title.html b/layouts/partials/data/title.html
index 91db60c..85a7bc7 100644
--- a/layouts/partials/data/title.html
+++ b/layouts/partials/data/title.html
@@ -1,16 +1,38 @@
 {{- $title := .Title -}}
 {{- $siteTitle := .Site.Title -}}
-{{- $authorName := .Site.Author.name -}}
 
 {{- if .IsHome -}}
+    <!-- Homepage, and it's pagination -->
+
+    <!-- Build paginator -->
     {{ $pages := where .Site.RegularPages "Section" "in" .Site.Params.mainSections }}
     {{ $notHidden := where .Site.RegularPages "Params.hidden" "!=" true }}
     {{ $filtered := ($pages | intersect $notHidden) }}
     {{ $pag := .Paginate ($filtered) }}
-    {{ if .Paginator.HasPrev }}{{ .Paginator }} - {{ end }}{{ $siteTitle }}
+
+    {{ if .Paginator.HasPrev }}
+        <!-- Paginated. Append page number to title -->
+        {{ $title = printf "%s - %s" .Paginator $siteTitle }}
+    {{ else }}
+        {{ $title = $siteTitle}}
+    {{ end }}
 {{- else if eq .Kind "term" -}}
-	{{- $pag := .Paginate (where .Data.Pages "Type" "post") -}}
-  	{{ title .Data.Singular }}: {{ $title }}{{ if .Paginator.HasPrev }} - {{ .Paginator }}{{ end }} - {{ $siteTitle }}
-{{- else -}}
-    {{- $title -}}
-{{- end -}}
\ No newline at end of file
+    <!-- Taxonomy page -->
+
+    <!-- Build paginator -->
+    {{ $notHidden := where .Pages "Params.hidden" "!=" true }}
+    {{ $pag := .Paginate ($notHidden) }}
+
+    <!-- {TAXONOMY_TYPE}: {TAXONOMY_TERM} -->
+    {{ $title = slice (title .Data.Singular) ": " $title }}
+
+    {{ if .Paginator.HasPrev }}
+        <!-- Add page number-->
+        {{ $title = $title | append " - " .Paginator }}
+    {{ end }} 
+
+    {{ $title = $title | append " - " $siteTitle }}
+    {{ $title = delimit $title "" }}
+{{- end -}}
+
+{{ return $title }}
\ No newline at end of file
diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
index 894c0bb..eb9cc0f 100644
--- a/layouts/partials/head/head.html
+++ b/layouts/partials/head/head.html
@@ -2,8 +2,9 @@
     <meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width, initial-scale=1'>
     <meta name='description' content='{{ chomp (partial "data/description" . | plainify ) }}'>
-    
-	<title>{{ (trim (partial "data/title" .) "\n" ) | safeHTML }}</title>
+
+    {{- $title := partial "data/title" . -}}
+	<title>{{ $title }}</title>
     <link rel='canonical' href='{{ .Permalink }}'>
     
     {{- partial "head/style.html" . -}}