diff --git a/src/zona/data/content/static/style.css b/src/zona/data/content/static/style.css
index 9e5633e..56bbae9 100644
--- a/src/zona/data/content/static/style.css
+++ b/src/zona/data/content/static/style.css
@@ -90,11 +90,6 @@ h1 {
   font-weight: bold;
 }
 
-.title {
-  text-transform: lowercase;
-  font-family: monospace;
-}
-
 article h1:first-of-type {
   margin-block-start: 1.67rem;
 }
diff --git a/src/zona/data/templates/basic.html b/src/zona/data/templates/basic.html
index caddc62..033d9e3 100644
--- a/src/zona/data/templates/basic.html
+++ b/src/zona/data/templates/basic.html
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% include "title.html" %}
+{% if metadata.show_title %}
+<center><h1>{{ metadata.title }}</h1></center>
+{% endif %}
 {{ content | safe }}
 {% endblock %}
 
diff --git a/src/zona/data/templates/page.html b/src/zona/data/templates/page.html
index 96250f1..3e835b4 100644
--- a/src/zona/data/templates/page.html
+++ b/src/zona/data/templates/page.html
@@ -1,9 +1,13 @@
-{% 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>
+{% 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>
 {% 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 8c849ee..8545020 100644
--- a/src/zona/data/templates/post_list.html
+++ b/src/zona/data/templates/post_list.html
@@ -1,15 +1,17 @@
-{% extends "base.html" %} {% block content %} {% include "title.html" %}
+{% extends "base.html" %}
+
+{% block content %}
+
+<center><h1>{{ metadata.title }}</h1></center>
 
 <article>{{ content | safe }}</article>
 
 {% if post_list %}
-<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 %}
+  <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 %}
+
diff --git a/src/zona/data/templates/title.html b/src/zona/data/templates/title.html
deleted file mode 100644
index 246f83b..0000000
--- a/src/zona/data/templates/title.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% if metadata.show_title %}
-<center><h1 class="title">{{ metadata.title }}</h1></center>
-<hr>
-{% endif %}