diff --git a/src/zona/data/templates/basic.html b/src/zona/data/templates/basic.html
index 033d9e3..caddc62 100644
--- a/src/zona/data/templates/basic.html
+++ b/src/zona/data/templates/basic.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% if metadata.show_title %}
-<center><h1>{{ metadata.title }}</h1></center>
-{% endif %}
+{% include "title.html" %}
 {{ content | safe }}
 {% endblock %}
 
diff --git a/src/zona/data/templates/page.html b/src/zona/data/templates/page.html
index 3e835b4..96250f1 100644
--- a/src/zona/data/templates/page.html
+++ b/src/zona/data/templates/page.html
@@ -1,13 +1,9 @@
-{% extends "base.html" %}
-
-{% block content %}
-{% if metadata.show_title %}
-<center><h1>{{ metadata.title }}</h1></center>
-{% endif %}
-{% if metadata.date %}
-<center><small><time datetime="{{ metadata.date | safe }}">{{ metadata.date | safe}}</time></small></center>
+{% extends "base.html" %} {% block content %} {% include "title.html" %} {% if
+metadata.date %}
+<center>
+  <time class="post-date" datetime="{{ metadata.date | safe }}"
+  >{{ metadata.date | safe}}</time>
+</center>
 {% endif %}
 <article>{{ content | safe }}</article>
 {% endblock %}
-
-
diff --git a/src/zona/data/templates/post_list.html b/src/zona/data/templates/post_list.html
index 8545020..8c849ee 100644
--- a/src/zona/data/templates/post_list.html
+++ b/src/zona/data/templates/post_list.html
@@ -1,17 +1,15 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-<center><h1>{{ metadata.title }}</h1></center>
+{% extends "base.html" %} {% block content %} {% include "title.html" %}
 
 <article>{{ content | safe }}</article>
 
 {% if post_list %}
-  <ul>
-    {% for item in post_list %}
-      <li><small><time datetime="{{ item.metadata.date | safe }}">{{ item.metadata.date | safe}}</time></small>: <a href="/{{ item.url }}">{{ item.metadata.title }}</a></li>
-    {% endfor %}
-  </ul>
-{% endif %}
-{% endblock %}
-
+<ul>
+  {% for item in post_list %}
+  <li>
+    <time class="post-list-date" datetime="{{ item.metadata.date | safe }}"
+    >{{ item.metadata.date | safe}}</time>: <a href="/{{ item.url }}"
+    >{{ item.metadata.title }}</a>
+  </li>
+  {% endfor %}
+</ul>
+{% endif %} {% endblock %}
diff --git a/src/zona/data/templates/title.html b/src/zona/data/templates/title.html
new file mode 100644
index 0000000..246f83b
--- /dev/null
+++ b/src/zona/data/templates/title.html
@@ -0,0 +1,4 @@
+{% if metadata.show_title %}
+<center><h1 class="title">{{ metadata.title }}</h1></center>
+<hr>
+{% endif %}