diff --git a/theme/templates/index.html b/theme/templates/index.html
index 32d4e36..46bceb7 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -1,34 +1,82 @@
-{% extends "base.html" %}
-{% block content_title %}{% endblock %}
-{% block content %}
-{% if articles %}
- {% for article in articles %}
+
+
- {# First item #}
- {% if loop.first %}
-
-
- {% if not HIDE_DATE %}{% endif %}
-
+
+ {% block title %}{{ SITENAME }}{%endblock%}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ SITENAME }}
+
+
+
+ {% for category, articles in categories %}
+
+ {% if category.name == 'notes' %}
+
+ {% for article in articles %}
+
+
+
+ {{ article.title }}
+
+
+
+
+ {{ article.content }}
+
+
+ {% if not HIDE_DATE %}
+
{% endif %}
+
+ {% endfor %}
+
+ {% endif %}
+
{% endfor %}
-{% else %}
- No posts found.
-{% endif %}
-{% endblock content %}
+
+
+
+
+
+
+
+
diff --git a/theme/templates/index.html.new b/theme/templates/index.html.new
deleted file mode 100644
index 46bceb7..0000000
--- a/theme/templates/index.html.new
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
- {% block title %}{{ SITENAME }}{%endblock%}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ SITENAME }}
-
-
-
- {% for category, articles in categories %}
-
- {% if category.name == 'notes' %}
-
- {% for article in articles %}
-
-
-
- {{ article.title }}
-
-
-
-
- {{ article.content }}
-
-
- {% if not HIDE_DATE %}
-
- {% endif %}
-
- {% endfor %}
-
- {% endif %}
-
- {% endfor %}
-
-
-
-
-
-
-
-
diff --git a/theme/templates/index.html.old b/theme/templates/index.html.old
new file mode 100644
index 0000000..32d4e36
--- /dev/null
+++ b/theme/templates/index.html.old
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}
+{% if articles %}
+ {% for article in articles %}
+
+ {# First item #}
+ {% if loop.first %}
+
+
+ {% if not HIDE_DATE %}{% endif %}
+
+
+
+ {{ article.content }}{% include 'comments.html' %}
+
+ {% if loop.length > 1 %}
+
+ All posts
+
+ {% endif %}
+ {# other items #}
+ {% else %}
+ - {{ article.title }}
+ {% endif %}
+ {% if loop.length > 1 %}
+
+
+ {% endif %}
+ {% endfor %}
+{% else %}
+ No posts found.
+{% endif %}
+{% endblock content %}