2 files changed, 22 insertions, 30 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html
index a766bb7..1e1c835 100644
--- a/source/_includes/article.html
+++ b/source/_includes/article.html
@@ -1,25 +1,19 @@
 {% if index %}
-    <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
-    <div class="entry">
-        {{ content | excerpt }}
-        {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
-        {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %}
-    </div>
-    <div class="meta">
-        <div class="date">{% include post/date.html %}{{ time }}</div>
-        <div class="tags">{% include post/categories.html %}</div>
-        {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %}
-        <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
-        {% endif %}
-    </div>
+	<h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
+	<div class="entry-content">
+		{{ content | excerpt }}
+		{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
+		{% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %}
+	</div>
 {% else %}
-    <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
-    <div class="entry">{{ content }}</div>
-    <div class="meta">
-        <div class="date">{% include post/date.html %}{{ time }}</div>
-        <div class="tags">{% include post/categories.html %}</div>
-        {% if site.disqus_short_name and page.comments == true and site.disqus_show_comment_count == true %}
-        <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
-        {% endif %}
-    </div>
-{% endif %}
-\ No newline at end of file
+	<h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
+	<div class="entry-content">{{ content }}</div>
+{% endif %}
+
+<div class="meta">
+	<div class="date">{% include post/date.html %}{{ time }}</div>
+	<div class="tags">{% include post/categories.html %}</div>
+	{% if site.disqus_short_name and site.disqus_show_comment_count == true %}
+		<span class="comments"><a href="{{ root_url }}{{ post.url }}{{ page.url }}#disqus_thread">Comments</a></span>
+	{% endif %}
+</div>
+\ No newline at end of file
diff --git a/source/_includes/post/categories.html b/source/_includes/post/categories.html
index 2ec7896..8c1c81f 100644
--- a/source/_includes/post/categories.html
+++ b/source/_includes/post/categories.html
@@ -1,10 +1,8 @@
 {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
 {% unless category == '0' %}
-<div class="cat">
-  {% if post %}
-    {{ post.categories | category_links }}
-  {% else %}
-    {{ page.categories | category_links }}
-  {% endif %}
-</div>
+{% if post %}
+	{{ post.categories | category_links }}
+{% else %}
+	{{ page.categories | category_links }}
+{% endif %}
 {% endunless %}