diff --git a/_layouts/post.html b/_layouts/post.html
index d8755ee..5558446 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,36 +2,24 @@
 layout: default
 ---
 
-<div class="post non-narrow zero-top-spacing">
-    <div class="container">
-        <div class="content">
-            <!-- Header-->
-            <div class="front-matter">
-                <!-- Title-->
-                <div class="title-container">
-                    <div class="page-heading">
-                        {{ page.title | smartify | strip_html | normalize_whitespace }}
-                    </div>
-                </div>
-                <!-- Date -->
-                <div class="meta">
-                    <div class="date" title="{{ page.date | date_to_xmlschema }}">
-                        {{ page.date | date_to_string }}
-                    </div>
-                    <div class="reading-time">
-                        <!-- <div class="middot"></div> -->
-                        <!-- Expansion -->
-                    </div>
-                </div>
-            </div>
-            <!-- Content -->
-            <div class="markdown">
-                {{ content | normalize_whitespace }}
-            </div>
-            <!-- Comments -->
-            <div class="disqus">
-                {% include disqus.html %}
-            </div>
+<section class="container post">
+    <article>
+        <header>
+            <h1 class="title">
+                {{ page.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify }}
+            </h1>
+
+            <h2 class="date">
+                <time datetime="{{ page.date | date_to_xmlschema }}">
+                    {{ page.date | date_to_long_string }}
+                </time>
+            </h2>
+        </header>
+
+        {{ content }}
+
+        <div class="comments">
+            {% include disqus.html %}
         </div>
-    </div>
-</div>
+    </article>
+</section>