diff --git a/_layouts/home.html b/_layouts/home.html
index 3d0565cb..4fedaf09 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -25,13 +25,13 @@
   {% include author-bio.html %}
 </div>
 
-<div id="index">
+<div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
   <h3>Latest Articles</h3>
   <hr />
   {% for post in site.categories.articles limit:5 %}    
-  <article>
-    <h2><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
-    <p>{% if page.description %}{{ page.description }}{% else %}{{ page.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
+  <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
+    <h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
+    <p itemprop="text">{% if page.description %}{{ page.description }}{% else %}{{ page.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
   </article>
   {% endfor %}
 </div><!-- /#index -->
diff --git a/_layouts/page.html b/_layouts/page.html
index 2e59c241..754c0651 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -14,14 +14,14 @@
 {% include navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
-  <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image">
+  <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
 </div><!-- /.image-wrap -->{% endif %}
 
-<div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
+<div id="main" role="main"  itemprop="mainContentOfPage">
   <div class="article-author-top">
     {% include author-bio.html %}
   </div>
-  <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
+  <article itemscope itemtype="http://schema.org/CreativeWork">
     <div class="headline-wrap">
       <h1 itemprop="headline">{{ page.title }}</h1>
     </div><!--/ .headline-wrap -->
diff --git a/_layouts/post-index.html b/_layouts/post-index.html
index 8c91277a..0c66e282 100644
--- a/_layouts/post-index.html
+++ b/_layouts/post-index.html
@@ -25,12 +25,12 @@
   {% include author-bio.html %}
 </div>
 
-<div id="index">
+<div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
   {% for post in site.posts %}  
-  <article>
-    <h2><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
+  <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
+    <h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
     <p class="byline"><time datetime="{{ post.date | date_to_xmlschema }}" itemprop="datePublished">{{ post.date | date: "%B %d, %Y" }}</time></p>
-    <p>{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
+    <p itemprop="text">{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
   </article>
   {% endfor %}
 </div><!-- /#index -->
diff --git a/_layouts/post.html b/_layouts/post.html
index df5e4345..39470baf 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -14,7 +14,7 @@
 {% include navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
-  <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="image">
+  <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
 </div><!-- /.image-wrap -->{% endif %}
 
 <div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">