diff --git a/_includes/gallery_list.html b/_includes/gallery_list.html
index cecaec2..ac515d8 100644
--- a/_includes/gallery_list.html
+++ b/_includes/gallery_list.html
@@ -1,4 +1,4 @@
 <div class="list-gallery">
     {% capture path %}gallery/{{ include.gallery }}{% endcapture %}
-    {% loopdir path:path match:"*.md" sort:"ordering" %}<a href="/{{ item.fullname }}.html"><img alt="Photo: {{ item.title }}" height="200" src="{{ site.asset_prefix }}/{{ item.fullname }}~200x200.jpg" title="{{ item.title }}" width="200" /></a>{% endloopdir %}
+    {% loopdir path:path match:"*.md" sort:"ordering" %}<span itemprop="image" itemscope itemtype="http://schema.org/Photograph"><a href="/{{ item.fullname }}.html" itemprop="url"><img alt="Photo: {{ item.title }}" height="200" src="{{ site.asset_prefix }}/{{ item.fullname }}~200x200.jpg" title="{{ item.title }}" width="200" /></a></span>{% endloopdir %}
 </div>
diff --git a/_includes/gallery_list640w.html b/_includes/gallery_list640w.html
index df4ac75..27d721e 100644
--- a/_includes/gallery_list640w.html
+++ b/_includes/gallery_list640w.html
@@ -1,2 +1,2 @@
 {% capture path %}gallery/{{ include.gallery }}{% endcapture %}
-{% loopdir path:path match:"*.md" sort:"ordering" %}<a href="/{{ item.fullname }}.html"><img alt="Photo: {{ item.title }}" src="{{ site.asset_prefix }}/{{ item.fullname }}~640w.jpg" title="{{ item.title }}" width="640" /></a>{% endloopdir %}
+{% loopdir path:path match:"*.md" sort:"ordering" %}<span itemprop="image" itemscope itemtype="http://schema.org/Photograph"><a href="/{{ item.fullname }}.html" itemprop="url"><img alt="Photo: {{ item.title }}" src="{{ site.asset_prefix }}/{{ item.fullname }}~640w.jpg" title="{{ item.title }}" width="640" /></a></span>{% endloopdir %}
diff --git a/_layouts/gallery-list.html b/_layouts/gallery-list.html
new file mode 100644
index 0000000..c776bc6
--- /dev/null
+++ b/_layouts/gallery-list.html
@@ -0,0 +1,13 @@
+{% include header.html %}
+<section itemscope itemtype="http://schema.org/ImageGallery">
+    <header>
+        <div class="timeline"></div>
+        <h1>
+            <span itemprop="name">{{ page.title }}</span>
+        </h1>
+    </header>
+    <section class="post-content">
+        {{ content }}
+    </section>
+</section>
+{% include footer.html %}
diff --git a/_layouts/gallery-photo.html b/_layouts/gallery-photo.html
index 443d9e3..ed99ac1 100644
--- a/_layouts/gallery-photo.html
+++ b/_layouts/gallery-photo.html
@@ -1,5 +1,5 @@
 {% include header.html %}
-<section>
+<section itemscope itemtype="http://schema.org/Photograph">
     <header>
         <div class="timeline">
             {% if page.date %}
@@ -26,8 +26,10 @@
             {% endif %}
         </ul>
         <h1>
-            {{ page.title }}
-            <small class="print-only">{{ page.date|date:'%A, %B %d, %Y' }}</small>
+            <span itemprop="name">{{ page.title }}</span>
+            {% if page.date %}
+                <small class="print-only">{{ page.date|date:'%A, %B %d, %Y' }}</small>
+            {% endif %}
         </h1>
     </header>
     <section class="post-content">
@@ -35,14 +37,18 @@
             <img alt="Photo: {{ page.title }}" src="{{ site.asset_prefix }}{{ page.url|replace:".html","~640w.jpg" }}" style="max-width:630px;" />
         </p>
 
-        {{ content }}
+        {% if content %}
+            <div itemprop="description">
+                {{ content }}
+            </div>
+        {% endif %}
     </section>
     <div class="meta">
         <div class="meta-properties">
             <div style="float:left;width:352px;">
                 <dl style="margin-top:0;">
                     <dt>Date</dt>
