diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 4c70c18a99..bbb24c8be8 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1 +1,30 @@
-{{- partial "_taxonomy.html" . }}
\ No newline at end of file
+{{- partialCached "page-meta.hugo" . .RelPermalink }}
+{{- partial "header.html" . }}
+          <article>
+{{- $page := . }}
+
+{{- $title := i18n .Data.Plural }}
+{{- if not $title }}
+  {{- $title = .Data.Plural | humanize }}
+{{- end }}
+<h1 id="{{ $title | anchorize }}">{{ $title }}</h1>
+<ul>
+  {{- range .Data.Terms.Alphabetical }}
+    {{- $c:=""}}{{/* display terms of a taxonomy */}}
+    {{- $len := 0 }}
+    {{- range .Pages }}
+      {{- $c:=""}}{{/* count pages of term */}}
+      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
+        {{- $len = add $len 1 }}
+      {{- end }}
+    {{- end }}
+    {{- if $len }}
+  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page) }}">{{ .Page.Title }}</a> ({{ $len }})</li>
+    {{- end }}
+  {{- end }}
+</ul>
+
+            <footer class="footline">
+            </footer>
+          </article>
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
new file mode 100644
index 0000000000..f9951a453b
--- /dev/null
+++ b/layouts/_default/term.html
@@ -0,0 +1,24 @@
+{{- partialCached "page-meta.hugo" . .RelPermalink }}
+{{- partial "header.html" . }}
+          <article>
+{{- $page := . }}
+
+{{- $title := i18n .Data.Singular }}
+{{- if not $title }}
+  {{- $title = .Data.Singular | humanize }}
+{{- end }}
+{{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (.Title | humanize) }}
+<h1 id="{{ $title | anchorize }}">{{ $title }}</h1>
+<ul>
+  {{- range sort .Pages "Title" }}
+    {{- $c:=""}}{{/* display pages of a term */}}
+    {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
+  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}">{{ .Title }}</a></li>
+    {{- end }}
+  {{- end }}
+</ul>
+
+            <footer class="footline">
+            </footer>
+          </article>
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/_taxonomy.html b/layouts/partials/_taxonomy.html
deleted file mode 100644
index 8cce078fe1..0000000000
--- a/layouts/partials/_taxonomy.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{{- partialCached "page-meta.hugo" . .RelPermalink }}
-{{- partial "header.html" . }}
-          <article>
-{{- $page := . }}
-
-{{- $title := "" }}
-{{- if eq .Kind "taxonomy" }}
-  {{- $title = i18n .Data.Plural }}
-  {{- if not $title }}
-    {{- $title = .Data.Plural | humanize }}
-  {{- end }}
-{{- else }}
-  {{- $title = i18n .Data.Singular }}
-  {{- if not $title }}
-    {{- $title = .Data.Singular | humanize }}
-  {{- end }}
-  {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (.Title | humanize) }}
-{{- end }}
-<h1 id="{{ $title | anchorize }}">{{ $title }}</h1>
-<ul>
-  {{- range .Data.Terms.Alphabetical }}
-    {{- $c:=""}}{{/* display terms of a taxonomy */}}
-    {{- $len := 0 }}
-    {{- range .Pages }}
-      {{- $c:=""}}{{/* count pages of term */}}
-      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
-        {{- $len = add $len 1 }}
-      {{- end }}
-    {{- end }}
-    {{- if $len }}
-  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page) }}">{{ .Page.Title }}</a> ({{ $len }})</li>
-    {{- end }}
-  {{- else }}
-    {{- range sort .Pages "Title" }}
-      {{- $c:=""}}{{/* display pages of a term */}}
-      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}">{{ .Title }}</a></li>
-      {{- end }}
-    {{- end }}
-  {{- end }}
-</ul>
-
-            <footer class="footline">
-            </footer>
-          </article>
-{{- partial "footer.html" . }}
\ No newline at end of file