diff --git a/test-theme/templates/base.html b/test-theme/templates/base.html
new file mode 100644
index 0000000..66c8ef8
--- /dev/null
+++ b/test-theme/templates/base.html
@@ -0,0 +1,54 @@
+
+
+
+ {# Meta: #}
+
+ {% if GENERATOR %}
+
+ {% endif %}
+ {% if AUTHOR %}
+
+ {% endif %}
+ {% if SITE_DESCRIPTION %}
+
+ {% endif %}
+
+ {#
+
+
+ #}
+
+ {# TODO: More meta tags #}
+
+ {# CSS and other: #}
+
+ {# Title setting #}
+ {% if page_title %}
+ {% set final_title = page_title ~ ' – ' ~ SITENAME %}
+ {% else %}
+ {% set final_title = SITENAME %}
+ {% endif %}
+ {{ final_title }}
+
+
+
+
+{% include "header.html" %}
+
+
+
+
+
+{% block content %}
+No content here...
+{% endblock content %}
+
+
+
+
+
+
diff --git a/test-theme/templates/footer.html b/test-theme/templates/footer.html
new file mode 100644
index 0000000..b7275ba
--- /dev/null
+++ b/test-theme/templates/footer.html
@@ -0,0 +1,2 @@
+
+Written using {{ GENERATOR }} probably by {{ AUTHOR }}.
diff --git a/test-theme/templates/header.html b/test-theme/templates/header.html
new file mode 100644
index 0000000..e69de29
diff --git a/test-theme/templates/index.html b/test-theme/templates/index.html
index c806cb7..2c6de55 100644
--- a/test-theme/templates/index.html
+++ b/test-theme/templates/index.html
@@ -1 +1 @@
-Hello world :-)
+{# Nothing here -- will be substituted by a page from content#}
diff --git a/test-theme/templates/page.html b/test-theme/templates/page.html
index e69de29..3eec197 100644
--- a/test-theme/templates/page.html
+++ b/test-theme/templates/page.html
@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+{% set page_title = page.title %}
+{% block content %}
+{{ page.content }}
+{% endblock content %}
diff --git a/test-theme/templates/sidebar.html b/test-theme/templates/sidebar.html
new file mode 100644
index 0000000..e69de29