diff --git a/foundation-default-colours/templates/article.html b/foundation-default-colours/templates/article.html
index 519295f..1528309 100644
--- a/foundation-default-colours/templates/article.html
+++ b/foundation-default-colours/templates/article.html
@@ -4,7 +4,8 @@
 <article>
 	<h2>{{ article.title }}</h2>
 	{{ article.content }}
-	<h6>Written by <a href="{{ SITEURL }}/author/{{ article.author|lower|replace(' ', '-') }}.html">{{ article.author }}</a> on {{ article.locale_date }}.</h6>
+	<hr/>
+	<h6>Written by <a href="{{ SITEURL }}/author/{{ article.author|lower|replace(' ', '-') }}.html">{{ article.author }}</a> {% if article.category %}in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category}}</a> {% endif %}on {{ article.locale_date }}.{% if article.tags|count > 0 %} Tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>, {% endfor %}{% endif %}</h6>
 </article>
 
 <hr/>