diff --git a/templates/_author_item.html b/templates/_author_item.html
index 08983d0..9214d44 100644
--- a/templates/_author_item.html
+++ b/templates/_author_item.html
@@ -2,13 +2,14 @@
   {% if name in AUTHORS %}
   {% set props = AUTHORS[name] %}
   {% endif %}
-  <li class="row">
+  <li class="row" itemprop="itemListElement" itemscope itemtype="http://schema.org/Person">
+    <meta itemprop="memberOf" content="{{ SITENAME }}" />
     <div class="author">
       <div class="small-4 columns">
         <a class="th" href="{{ SITEURL }}/{{ author.url }}">
           {% if props %}
           {% for key, value in props.vcard if key == 'photo' %}
-          <img src="{{ value }}" />
+          <img src="{{ value }}" itemprop="image" />
           {% else %}
           <img src="{{ SITEURL+'/'+FAVICON }}"/>
           {% endfor %}
@@ -23,22 +24,32 @@
         </header>
         <ul class="vcard">
           {% if props %}
-          {% for key, value in props.vcard if not key == 'photo' %}
+          {% for key, value in props.vcard %}
           <li class="{{key}}">
-          {% if key == 'email' %}
-          <a href="mailto:{{ value }}">{{ value }}</a>
+          {% if key == 'fn' %}
+          <span itemprop="name">{{ value }}</span>
+          {% elif key == 'email' %}
+          <a href="mailto:{{ value }}"itemprop="email">{{ value }}</a>
           {% elif key == 'url' %}
-          <a href="{{ value }}">{{ value }}</a>
-          {% elif key == 'notes' %}
-          <p>{{ value }}</p>
+          <a href="{{ value }}" itemprop="sameAs">{{ value }}</a>
+          {% elif key == 'note' %}
+          <div itemprop="description" <p>{{ value }}</p>
+          {% elif key == 'tel' %}
+          <span itemprop="telephone">{{ value }}</span>
+          {% elif key =='title' %}
+          <span itemprop="jobTitle">{{ value }}</span>
+          {% elif key == 'org' %}
+          <span itemprop="affiliation">{{ value }}</span>
+          {% elif key == 'photo' %}
+          <img class="photo" src="{{ value }}"/>
           {% else %}
-          {{ value }}
+          <span itemprop="{{ key }}">{{ value }}</span>
           {% endif %}
           </li>
           {% endfor %}
           {% else %}
-          <li class="fn">{{ author }}</li>
-          <li class="url"><a href="{{ SITEURL+'/'+author.url }}">{{ SITEURL+'/'+author.url }}</a></li> 
+          <li class="fn" itemprop="name">{{ author }}</li>
+          <li class="url"><a href="{{ SITEURL+'/'+author.url }}" itemprop="url" >{{ SITEURL+'/'+author.url }}</a></li> 
           {% endif %}
         </ul>
         {% if props %}
@@ -50,4 +61,5 @@
         {% endif %}
       </div>
     </div>
-  </li>
\ No newline at end of file
+  </li>
+
diff --git a/templates/_list_item.html b/templates/_list_item.html
index 1dccfa5..4a91ac3 100644
--- a/templates/_list_item.html
+++ b/templates/_list_item.html
@@ -1,15 +1,16 @@
-<li class="row">
+<li class="row" itemprop="itemListElement" itemscope itemtype="http://schema.org/Article">
   <div class="article">
     <div class="small-4 columns">
       {% if article.image %}
-      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/static/{{article.image}}"/></a>
+      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/static/{{article.image}}" itemprop="image" /></a>
       {% else %}
       <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/{{ FAVICON }}"/></a>
       {% endif %}
     </div>
     <div class="small-12 columns">
       <header>
-        <h3><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title|title }}</a></h3>
+        <h3 itemprop="headline"><a href="{{ SITEURL }}/{{ article.url }}" itemprop="url">{{ article.title|title }}</a></h3>
+        <meta itemprop="name" content="{{ article.title }}"/>
         {% if not category %}
         <div><span>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></div>
         {% endif %}
@@ -30,9 +31,9 @@
       </div>
       <footer>
         <ul class="no-bullet">
-          <li>Published by <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> on: <abbr class="published" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</abbr></li>
+          <li>Published by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><a href="{{ SITEURL }}/{{ article.author.url }}" itemprop="url"><span itemprop="name">{{ article.author }}</span></a></span> on: <abbr class="published" title="{{ article.date.isoformat() }}" itemprop="datePublished">{{ article.locale_date }}</abbr></li>
           {% if article.modified %}
-          <li>Last Modified on: <abbr title="{{ article.modified }}">{{ article.modified }}</abbr></li>
+          <li>Last Modified on: <abbr title="{{ article.modified }}" itemprop="dateModified">{{ article.modified }}</abbr></li>
           {% endif %}
         </ul>      
       </footer>
