diff --git a/templates/categories.html b/templates/categories.html
new file mode 100644
index 0000000..720aad4
--- /dev/null
+++ b/templates/categories.html
@@ -0,0 +1,19 @@
+{% extends "index.html" %}
+
+{% block content %}
+    {% block header %}
+        {{ super() }}
+    {% endblock header %}
+
+    <h1>Categories</h1>
+
+    {% if categories %}
+        <ul>
+            {% for category in categories %}
+                <li>
+                    <a href="{{ category.permalink }}">{{ category.name }}</a>({{ category.pages | length }})
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+{% endblock content %}
diff --git a/templates/category.html b/templates/category.html
new file mode 100644
index 0000000..208e662
--- /dev/null
+++ b/templates/category.html
@@ -0,0 +1,14 @@
+{% extends "index.html" %}
+{% import "post_macros.html" as post_macros %}
+
+{% block content %}
+    {% block header %}
+        {{ super() }}
+    {% endblock header %}
+
+    <h1>{{ category.name }}</h1>
+
+    {% for page in category.pages %}
+        {{ post_macros::page_in_list(page=page) }}
+    {% endfor %}
+{% endblock content %}
diff --git a/templates/index.html b/templates/index.html
index 392073d..6ff4604 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -25,19 +25,21 @@
 
     <body class="hack dark main container">
         {% block content %}
-            {% if config.extra.after_dark_menu %}
-                <header>
-                    <nav itemscope itemtype="http://schema.org/SiteNavigationElement">
-                    {% for item in config.extra.after_dark_menu %}
-                        <a itemprop="url"
-                           class="{% if item.url | replace(from="$BASE_URL", to=config.base_url) == current_url %}active{% endif %}"
-                           href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
-                            <span itemprop="name">{{ item.name }}
-                            </span></a>
-                    {% endfor %}
-                    </nav>
-                </header>
-            {% endif %}
+            {% block header %}
+                {% if config.extra.after_dark_menu %}
+                    <header>
+                        <nav itemscope itemtype="http://schema.org/SiteNavigationElement">
+                        {% for item in config.extra.after_dark_menu %}
+                            <a itemprop="url"
+                               class="{% if item.url | replace(from="$BASE_URL", to=config.base_url) == current_url %}active{% endif %}"
+                               href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
+                                <span itemprop="name">{{ item.name }}
+                                </span></a>
+                        {% endfor %}
+                        </nav>
+                    </header>
+                {% endif %}
+            {% endblock header %}
 
             <main>
                 {% if config.extra.after_dark_title %}
@@ -46,20 +48,7 @@
                     </header>
                 {% endif %}
                 {% for page in paginator.pages %}
-                    <article itemscope itemtype="http://schema.org/CreativeWork">
-                        <header>
-                            <h2 itemprop="name">
-                                <a href="{{ page.permalink }}">{{ page.title }}</a>
-                            </h2>
-                            <span class="muted">{{ post_macros::meta(page=page) }}</span>
-                        </header>
-                        {% if page.summary %}
-                            <div itemprop="summary">
-                                {{ page.summary | safe }}
-                                <nav class="readmore"><a itemprop="url" href="{{ page.permalink }}">Read More&nbsp;&raquo;</a></nav>
-                            </div>
-                        {% endif %}
-                    </article>
+                    {{ post_macros::page_in_list(page=page) }}
                 {% endfor %}
 
                 <nav>
diff --git a/templates/page.html b/templates/page.html
index aaf332f..3f42dc1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -19,6 +19,24 @@
                 {% if config.extra.author %}
                     Published by {{ config.extra.author }}
                 {% endif %}
+                {% if page.category %}
+                    in <a href="{{ get_taxonomy_url(kind="category", name=page.category) }}">{{ page.category }}</a>
+                {% endif %}
+                {% if page.tags %}
+                    and tagged
+                    {% for tag in page.tags %}
+                        <a href="{{ get_taxonomy_url(kind="tag", name=tag) }}">{{ tag }}</a>
+                        {% if page.tags | length > 1 %}
+                            {% if loop.index != page.tags | length %}
+                                {% if loop.index == page.tags | length - 1 %}
+                                    and
+                                {% else %}
+                                    ,
+                                {% endif %}
+                            {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
             </p>
         </footer>
     {% endblock page_footer %}
diff --git a/templates/post_macros.html b/templates/post_macros.html
index 2e34188..e5b42bf 100644
--- a/templates/post_macros.html
+++ b/templates/post_macros.html
@@ -14,3 +14,20 @@
 
     Published: {{ page.date | date(format="%F") }}
 {% endmacro meta %}
+
+{% macro page_in_list(page) %}
+    <article itemscope itemtype="http://schema.org/CreativeWork">
+        <header>
+            <h2 itemprop="name">
+                <a href="{{ page.permalink }}">{{ page.title }}</a>
+            </h2>
+            <span class="muted">{{ self::meta(page=page) }}</span>
+        </header>
+        {% if page.summary %}
+            <div itemprop="summary">
+                {{ page.summary | safe }}
+                <nav class="readmore"><a itemprop="url" href="{{ page.permalink }}">Read More&nbsp;&raquo;</a></nav>
+            </div>
+        {% endif %}
+    </article>
+{% endmacro page_in_list %}
diff --git a/templates/tag.html b/templates/tag.html
new file mode 100644
index 0000000..4cb4c96
--- /dev/null
+++ b/templates/tag.html
@@ -0,0 +1,13 @@
+{% extends "index.html" %}
+
+{% block content %}
+    {% block header %}
+        {{ super() }}
+    {% endblock header %}
+
+    <h1>{{ tag.name }}</h1>
+
+    {% for page in tag.pages %}
+        {{ post_macros::page_in_list(page=page) }}
+    {% endfor %}
+{% endblock content %}
diff --git a/templates/tags.html b/templates/tags.html
new file mode 100644
index 0000000..395a3b7
--- /dev/null
+++ b/templates/tags.html
@@ -0,0 +1,17 @@
+{% extends "index.html" %}
+
+{% block content %}
+    {% block header %}
+        {{ super() }}
+    {% endblock header %}
+
+    <h1>Tags</h1>
+
+    {% if tags %}
+        <ul>
+            {% for tag in tags %}
+                <li><a href="{{ tag.permalink }}">{{ tag.name }}</a> ({{ tag.pages | length }})</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+{% endblock content %}