-                    <dd>{{ page.date|date:'%A, %B %d at %I:%M %p'|replace:' 0',' '|replace:' AM',' am'|replace:' PM',' pm' }}
+                    <dd itemprop="dateCreated" content="{{ page.date|date:'%FT%TZ' }}">{{ page.date|date:'%A, %B %d at %I:%M %p'|replace:' 0',' '|replace:' AM',' am'|replace:' PM',' pm' }}
 
                     <dt>Camera</dt>
                     <dd>{{ page.exif.make }} {{ page.exif.model }}
@@ -58,7 +64,11 @@
                         <dd>
                             {% for size in page.sizes %}
                                 {% if 0 < forloop.index0 %}&nbsp;&middot;&nbsp;{% endif %}
-                                <a href="{{ site.asset_prefix }}{{ page.url|replace:".html","" }}~{{ size[0] }}.jpg">{{ size[1].width }}x{{size[1].height }}</a>
+                                <span itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
+                                    <meta itemprop="height" content="{{ size[1].height }}" />
+                                    <meta itemprop="width" content="{{ size[1].width }}" />
+                                    <a href="{{ site.asset_prefix }}{{ page.url|replace:".html","" }}~{{ size[0] }}.jpg" itemprop="contentUrl">{{ size[1].width }}x{{size[1].height }}</a>
+                                </span>
                             {% endfor %}
                         </dd>
                     {% endif %}
@@ -66,7 +76,11 @@
             </div>
 
             {% if page.location %}
-                <div style="float:left;line-height:0;margin-left:7px;width:280px;">
+                <div style="float:left;line-height:0;margin-left:7px;width:280px;" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+                    <span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+                        <meta itemprop="latitude" content="{{ page.location.latitude }}" />
+                        <meta itemprop="longitude" content="{{ page.location.longitude }}" />
+                    </span>
                     <a href="https://maps.google.com/maps?hl=en&amp;ll={{ page.location.latitude }},{{ page.location.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="173" src="https://maps.googleapis.com/maps/api/staticmap?center={{ page.location.latitude }},{{ page.location.longitude }}&amp;zoom=13&amp;size=280x173&amp;markers=size:mid%7Ccolor:orange%7C{{ page.location.latitude }},{{ page.location.longitude }}&amp;sensor=false" title="{{ page.location.title }}" width="280" /></a>
                 </div>
             {% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
index 97db04d..ff4c6a5 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,5 +1,5 @@
 {% include header.html %}
-<section>
+<section itemscope itemtype="http://schema.org/BlogPosting">
     <header>
         <div class="timeline">
             {% if page.date %}
@@ -16,11 +16,11 @@
             
         </div>
         <h1>
-            {{ page.title }}
-            <small class="print-only">{{ page.date|date:'%A, %B %d, %Y' }}</small>
+            <span itemprop="name">{{ page.title }}</span>
+            <small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
         </h1>
     </header>
-    <section class="post-content">
+    <section class="post-content" itemprop="articleBody">
         {{ content }}
     </section>
     <div class="meta">
diff --git a/gallery/2014-colorado-aspens/index.html b/gallery/2014-colorado-aspens/index.html
index 1fb16fa..5ce5bb3 100644
--- a/gallery/2014-colorado-aspens/index.html
+++ b/gallery/2014-colorado-aspens/index.html
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: gallery-list
 title: Colorado Aspens
 ---
 
diff --git a/gallery/2014-london-iceland-trip/index.html b/gallery/2014-london-iceland-trip/index.html
index 9922a48..f7b63d8 100644
--- a/gallery/2014-london-iceland-trip/index.html
+++ b/gallery/2014-london-iceland-trip/index.html
@@ -1,10 +1,12 @@
 ---
-layout: post
+layout: gallery-list
 title : London &amp; Iceland Trip
 ---
 
-<p>
-    Some photos from my trip to London and Iceland. See them <a href="map.html">on a map</a>, too.
-</p>
+<div itemprop="description">
+    <p>
+        Some photos from my trip to London and Iceland. See them <a href="map.html">on a map</a>, too.
+    </p>
+</div>
 
 {% include gallery_list.html gallery='2014-london-iceland-trip' %}