diff --git a/test-theme/templates/archives.html b/test-theme/templates/archives.html
index c14f123..cacb579 100644
--- a/test-theme/templates/archives.html
+++ b/test-theme/templates/archives.html
@@ -1,5 +1,3 @@
-{% extends 'base.html' %}
-{% set page_title = "TODO" %}
-{% block content %}
-{# TODO! #}
-{% endblock content %}
+{% extends 'list.html' %}
+{% set page_title = "Archive" %}
+{% set list_title = "Archive" %}
diff --git a/test-theme/templates/article.html b/test-theme/templates/article.html
index 496124f..848a3ce 100644
--- a/test-theme/templates/article.html
+++ b/test-theme/templates/article.html
@@ -1,6 +1,7 @@
-
 {% extends 'base.html' %}
-{% set page_title = "TODO" %}
+{% set page_title = article.title %}
 {% block content %}
-{# TODO! #}
+<h1>{{ article.title }}</h1>
+{# TODO: more details here #}
+{{ article.content }}
 {% endblock content %}
diff --git a/test-theme/templates/author.html b/test-theme/templates/author.html
index 496124f..b5c476d 100644
--- a/test-theme/templates/author.html
+++ b/test-theme/templates/author.html
@@ -1,6 +1,3 @@
-
-{% extends 'base.html' %}
-{% set page_title = "TODO" %}
-{% block content %}
-{# TODO! #}
-{% endblock content %}
+{% extends 'list.html' %}
+{% set page_title = "Author: " + author %}
+{% set list_title = "All articles by " + author %}
diff --git a/test-theme/templates/authors.html b/test-theme/templates/authors.html
index 496124f..c14f123 100644
--- a/test-theme/templates/authors.html
+++ b/test-theme/templates/authors.html
@@ -1,4 +1,3 @@
-
 {% extends 'base.html' %}
 {% set page_title = "TODO" %}
 {% block content %}
diff --git a/test-theme/templates/category.html b/test-theme/templates/category.html
index fcd8de6..5c09138 100644
--- a/test-theme/templates/category.html
+++ b/test-theme/templates/category.html
@@ -1,11 +1,3 @@
-{% extends 'base.html' %}
+{% extends 'list.html' %}
 {% set page_title = "Category: " + category.name %}
-{% block content %}
-<h1>Category: {{ category.name }}</h1>
-<ul>
-{% for article in articles %}
-<li><a href="{{ article.url }}">{{ article.title }}</a>
-{% endfor %}
-</ul>
-{% endblock content %}
-
+{% set list_title = "Category: " + category.name %}
diff --git a/test-theme/templates/list.html b/test-theme/templates/list.html
new file mode 100644
index 0000000..b7c3dca
--- /dev/null
+++ b/test-theme/templates/list.html
@@ -0,0 +1,11 @@
+{% extends 'base.html' %}
+{% block content %}
+<h1>{{ list_title }}</h1>
+<ul> {# TODO: rly ul and not list of divs? #}
+{% for article in articles %}
+{# TODO: More pretty #}
+<li><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
+{% endfor %}
+</ul>
+{% endblock content %}
+
diff --git a/test-theme/templates/period_archives.html b/test-theme/templates/period_archives.html
index 6318aa0..eb17900 100644
--- a/test-theme/templates/period_archives.html
+++ b/test-theme/templates/period_archives.html
@@ -1,6 +1,5 @@
-{% extends 'base.html' %}
-{% set page_title = "TODO" %}
-{% block content %}
-{# TODO! #}
-{% endblock content %}
+{% extends 'list.html' %}
+{# FIXME: This is too hacky #}
+{% set page_title = "Archive: " + period %}
+{% set list_title = "Archive: " + period %}
 
diff --git a/test-theme/templates/tag.html b/test-theme/templates/tag.html
index 6318aa0..be3824e 100644
--- a/test-theme/templates/tag.html
+++ b/test-theme/templates/tag.html
@@ -1,6 +1,4 @@
-{% extends 'base.html' %}
-{% set page_title = "TODO" %}
-{% block content %}
-{# TODO! #}
-{% endblock content %}
+{% extends 'list.html' %}
+{% set page_title = "Tag: " + tag.name %}
+{% set list_title = "Articles tagged with " + tag.name %}