diff --git a/README.md b/README.md
index 616e9ea..a42de14 100644
--- a/README.md
+++ b/README.md
@@ -2,20 +2,24 @@
 
 A theme for the [Pelican](http://getpelican.com) static site generator. A shameless rip off of @porterjamesj's [crowsfoot](http://github.com/porterjamesj/crowsfoot) theme.
 
+
 ## Screenshot
 
 ![pelican-alchemy](screenshot.png)
 
+
 ## Installation
 
 `git clone https://github.com/nairobilug/pelican-alchemy.git`
 
 Then set the pelican config variable `THEME` to the `alchemy` folder inside the cloned path.
 
+
 ## Usage
 
 Pelican [documentation](http://docs.getpelican.com/en/latest/)
 
+
 ### Theme Options
 
 | Config                    | Type  | Description       |
@@ -44,10 +48,12 @@ An RSS icon will also appear on the nav if `FEED_ATOM` or `FEED_RSS` is set.
 | GOOGLE_ANALYTICS_ID       | TEXT  | Google analytics  |
 | GOOGLE_ANALYTICS_DOMAIN   | TEXT  | Google analytics  |
 
+
 ## Live Demo
 
 [nairobilug.or.ke](http://nairobilug.or.ke)
 
+
 ## License
 
 MIT
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index 6c35b66..14eb6ab 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -7,12 +7,9 @@
             <meta name="viewport" content="width=device-width, initial-scale=1">
 
             <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
-
             {% include "include/feeds.html" %}
-
             <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css">
 
-            {# HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries #}
             <!--[if lt IE 9]>
               <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
               {# WARNING: Respond.js doesn't work if you view the page via file:// #}
@@ -22,18 +19,14 @@
             {% include "include/google_analytics.html" %}
         {% endblock %}
     </head>
-
     <body>
         {% include "header.html" %}
-
         <div class="container">
             {% block content %}{% endblock %}
         </div>
-
         {% include "footer.html" %}
 
         <script src="{{ SITEURL }}/theme/js/libs/jquery.min.js"></script>
         <script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script>
     </body> <!-- 42 -->
-
 </html>
diff --git a/alchemy/templates/include/article_list.html b/alchemy/templates/include/article_list.html
deleted file mode 100644
index 823111a..0000000
--- a/alchemy/templates/include/article_list.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="post mini-post">
-    <div class="row">
-        <div class="col-md-4">
-            <p class="post-date">
-                <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
-            </p>
-            <p class="post-category">
-                <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-            </p>
-            {% if article.author and SHOW_ARTICLE_AUTHOR %}
-                <address class="post-author">
-                    By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
-                </address>
-            {% endif %}
-        </div>
-        <div class="col-md-8">
-            <h2 class="post-title">
-                <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
-            </h2>
-            <div class="post-content">
-                {{ article.content|striptags|truncate(256) }}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/alchemy/templates/pagination.html b/alchemy/templates/include/pagination.html
similarity index 100%
rename from alchemy/templates/pagination.html
rename to alchemy/templates/include/pagination.html
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index b3ece5d..cc98d7d 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -6,9 +6,32 @@
     {% endblock %}
     <div>
         {% for article in articles_page.object_list %}
-            {% include "include/article_list.html" %}
+            <div class="post mini-post">
+                <div class="row">
+                    <div class="col-md-4">
+                        <p class="post-date">
+                            <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
+                        </p>
+                        <p class="post-category">
+                            <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+                        </p>
+                        {% if article.author and SHOW_ARTICLE_AUTHOR %}
+                            <address class="post-author">
+                                By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+                            </address>
+                        {% endif %}
+                    </div>
+                    <div class="col-md-8">
+                        <h2 class="post-title">
+                            <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
+                        </h2>
+                        <div class="post-content">
+                            {{ article.content|striptags|truncate(256) }}
+                        </div>
+                    </div>
+                </div>
+            </div>
         {% endfor %}
     </div>
-    {% include 'pagination.html' %}
-</div>
+    {% include 'include/pagination.html' %}
 {% endblock %}
