diff --git a/_layouts/default.html b/_layouts/default.html
index b1ca412..7fa5693 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,21 +3,16 @@ layout: compress
 ---
 
 <!DOCTYPE html>
-<html lang="ru">
+<html lang="{{ site | smartify | strip_html | normalize_whitespace }}">
 
 {% include head.html %}
 
 <body>
     {% include header.html %}
-
     {% include icons.html %}
 
     <section class="main">
-        <div class="container">
-            <div class="content">
-                {{ content | normalize_whitespace }}
-            </div>
-        </div>
+        {{ content | normalize_whitespace }}
     </section>
 </body>
 
diff --git a/_layouts/page.html b/_layouts/page.html
index 67ac0c6..3ab07d9 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,12 +2,15 @@
 layout: default
 ---
 
-<div class="page">
-    <!-- Header -->
-    <h1 class="page-title">
-        {{ page.title | smartify | strip_html | normalize_whitespace }}
-    </h1>
-
-    <!-- Contents -->
-    {{ content | normalize_whitespace }}
+<div class="container">
+    <div class="content">
+        <!-- Header -->
+        <div class="page-heading">
+            {{ page.title | smartify | strip_html | normalize_whitespace }}
+        </div>
+        <!-- Contents -->
+        <div class=markdown>
+            {{ content | normalize_whitespace }}
+        </div>
+    </div>
 </div>
diff --git a/_layouts/post.html b/_layouts/post.html
index aa5b6ca..d8755ee 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,36 +2,36 @@
 layout: default
 ---
 
-<div class="post">
-    <!-- Header -->
-    <h1 class="post-title">
-        {{ page.title | smartify | strip_html | normalize_whitespace }}
-    </h1>
-
-    <!-- Date -->
-    <span class="post-date">{{ page.date | date_to_long_string }}</span>
-
-    <!-- Contents -->
-    {{ content | normalize_whitespace }}
-</div>
-
-<!-- Comments on the post -->
-<div class="comments">
-    <div id="disqus_thread"></div>
-    <script type="text/javascript" defer>
-        var disqus_config = function() {
-            this.page.identifier = '{{ page.id | slugify }}';
-            this.page.title = '{{ page.title | smartify | strip_html | normalize_whitespace }}';
-            this.page.url = '{{ page.url | absolute_url | uri_escape }}';
-        };
-
-        (function() {
-            var d = document,
-                s = d.createElement('script');
-            s.src = '//valentineus-link.disqus.com/embed.js';
-            s.setAttribute('data-timestamp', +new Date());
-            (d.head || d.body).appendChild(s);
-        })();
-    </script>
-
+<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>
+        </div>
+    </div>
 </div>
