diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
new file mode 100644
index 000000000..7eb4923e0
--- /dev/null
+++ b/templates/taxonomy_list.html
@@ -0,0 +1,42 @@
+{% extends "index.html" %}
+
+{% block main_content %}
+
+{%- set title = macros_translate::translate(key=taxonomy.name, default=taxonomy.name, language_strings=language_strings) -%}
+
+{{ macros_page_header::page_header(title=title)}}
+
+{% set tag_count = terms | length %}
+<div id="tag-cloud" class="{% if tag_count > 16 %}three-columns{% elif tag_count > 8 %}two-columns{% endif %}">
+    <ul class="tags">
+        {%- for term in terms -%}
+            <li class="tags-item">
+                {% if config.extra.compact_tags %}
+                    {# Shows the number of posts per tag as a superscript #}
+                    <a href="{{ term.permalink | safe }}"
+                       aria-label="{{ term.name }} – 
+                        {{ term.pages | length }} 
+                        {% if term.pages | length == 1 -%}
+                            {{- macros_translate::translate(key="post", default="post", language_strings=language_strings) -}}
+                        {%- else -%}
+                            {{- macros_translate::translate(key="posts", default="posts", language_strings=language_strings) -}}
+                        {%- endif -%}">
+                        {{ term.name }}
+                    </a> <sup>{{ term.pages | length }}</sup>
+                {% else %}
+                    <a href="{{ term.permalink | safe }}">
+                        {{ term.name }}</a>
+                        – {{ term.pages | length }}{%- if term.pages | length == 1 %}
+                        {# Only one post. Singular. #}
+                            {{- macros_translate::translate(key="post", default="post", language_strings=language_strings) -}}
+                        {% elif term.pages | length > 1 %}
+                        {# More than one post per tag. Plural. #}
+                            {{- macros_translate::translate(key="posts", default="posts", language_strings=language_strings) -}}
+                        {%- endif -%}
+                {% endif %}
+            </li>
+        {%- endfor -%}
+    </ul>
+</div>
+
+{% endblock main_content %}
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
new file mode 100644
index 000000000..a1bad8da1
--- /dev/null
+++ b/templates/taxonomy_single.html
@@ -0,0 +1,16 @@
+{% extends "index.html" %}
+
+{% block main_content %}
+
+{{ macros_page_header::page_header(title=term.name) }}
+
+{% set max = section.extra.max_posts | default(value=999999) %}
+{{ macros_list_posts::list_posts(posts=term.pages, max=max) }}
+
+<ul class="pagination">
+    <li class="page-item">
+        <a class="all-tags" href="{{ get_url(path="tags", lang=lang) }}/">←&nbsp;{{- macros_translate::translate(key=taxonomy.name, default=taxonomy.name, language_strings=language_strings) -}}</a>
+    </li>
+</ul>
+
+{% endblock main_content %}