diff --git a/templates/article.html b/templates/article.html
index 6236920..70befdf 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %}{{ article.title }}{% endblock %}
 
 {# <!-- Choosing cover image --> #}
@@ -14,14 +15,14 @@
   {% else %}
     {% set selected_cover = SITEURL+"/"+article.og_image %}
   {% endif %}
+{% elif article.color %}
+  {% set selected_color = article.color %}
 {% elif HEADER_COVER %}
   {% if HEADER_COVER|lower|truncate(4, True, '') == "http" %}
     {% set selected_cover = HEADER_COVER %}
   {% else %}
     {% set selected_cover = SITEURL+"/"+HEADER_COVER %}
   {% endif %}
-{% elif article.color %}
-  {% set selected_color = article.color %}
 {% elif HEADER_COLOR %}
   {% set selected_color = HEADER_COLOR %}
 {% endif %}
diff --git a/templates/author.html b/templates/author.html
index f657821..d423016 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,4 +1,6 @@
-{% extends "index.html" %}
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Articles by {{ author_name }}{% endblock %}
 
 <!-- To support both image in relative path and url  -->
 {% set author_name = author.name | title  %}
@@ -32,8 +34,6 @@
   {% set selected_color = HEADER_COLOR %}
 {% endif %}
 
-{% block title %}{{ SITENAME }} - Articles by {{ author_name }}{% endblock %}
-
 {% block opengraph %}
     {{ super() }}
     <meta property="og:title" content="{{ SITENAME }} - Articles by {{ author }}">
@@ -114,3 +114,12 @@
     {% endif %}
 
 {% endblock header %}
+
+{% block content %}
+
+<div id="index" class="container">
+  <main class="content" role="main">
+    {% include "partials/loop.html" %}
+  </main>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/category.html b/templates/category.html
index 44f7cd5..5cc43a5 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,4 +1,4 @@
-{% extends "index.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ SITENAME }} - Articles in the {{ category }} category{% endblock %}
 
@@ -51,3 +51,12 @@
       </div>
     </header>
 {% endblock header %}
+
+{% block content %}
+
+<div id="index" class="container">
+  <main class="content" role="main">
+    {% include "partials/loop.html" %}
+  </main>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/tag.html b/templates/tag.html
index 7f5778a..d036ac4 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,4 +1,5 @@
-{% extends "index.html" %}
+{% extends "base.html" %}
+
 {% block title %}{{ SITENAME }} - Tag {{ tag }}{% endblock %}
 
 {# <!-- Choosing cover image --> #}
@@ -50,3 +51,12 @@
       </div>
     </header>
 {% endblock header %}
+
+{% block content %}
+
+<div id="index" class="container">
+  <main class="content" role="main">
+    {% include "partials/loop.html" %}
+  </main>
+</div>
+{% endblock content %}
\ No newline at end of file