diff --git a/_layouts/post.html b/_layouts/post.html
index 18f24a9..b28e1cd 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,7 +1,12 @@
 ---
 layout: default
 ---
-<h1>{{ page.title }}</h1>
-<time>{{ page.date | date_to_string }}</time>
-{{ content }}
+<article class="h-entry">
+    <h1 class = "p-name">{{ page.title }}</h1>
+    <time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date_to_string }}</time>
+    <summary style="display:none" class="p-summary">{{ page.excerpt }}</summary>
+    <div class="e-content">
+    {{ content }}
+    </div>
+</article>
 
diff --git a/_layouts/post_klipse.html b/_layouts/post_klipse.html
index 3fe0aea..f309dde 100644
--- a/_layouts/post_klipse.html
+++ b/_layouts/post_klipse.html
@@ -5,7 +5,6 @@
 
     <!-- For styling the interactive code snippets -->
     <link rel="stylesheet" type="text/css" href="/assets/klipse/codemirror.css">
-    <link rel="stylesheet" type="text/css" href="/assets/klipse/neo.css">
 
 
     <script>
@@ -20,9 +19,14 @@
   <body>
     {% include header.html %}
     <main>
-        <h1>{{ page.title }}</h1>
-        <time>{{ page.date | date_to_string }}</time>
+      <article class="h-entry">
+        <h1 class = "p-name">{{ page.title }}</h1>
+        <time class="dt-published">{{ page.date | date_to_string }}</time>
+        <summary style="display:none" class="p-summary">{{ page.excerpt }}</summary>
+        <div class="e-content">
         {{ content }}
+        </div>
+    </article>
     </main>
     <script src="/assets/klipse/klipse_plugin.min.js"></script>
   </body>
diff --git a/_sass/blogroll.scss b/_sass/blogroll.scss
index f0c520c..271cf90 100644
--- a/_sass/blogroll.scss
+++ b/_sass/blogroll.scss
@@ -1,3 +1,6 @@
-h2.blogroll-title > a {
-    text-decoration: none;
+h2.blogroll-title {
+    a {
+        text-decoration: none;
+    }
+
 }
\ No newline at end of file
diff --git a/_sass/main.scss b/_sass/main.scss
index 7c566b3..d5f207a 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -69,6 +69,11 @@ main :not(:is(h1,h2,h3,h4,h5,h6)) {
     line-height: 1.3;
     }
 
+/* increase line-height for everything except headings */
+main :is(p,h1,h2,h3,h4,h5,h6) {
+    margin-block-end: 0.0em;
+    }
+
 a {
     text-decoration: underline;
     color: #222;
diff --git a/blog.html b/blog.html
index 65e5a57..de5fd26 100644
--- a/blog.html
+++ b/blog.html
@@ -4,9 +4,10 @@ title: Blog
 permalink: /blog/
 ---
 {% for post in site.posts %}
-<article>
-    <h2 class="blogroll-title"><a href="{{ post.url }}">{{ post.title }}</a></h2>
-    <summary>{{ post.excerpt }}</summary>
-    <figure class="blogroll"><img src = "{{post.image}}"></figure>
+<article class="h-entry">
+    <h2 class="p-name blogroll-title"><a class="u-uid u-url" href="{{ post.url }}">{{ post.title }}</a></h2>
+    <time class="dt-published" datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date_to_string }}</time>
+    <summary class="p-summary">{{ post.excerpt | remove: '<p>' | remove: '</p>' }}</summary>
+    <figure class="blogroll"><img class="u-photo" src = "{{post.image}}"></figure>
 </article>
 {% endfor %}
