diff --git a/theme/wttf/templates/article.html b/theme/wttf/templates/article.html
index fb01b33..ae46be5 100644
--- a/theme/wttf/templates/article.html
+++ b/theme/wttf/templates/article.html
@@ -1,44 +1,32 @@
 {% extends "base.html" %}
 {% block head %}
-  {{ super() }}
-  {% if article.description %}
-    <meta name="description" content="{{article.description}}" />
-  {% endif %}
-
-  {% for tag in article.tags %}
-    <meta name="tags" content="{{tag}}" />
-  {% endfor %}
-
+	{{ super() }}
+	{% if article.description %}
+		<meta name="description" content="{{article.description}}" />
+	{% endif %}
 {% endblock %}
 
 {% block content %}
 <section id="content" class="body">
-  <header>
-    <h2 class="entry-title">
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
- {% import 'translations.html' as translations with context %}
- {{ translations.translations_for(article) }}
-  </header>
-  <footer class="post-info">
-    <time class="published" datetime="{{ article.date.isoformat() }}">
-      {{ article.locale_date }}
-    </time>
-	{% if article.modified %}
-    <time class="modified" datetime="{{ article.modified.isoformat() }}">
-      {{ article.locale_modified }}
-    </time>
-	{% endif %}
-    {% if article.authors %}
-    <address class="vcard author">
-      By {% for author in article.authors %}
-          <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
-        {% endfor %}
-    </address>
-    {% endif %}
-  </footer><!-- /.post-info -->
-  <div class="entry-content">
-    {{ article.content }}
-  </div><!-- /.entry-content -->
+	<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>
 </section>
 {% endblock %}
diff --git a/theme/wttf/templates/base.html b/theme/wttf/templates/base.html
index 67b6459..6770124 100644
--- a/theme/wttf/templates/base.html
+++ b/theme/wttf/templates/base.html
@@ -34,25 +34,25 @@
 </head>
 
 <body id="index" class="home">
-		<header id="banner">
-			<h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
-			<h1 id="menu">
-				Welcome to the 
-				 <select onchange="window.location.href=this.value">
-				 	{%- for t, article in tags|sort %}
-						<option value="/{{ t.url }}" {% if t == tag %}selected{% endif %}>{{ t }}</option>
-					{% endfor %}
-				</select> 
-				Federation
-			</h1>
-		</header><!-- /#banner -->
-		{% block content %}
-		{% endblock %}
-		<footer>
-			{% for page in pages %}
-				{{ page.title }}
-				{{ page.content }}
-			{% endfor %}
-		</footer>
+	<header id="banner">
+		<h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
+		<h1 id="menu">
+			Welcome to the 
+			 <select onchange="window.location.href=this.value">
+			 	{%- for t, article in tags|sort %}
+					<option value="/{{ t.url }}" {% if t == tag %}selected{% endif %}>{{ t }}</option>
+				{% endfor %}
+			</select> 
+			Federation
+		</h1>
+	</header>
+	{% block content %}
+	{% endblock %}
+	<footer>
+		{% for page in pages %}
+			{{ page.title }}
+			{{ page.content }}
+		{% endfor %}
+	</footer>
 </body>
 </html>
diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html
index e48c547..73202d2 100644
--- a/theme/wttf/templates/index.html
+++ b/theme/wttf/templates/index.html
@@ -74,15 +74,6 @@
 				</article>
 			</li>
 		{% endif %}
-		{% if loop.last %}
-			{% if loop.length > 1 or articles_page.has_other_pages() %}
-				</ul>
-				{% if articles_page.has_other_pages() %}
-					{% include 'pagination.html' %}
-				{% endif %}
-				</section>
-			{% endif %}
-		{% endif %}
 	{% endfor %}
 {% endif %}
 {% endblock content %}
