diff --git a/test-theme/static/css/theme.css b/test-theme/static/css/theme.css
index 438478a..c5941b7 100644
--- a/test-theme/static/css/theme.css
+++ b/test-theme/static/css/theme.css
@@ -2,7 +2,10 @@ body {
 	background-color: #003;
 	color: #5bf;
 	margin:auto;
-	max-width: 500px;
+	/*max-width: 500px;
+	 */
+	padding-left: 20px;
+	padding-right: 20px;
 }
 
 a {
@@ -19,20 +22,32 @@ main {
 	border-top: 1px solid;
 	border-right: 1px solid;
 	order: 1;
-	/* Four times wider than <nav>, at least 300px*/
+	/* Four times wider than <nav>, at base-size 300px*/
 	flex: 4 300px;
 }
 
+main > * {
+	margin: auto;
+	max-width: 700px;
+}
+
 nav {
 	order: 2;
 	float: right;
-	flex: 1;
+	flex: 1 75px;
+}
+
+nav > * {
 	padding: 8px;
 	margin: 6px;
 	background-color: rgb(31, 18, 81);
 	border-radius: 12pt;
 }
 
+nav h2 {
+	font-size: 14pt;
+}
+
 #main {
 	display: flex;
 	flex-wrap: wrap;
@@ -41,3 +56,18 @@ nav {
 footer {
 	text-align: right;
 }
+
+pre, tt {
+	background-color: rgba(255, 255, 255, 0.2);
+	border-radius: 2pt;
+}
+
+pre {
+	padding: 3pt;
+	overflow-y: scroll;
+}
+
+tt {
+	padding-left: 1pt;
+	padding-right: 1pt;
+}
diff --git a/test-theme/templates/archives.html b/test-theme/templates/archives.html
index e69de29..cacb579 100644
--- a/test-theme/templates/archives.html
+++ b/test-theme/templates/archives.html
@@ -0,0 +1,3 @@
+{% 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 e69de29..848a3ce 100644
--- a/test-theme/templates/article.html
+++ b/test-theme/templates/article.html
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% set page_title = article.title %}
+{% block content %}
+<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 e69de29..b5c476d 100644
--- a/test-theme/templates/author.html
+++ b/test-theme/templates/author.html
@@ -0,0 +1,3 @@
+{% 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 e69de29..c14f123 100644
--- a/test-theme/templates/authors.html
+++ b/test-theme/templates/authors.html
@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+{% set page_title = "TODO" %}
+{% block content %}
+{# TODO! #}
+{% endblock content %}
diff --git a/test-theme/templates/base.html b/test-theme/templates/base.html
index 04ec4ff..923ba56 100644
--- a/test-theme/templates/base.html
+++ b/test-theme/templates/base.html
@@ -18,10 +18,10 @@
 	<meta name=color-scheme content="dark">
 	#}
 
-	{# TODO: More meta tags #}
+	{# TODO: More meta tags (i.e. RSS) #}
 
 	{# CSS and other: #}
-	<link rel=stylesheet href="{{ THEME_STATIC_DIR }}/css/theme.css">
+	<link rel=stylesheet href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/theme.css">
 
 	{# Title setting #}
 	{% if page_title %}
@@ -43,9 +43,11 @@
 </nav>
 
 <main>
+	<div>
 {% block content %}
 <p>No content here...</p>
 {% endblock content %}
+	</div>
 </main>
 </div> <!-- #main -->
 
diff --git a/test-theme/templates/categories.html b/test-theme/templates/categories.html
index e69de29..6318aa0 100644
--- a/test-theme/templates/categories.html
+++ b/test-theme/templates/categories.html
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+{% set page_title = "TODO" %}
+{% block content %}
+{# TODO! #}
+{% endblock content %}
+
diff --git a/test-theme/templates/category.html b/test-theme/templates/category.html
index e69de29..5c09138 100644
--- a/test-theme/templates/category.html
+++ b/test-theme/templates/category.html
@@ -0,0 +1,3 @@
+{% extends 'list.html' %}
+{% set page_title = "Category: " + category.name %}
+{% 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 e69de29..eb17900 100644
--- a/test-theme/templates/period_archives.html
+++ b/test-theme/templates/period_archives.html
@@ -0,0 +1,5 @@
+{% extends 'list.html' %}
+{# FIXME: This is too hacky #}
+{% set page_title = "Archive: " + period %}
+{% set list_title = "Archive: " + period %}
+
diff --git a/test-theme/templates/sidebar.html b/test-theme/templates/sidebar.html
index ed03a0f..f18356b 100644
--- a/test-theme/templates/sidebar.html
+++ b/test-theme/templates/sidebar.html
@@ -1,5 +1,25 @@
-<p>Here will be menu, and tag list some day.</p>
-<ul>
-	<li>First
-	<li>Second
-</ul>
+<div>
+	<!-- Main navigation -->
+	<!-- TODO! -->
+</div>
+<div>
+	<h2>Categories</h2>
+	<ul>
+	{% for category, _art in categories %}
+	<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+	{% endfor %}
+	</ul>
+
+	<h2>Tags</h2>
+	<ul>
+	{% for tag, _art in tags %}
+	<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+	{% endfor %}
+	</ul>
+</div>
+<div>
+	<h2>Stalk me also at</h2>
+	TODO!
+
+	<h2>I stalk</h2>
+	TODO!
diff --git a/test-theme/templates/tag.html b/test-theme/templates/tag.html
index e69de29..be3824e 100644
--- a/test-theme/templates/tag.html
+++ b/test-theme/templates/tag.html
@@ -0,0 +1,4 @@
+{% extends 'list.html' %}
+{% set page_title = "Tag: " + tag.name %}
+{% set list_title = "Articles tagged with " + tag.name %}
+
diff --git a/test-theme/templates/tags.html b/test-theme/templates/tags.html
index e69de29..6318aa0 100644
--- a/test-theme/templates/tags.html
+++ b/test-theme/templates/tags.html
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+{% set page_title = "TODO" %}
+{% block content %}
+{# TODO! #}
+{% endblock content %}
+