diff --git a/index.hbs b/index.hbs
index f223bf9..db2de29 100644
--- a/index.hbs
+++ b/index.hbs
@@ -2,13 +2,12 @@
 <section class="content">
     <ul class="hfeed">
         {{#foreach posts}}
-            {{#if @first}}
-                <li class="featured">
-                    {{> full-post}}
-                </li>
-            {{else}}
-                {{> list-post}}
-            {{/if}}
+            <li class="wrap">
+                <article class="post type-post status-publish format-standard hentry">
+                    <h2 class="entry-title"><a href="/{{slug}}" rel="bookmark">{{title}}</a></h2>
+                    <time class="updated" datetime="2012-05-03">{{dateFormat published_at format="MMMM DD, YYYY"}}</time>
+                </article>
+            </li>
         {{/foreach}}
     </ul>
     {{pagination}}
diff --git a/partials/full-post.hbs b/partials/full-post.hbs
deleted file mode 100644
index d8570d1..0000000
--- a/partials/full-post.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<article class="post type-post status-publish format-standard hentry">
-    {{#if image}}
-    <figure class="post-thumb">
-        <img width="550" height="250" src="/content/images/{{image}}" class="attachment-post-thumbnail wp-post-image" alt="ghostpost">
-    </figure>
-    {{/if}}
-    <div class="wrap">
-        <header>
-            <h2 class="entry-title h1"><a href="/{{slug}}" rel="bookmark">{{title}}</a></h2>
-            <span class="entry-meta">Published on <time class="updated" datetime="{{date published_at format='YYYY-MM-DD'}}">{{date published_at format='DD MMMM YYYY'}}</time></span>
-        </header>
-
-        <section class="entry-content">
-            {{content}}
-        </section>
-    </div>
-</article>
diff --git a/partials/list-post.hbs b/partials/list-post.hbs
deleted file mode 100644
index dc205a4..0000000
--- a/partials/list-post.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<li class="wrap">
-    <article class="post type-post status-publish format-standard hentry">
-        <h2 class="entry-title"><a href="/{{slug}}" rel="bookmark">{{title}}</a></h2>
-        <time class="updated" datetime="2012-05-03">{{date published_at format="MMMM DD, YYYY"}}</time>
-    </article>
-</li>
\ No newline at end of file
diff --git a/post.hbs b/post.hbs
index d2668cc..b9bb418 100644
--- a/post.hbs
+++ b/post.hbs
@@ -1,6 +1,24 @@
 {{!< default}}
 <section class="content">
     {{#post}}
-        {{> full-post}}
+
+        <article class="post type-post status-publish format-standard hentry">
+            {{#if image}}
+            <figure class="post-thumb">
+                <img width="550" height="250" src="/content/images/{{image}}" class="attachment-post-thumbnail wp-post-image" alt="ghostpost">
+            </figure>
+            {{/if}}
+            <div class="wrap">
+                <header>
+                    <h2 class="entry-title h1"><a href="/{{slug}}" rel="bookmark">{{title}}</a></h2>
+                    <span class="entry-meta">Published on <time class="updated" datetime="{{dateFormat published_at format='YYYY-MM-DD'}}">{{dateFormat published_at format='DD MMMM YYYY'}}</time></span>
+                </header>
+
+                <section class="entry-content">
+                    {{content}}
+                </section>
+            </div>
+        </article>
+        
     {{/post}}
 </section>
\ No newline at end of file