diff --git a/templates/archives.html b/templates/archives.html
index b383216..ed5f2d4 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,6 +1,4 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - Archives{% endblock %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ page_name }}.html" rel="bookmark" title="Permalink to archives">Archives</a>{% endblock %}
 {% block content %}
 <dl class="item-list">
 {% for article in articles %}
@@ -22,3 +20,4 @@
 {% endfor %}
 </dl>
 {% endblock %}
+
diff --git a/templates/author.html b/templates/author.html
index 1825f37..ec0eb72 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,9 +1,8 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - {{author}}{% endblock %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ author.url }}" rel="bookmark">{{author}}</a>{% endblock %}
 {% block content %}
-<ul class="item-list">
+<ul class="item-list featured" itemscope itemtype="http://schema.org/ItemList">
 {% include '_author_item.html' %}
 </ul>
 {{ super() }}
 {% endblock %}
+
diff --git a/templates/authors.html b/templates/authors.html
index 3bff460..699dcd7 100644
--- a/templates/authors.html
+++ b/templates/authors.html
@@ -1,11 +1,13 @@
 {% extends 'base.html' %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ page_name }}.html" rel="bookmark">Authors</a>{% endblock %}
 {% block content %}
 {% if authors %}
-<ul class="item-list">
+<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
+  <meta itemprop="name" content="Authors"/>
+  <meta itemprop="itemListOrder" content="Unordered"/>
   {% for author, articles  in authors %}
   {% include '_author_item.html' %}
   {% endfor %}
 </ul>
 {% endif %}
 {% endblock %}
+
diff --git a/templates/categories.html b/templates/categories.html
index 6cd24ee..d730d43 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,11 +1,10 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - Categories{% endblock %}  
-{% block content_title %}<a href="{{ SITEURL }}/{{ page_name }}.html" rel="bookmark">Categories</a>{% endblock %}
 {% block content %}
 <h2>Recent Articles by Category</h2>
 {% for cat, articles in categories %}
 <h3><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></h3>
-<ul class="item-list">
+<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
+  <meta itemprop="name" content="{{ cat }} recent articles"/>
 {% for article in articles[0:3] %}
 {% include '_list_item.html' %}
 {% endfor %}
diff --git a/templates/category.html b/templates/category.html
index 1824099..b65a6cb 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,4 +1,2 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - {{ category }}{% endblock %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ category.url }}" rel="bookmark">{{ category }}</a>{% endblock %}
 
diff --git a/templates/index.html b/templates/index.html
index 0b1f8b3..9e443dd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,12 +1,10 @@
 {% extends 'base.html' %}
-{% block content_title %}
-<a href="{{ SITEURL }}/index.html" rel="bookmark">{{ SITENAME }}</a>
-{% endblock %}
 {% block content %}
 <p>{{ SITE_DESCR }}</p>
 {% if articles and ARTICLES_ON_INDEX %}
 <h2>Recent Articles:</h2>
-<ul class="item-list">
+<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
+<meta name="Recent Articles"/>
 {% for article in articles[0:ARTICLES_ON_INDEX] %}
 {% include '_list_item.html' %}
 {% endfor %}
diff --git a/templates/page.html b/templates/page.html
index 6f02e0e..4566794 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,8 +1,13 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - {{ page.title|title }}{% endblock %}  
-{% block content_title %}<a href="{{ SITEURL }}/{{ page.url }}" rel="bookmark">{{ page.title|title }}</a>{% endblock %}
+{% block content_image %}
+{% if page.image %}
+<a class="th" href="{{ SITEURL }}/static/{{ article.image }}">
+  <img src="{{ SITEURL }}/static/{{ article.image }}" itemprop="image"/>
+</a>  
+{% endif %}
+{% endblock %}
 {% block content %}
-<article>
+<article itemprop="text">
 {{ page.content }}
 </article>
 <footer class="page_footer">
diff --git a/templates/tag.html b/templates/tag.html
index 0d2fe87..b65a6cb 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,3 +1,2 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - {{ tag }} {% endblock %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ tag.url }}" rel="bookmark">{{ tag }}</a>{% endblock %}  
+
diff --git a/templates/tags.html b/templates/tags.html
index 10003f6..1bbee4b 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,6 +1,4 @@
 {% extends 'base.html' %}
-{% block title %}{{ super() }} - Tags{% endblock %}
-{% block content_title %}<a href="{{ SITEURL }}/{{ page_name }}.html" rel="bookmark">Tags</a>{% endblock %}
 {% block content %}
 <p>A list of all tags with article counts is below:</p>
 <ul class="tag-list">