diff --git a/_layouts/page.html b/_layouts/page.html
index 2ac2b93..ee85b10 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -12,14 +12,14 @@
 {% include browser-upgrade.html %}
 {% include navigation.html %}
 
-<div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
-  <article class="hentry" itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogpost">
-    {% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}">{% endif %}
+<div id="main" role="main" itemprop="mainContentOfPage">
+  <article class="entry" itemscope itemtype="http://schema.org/ItemPage">
+    {% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}" itemprop="image">{% endif %}
     <div class="entry-wrapper">
       <header class="entry-header">
-        <h1 class="entry-title" itemprop="headline">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}</h1>{% endif %}
+        <h1 class="entry-title" itemprop="name">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}</h1>{% endif %}
       </header>
-      <div class="entry-content">
+      <div class="entry-content" itemprop="description">
         {{ content }}
       </div><!-- /.entry-content -->
     </div><!-- /.entry-wrapper -->
diff --git a/_layouts/post.html b/_layouts/post.html
index 6bf4aca..f836f50 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -12,13 +12,13 @@
 {% include browser-upgrade.html %}
 {% include navigation.html %}
 
-<div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
-  <article class="hentry" itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogpost">
-    {% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}">{% endif %}
+<div id="main" role="main" itemprop="mainContentOfPage">
+  <article class="hentry" itemscope itemtype="http://schema.org/BlogPosting">
+    {% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}" itemprop="image">{% endif %}
     <div class="entry-wrapper">
       <header class="entry-header">
         <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags.html#{{ tag | cgi_encode }}" title="Pages tagged {{ tag }}" rel="tag">{{ tag }}</a>{% unless forloop.last %} &bull; {% endunless %}{% endfor %}</span>
-        <h1 class="entry-title" itemprop="headline">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %}</h1>
+        <h1 class="entry-title" itemprop="name">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %}</h1>
       </header>
       <footer class="entry-meta">
         <img src="{{ site.url }}/images/{{ site.owner.avatar }}" alt="{{ site.owner.name }} photo" class="author-photo">
@@ -26,9 +26,9 @@
         <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
         {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
         {% if site.disqus_shortname and page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
-        <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span>
+        <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}" itemprop="url"><i class="icon-link"></i> Permalink</a></span>
       </footer>
-      <div class="entry-content">
+      <div class="entry-content" itemprop="description">
         {{ content }}
         {% if site.disqus_shortname and page.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
       </div><!-- /.entry-content -->
diff --git a/assets/css/main.css b/assets/css/main.css
index 8736297..cb5db5b 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -581,8 +581,8 @@ body{margin:0;padding:0;width:100%;background-color:#ffffff;border-top:5px solid
 .site-description{margin-top:0;font-family:'volkhov',serif;font-size:16px;font-size:1rem;font-weight:400;font-style:italic;-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;-webkit-animation-delay:1s;-moz-animation-delay:1s;-o-animation-delay:1s;animation-delay:1s;}@media only screen and (min-width: 48em){.site-description{font-size:20px;font-size:1.25rem;}}
 #main{*zoom:1;}#main:before,#main:after{display:table;content:"";line-height:0;}
 #main:after{clear:both;}
-.hentry{*zoom:1;border-bottom:1px solid #cccccc;border-bottom:1px solid rgba(0, 0, 0, 0.1);}.hentry:before,.hentry:after{display:table;content:"";line-height:0;}
-.hentry:after{clear:both;}
+.entry,.hentry{*zoom:1;border-bottom:1px solid #cccccc;border-bottom:1px solid rgba(0, 0, 0, 0.1);}.entry:before,.hentry:before,.entry:after,.hentry:after{display:table;content:"";line-height:0;}
+.entry:after,.hentry:after{clear:both;}
 .entry-feature-image{margin:40px 0;width:100%;}
 .entry-header{max-width:640px;width:100%;margin-right:auto;margin-left:auto;}@media only screen and (min-width: 62.5em){.entry-header{max-width:100%;margin-right:0;margin-left:0;}}
 .entry-tags{display:block;margin-top:2em;text-transform:uppercase;font-size:16px;font-size:1rem;font-weight:600;}.entry-tags a{color:#222222;}
diff --git a/assets/less/page.less b/assets/less/page.less
index aaace3f..7b709f0 100644
--- a/assets/less/page.less
+++ b/assets/less/page.less
@@ -172,6 +172,7 @@ body {
 #main {
 	.clearfix();
 }
+.entry,
 .hentry {
 	.clearfix();
 	border-bottom: 1px solid lighten(@black,80);