diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
new file mode 100644
index 0000000..37853da
--- /dev/null
+++ b/layouts/partials/pagination.html
@@ -0,0 +1,5 @@
+{{ if gt .Paginator.TotalPages 1 }}
+    <div class="pagination">
+        {{ template "_internal/pagination.html" . }}
+    </div>
+{{ end }}
diff --git a/layouts/partials/rss-link.html b/layouts/partials/rss-link.html
new file mode 100644
index 0000000..55f9d1a
--- /dev/null
+++ b/layouts/partials/rss-link.html
@@ -0,0 +1,5 @@
+<span class="rss-link">
+    {{ with .OutputFormats.Get "rss" }}
+    <a href="{{ .Permalink }}" target="_blank" rel="noopener">{{ partial "icon.html" "rss-feed" }}</a>
+    {{ end }}
+</span>
diff --git a/layouts/partials/term-description.html b/layouts/partials/term-description.html
new file mode 100644
index 0000000..a8f9231
--- /dev/null
+++ b/layouts/partials/term-description.html
@@ -0,0 +1,5 @@
+{{ with .Description }}
+    <div class="term-description">
+        <p>{{ . | markdownify }}</p>
+    </div>
+{{ end }}
diff --git a/layouts/series/list.html b/layouts/series/list.html
new file mode 100644
index 0000000..4f1da7b
--- /dev/null
+++ b/layouts/series/list.html
@@ -0,0 +1,14 @@
+{{ define "main" }}
+    <h1>
+        {{ partial "icon.html" "files" }}
+        {{ .Title | markdownify }}
+    </h1>
+
+    <div class="series-taxonomy">
+        <ul>
+            {{ range .Pages }}
+                <li>{{ .Render "series-summary" }}</li>
+            {{ end }}
+        </ul>
+    </div>
+{{ end }}
diff --git a/layouts/series/term.html b/layouts/series/term.html
new file mode 100644
index 0000000..5ffee0f
--- /dev/null
+++ b/layouts/series/term.html
@@ -0,0 +1,23 @@
+{{ define "main" }}
+    <h1>
+        {{ partial "icon.html" "files" }}
+        {{ .Title | markdownify }}
+        {{ partial "rss-link.html" . }}
+    </h1>
+
+    {{ partial "term-description.html" . }}
+
+    <div class="page-list">
+        <ul>
+            {{ range .Paginator.Pages.Reverse }}
+                <li>{{ .Render "summary" }}</li>
+            {{ else }}
+                <div>
+                    {{ i18n "no_posts" }}
+                </div>
+            {{ end }}
+        </ul>
+    </div>
+
+    {{ partial "pagination.html" . }}
+{{ end }}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 986fed8..b2b35f4 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -1,81 +1,23 @@
 {{ define "main" }}
-
-<h1>
-    {{ if eq .Data.Singular "tag" }}
-        {{ partial "icon.html" "tag" }}
-    {{ else if eq .Data.Singular "author" }}
-        {{ partial "icon.html" "user-circle" }}
-    {{ else if eq .Data.Singular "series" }}
-        {{ partial "icon.html" "files" }}
-    {{ else }}
-        {{ partial "icon.html" "filter" }}
-    {{ end }}
-
-    {{ .Title | markdownify }}
-
-    {{ if eq .Kind "term" }}
-    <span class="rss-link">
-        {{ with .OutputFormats.Get "rss" }}
-        <a href="{{ .Permalink }}" target="_blank" rel="noopener">{{ partial "icon.html" "rss-feed" }}</a>
-        {{ end }}
-    </span>
-    {{ end }}
-</h1>
-
-{{ if eq .Kind "taxonomy" }}
-
-{{ if eq .Data.Singular "series" }}
-<div class="series-taxonomy">
-    <ul>
-        {{ range .Pages }}
-        <li>{{ .Render "series-summary" }}</li>
-        {{ end }}
-    </ul>
-</div>
-{{ else }}
-<div class="taxonomy">
-    <ul>
-        {{ range .Pages }}
-        <li>
-            <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-        </li>
-        {{ end }}
-    </ul>
-</div>
-{{ end }}
-
-{{ else }}
-
-
-{{ with .Description }}
-<div class="term-description">
-    <p>{{ . | markdownify }}</p>
-</div>
-{{ end }}
-
-{{ $items := .Paginator.Pages }}
-{{ if eq .Data.Singular "series" }}
-{{ $items = .Paginator.Pages.Reverse }}
-{{ end }}
-<div class="page-list">
-    <ul>
-        {{ range $items }}
-        <li>{{ .Render "summary" }}</li>
+    <h1>
+        {{ if eq .Data.Singular "tag" }}
+            {{ partial "icon.html" "tag" }}
+        {{ else if eq .Data.Singular "author" }}
+            {{ partial "icon.html" "user-circle" }}
         {{ else }}
-        <div>
-            {{ i18n "no_posts" }}
-        </div>
+            {{ partial "icon.html" "filter" }}
         {{ end }}
-    </ul>
-</div>
 
+        {{ .Title | markdownify }}
+    </h1>
 
-{{ if gt .Paginator.TotalPages 1 }}
-<div class="pagination">
-    {{ template "_internal/pagination.html" . }}
-</div>
-{{ end }}
-
-{{ end }}
-
+    <div class="taxonomy">
+        <ul>
+            {{ range .Pages }}
+            <li>
+                <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+            </li>
+            {{ end }}
+        </ul>
+    </div>
 {{ end }}
diff --git a/layouts/taxonomy/term.html b/layouts/taxonomy/term.html
new file mode 100644
index 0000000..e58cc67
--- /dev/null
+++ b/layouts/taxonomy/term.html
@@ -0,0 +1,29 @@
+{{ define "main" }}
+    <h1>
+        {{ if eq .Data.Singular "tag" }}
+            {{ partial "icon.html" "tag" }}
+        {{ else if eq .Data.Singular "author" }}
+            {{ partial "icon.html" "user-circle" }}
+        {{ else }}
+            {{ partial "icon.html" "filter" }}
+        {{ end }}
+
+        {{ .Title | markdownify }}
+        {{ partial "rss-link.html" . }}
+    </h1>
+
+    {{ partial "term-description.html" . }}
+    <div class="page-list">
+        <ul>
+            {{ range .Paginator.Pages }}
+                <li>{{ .Render "summary" }}</li>
+            {{ else }}
+                <div>
+                    {{ i18n "no_posts" }}
+                </div>
+            {{ end }}
+        </ul>
+    </div>
+
+    {{ partial "pagination.html" . }}
+{{ end }}