diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html
index 4cd27fe..eee9323 100644
--- a/theme/wttf/templates/index.html
+++ b/theme/wttf/templates/index.html
@@ -1,75 +1,92 @@
 {% extends "base.html" %}
 {% block content %}
 {% if articles %}
-    {% for article in articles_page.object_list %}
-        {# First item #}
-        {% if loop.index <= 3 %}
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title p-name">
-                        <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
-                    </h1>
-                    <div class="entry-subtitle">
-                        A 
-                        <span class="entry-category">{{ article.category }}</span> 
-                        about 
-                        <span class="entry-tags">
-                            {% for tag in article.tags %}
-                                <span itemprop="keywords">
-                                    <a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
-                                </span> 
-                            {% endfor %}
-                        </span> 
-                        published on 
-                        <span class="entry-date dt-published">{{ article.date }}</span>
-                    </div>
-                    <div class="entry-content e-content">{{ article.content }}</div>
-                </article>
-            </aside><!-- /#featured -->
-            {% if loop.index == 3 %}
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-            {% endif %}
-        {# other items #}
-        {% else %}
-            {% if loop.first %}
-                <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
-            {% endif %}
-            <li>
-                <article class="hentry">
-                    <header>
-                        <h1 class="p-name">
-                            <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
-                        </h1>
-                        <div class="entry-date dt-published">{{ article.date }}</div>
-                    </header>
+	{% for article in articles_page.object_list %}
+		{# First item #}
+		{% if loop.index <= 3 %}
+			<div id="featured" class="body">
+				<article>
+					<h1 class="entry-title p-name">
+						<a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
+					</h1>
+					<div class="entry-subtitle">
+						A 
+						<span class="entry-category">
+							<em>{{ article.category }}</em>
+						</span> 
+						about 
+						<span class="entry-tags">
+							{% for tag in article.tags %}
+								<span itemprop="keywords">
+									<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+								</span> 
+							{% endfor %}
+						</span> 
+						published on 
+						<span class="entry-date dt-published">{{ article.date }}</span>
+					</div>
+					<div class="entry-content e-content">{{ article.content }}</div>
+				</article>
+			</div><!-- /#featured -->
+			{% if loop.index == 3 %}
+				<section id="content" class="body">
+					<h1>Other articles</h1>
+					<hr />
+					<ol id="posts-list" class="hfeed">
+			{% endif %}
+		{# other items #}
+		{% else %}
+			{% if loop.first %}
+				<section id="content" class="body">
+					<ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+			{% endif %}
+			<li>
+				<article class="hentry">
+					<header>
+						<h1 class="p-name">
+							<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
+						</h1>
+						<div class="entry-subtitle">
+							A 
+							<span class="entry-category">
+								<em>{{ article.category }}</em>
+							</span> 
+							about 
+							<span class="entry-tags">
+								{% for tag in article.tags %}
+									<span itemprop="keywords">
+										<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+									</span> 
+								{% endfor %}
+							</span> 
+							published on 
+							<span class="entry-date dt-published">{{ article.date }}</span>
+						</div>
+					</header>
 
-                    <div class="entry-content">
-                        <p class="p-summary">{{ article.summary }}</p>
-                        <a class="readmore" href="{{ SITEURL }}/{{ article.url }}"> ... read more</a>
-                    </div><!-- /.entry-content -->
-                </article>
-            </li>
-        {% endif %}
-        {% if loop.last %}
-            {% if loop.length > 1 or articles_page.has_other_pages() %}
-                </ol><!-- /#posts-list -->
-                {% if articles_page.has_other_pages() %}
-                    {% include 'pagination.html' %}
-                {% endif %}
-                </section><!-- /#content -->
-            {% endif %}
-        {% endif %}
-    {% endfor %}
+					<div class="entry-content">
+						<p class="p-summary">{{ article.summary }}</p>
+						<span class="entry-readmore"><a class="readmore" href="{{ SITEURL }}/{{ article.url }}"> read more</a></span>
+					</div><!-- /.entry-content -->
+				</article>
+			</li>
+		{% endif %}
+		{% if loop.last %}
+			{% if loop.length > 1 or articles_page.has_other_pages() %}
+				</ol><!-- /#posts-list -->
+				{% if articles_page.has_other_pages() %}
+					{% include 'pagination.html' %}
+				{% endif %}
+				</section><!-- /#content -->
+			{% endif %}
+		{% endif %}
+	{% endfor %}
 {% else %}
 <section id="content" class="body">
 <h2>Pages</h2>
-    {% for page in pages %}
-        <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
-    {% endfor %}
+	{% for page in pages %}
+		<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+	{% endfor %}
 </section>
 {% endif %}
 {% endblock content %}
diff --git a/theme/wttf/templates/tag.html b/theme/wttf/templates/tag.html
index e69de29..65a99b5 100644
--- a/theme/wttf/templates/tag.html
+++ b/theme/wttf/templates/tag.html
@@ -0,0 +1,5 @@
+{% extends "index.html" %}
+{% block content_title %}
+<h2>Articles in the {{ tag }} tag</h2>
+{% endblock %}
+