diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f69e8c3..e102592 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -29,7 +29,7 @@
             {{- end }}
         </nav>
     </header>
-    <main>
+    <main {{ if eq .Kind "page" }}class="h-entry"{{ else if eq .Kind "section" }}class="h-feed"{{ end }}>
         <header>
             {{- block "content-header" . -}}
             {{- end -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8d45305..e18e7db 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,10 +3,10 @@
 {{ .Title }} &ndash; {{ .Site.Title }}
 {{ end }}
 {{ define "content-header" }}
-<h1 id="title">{{ .Title }}</h1>
+<h1 class="p-name">{{ .Title }}</h1>
 {{ end }}
 {{ define "content" }}
-<header class="list-content">
+<header class="list-content e-content">
     {{ .Content }}
 </header>
 {{ range $index, $page := (.Paginate (where .Pages ".Params.hidden" "!=" "true")).Pages }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6245c11..af4d555 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,10 +3,14 @@
 {{ .Title }} &ndash; {{ .Site.Title }}
 {{ end }}
 {{ define "content-header" }}
-<h1>{{ .Title }}</h1>
+<h1 class="p-name">{{ .Title }}</h1>
+<p>
+    Published by <a class="p-author h-card" href="{{ .Site.BaseURL }}">{{ .Site.Params.Card.Author }}</a> on
+    <time class="dt-published" datetime="{{ .Date }}">{{ .Date.Format "January 2, 2006" }}</time>
+</p>
 {{ end }}
 {{ define "content" }}
-<article>
+<article class="e-content">
     {{ .Content }}
 </article>
 {{ end }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index e83980c..169ab1b 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,9 +1,13 @@
-<article class="post">
+<article class="h-entry">
     <header>
-        <h2><a href='{{ .Permalink }}'>{{ .Title }}</a> </h2>
-        <div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words </div>
+        <h2 class="p-name u-url"><a href='{{ .Permalink }}'>{{ .Title }}</a> </h2>
+        <p>
+            Published by <a class="p-author h-card" href="{{ .Site.BaseURL }}">{{ .Site.Params.Card.Author }}</a> on
+            <time class="dt-published" datetime="{{ .Date }}">{{ .Date.Format "January 2, 2006" }}</time>
+            &ndash; {{ .FuzzyWordCount }} Words
+        </p>
     </header>
-    <section>
+    <section class="p-summary">
         {{ .Summary }}
     </section>
     {{- if .Truncated }}