diff --git a/src/zona/data/templates/basic.html b/src/zona/data/templates/basic.html
index caddc62..d86a25a 100644
--- a/src/zona/data/templates/basic.html
+++ b/src/zona/data/templates/basic.html
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
+{% if metadata.show_title %}
 {% include "title.html" %}
+{% endif %}
 {{ content | safe }}
 {% endblock %}
 
diff --git a/src/zona/data/templates/page.html b/src/zona/data/templates/page.html
index 96250f1..fd3cdb4 100644
--- a/src/zona/data/templates/page.html
+++ b/src/zona/data/templates/page.html
@@ -1,9 +1,18 @@
-{% extends "base.html" %} {% block content %} {% include "title.html" %} {% if
-metadata.date %}
+{% extends "base.html" %} {% block content %}
+
+{% if metadata.show_title %}
+{% include "title.html" %}
+{% if metadata.date %}
 <center>
   <time class="post-date" datetime="{{ metadata.date | safe }}"
   >{{ metadata.date | safe}}</time>
 </center>
 {% endif %}
+<hr>
+{% 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..85e0be8 100644
--- a/src/zona/data/templates/post_list.html
+++ b/src/zona/data/templates/post_list.html
@@ -1,4 +1,8 @@
-{% extends "base.html" %} {% block content %} {% include "title.html" %}
+{% extends "base.html" %} {% block content %}
+
+{% if metadata.show_title %}
+{% include "title.html" %}
+{% endif %}
 
 <article>{{ content | safe }}</article>
 
@@ -13,3 +17,4 @@
   {% endfor %}
 </ul>
 {% endif %} {% endblock %}
+
diff --git a/src/zona/data/templates/title.html b/src/zona/data/templates/title.html
index 246f83b..9753365 100644
--- a/src/zona/data/templates/title.html
+++ b/src/zona/data/templates/title.html
@@ -1,4 +1,2 @@
-{% if metadata.show_title %}
 <center><h1 class="title">{{ metadata.title }}</h1></center>
-<hr>
-{% endif %}
+