diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index fbd4d8b3..6f5aca9d 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,18 +1,18 @@
-<article>
+<article class="h-entry">
   <header>
-    <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+    <h2 class="p-name"><a class="u-url u-uid" href="{{ .Permalink }}">{{ .Title }}</a></h2>
 
     {{ partial "post_meta.html" . }}
 
   </header>
 
-  <p>
+  <p class="p-summary">
   {{ .Summary }}
   </p>
 
   {{ if .Truncated }}
   <footer>
-    <a href="{{ .RelPermalink }}">Read more<i class="fa fa-angle-double-right fa-fw"></i></a>
+    <a class="u-url" href="{{ .RelPermalink }}">Read more<i class="fa fa-angle-double-right fa-fw"></i></a>
   </footer>
   {{ end }}
 </article>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2202ff41..7a9ee8d0 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -37,6 +37,16 @@
   <link rel="preconnect" href="https://fonts.gstatic.com">
   <link href="https://fonts.googleapis.com/css2?family=Raleway&display=swap" rel="stylesheet" type="text/css">
 
+  <!-- IndieAuth OpenID -->
+  <link rel="self" href="{{ site.BaseURL }}" />
+  <link rel="openid.delegate" href="{{ site.BaseURL }}" />
+  <link rel="openid.server" href="https://openid.indieauth.com/openid" />
+  
+  <!-- IndieAuth PGPKey Method -->
+  {{ with .Site.Params.pgpkey }}
+  <link rel="pgpkey" href="{{ . }}">
+  {{ end }}
+
   <!-- MathJax -->
   <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 
diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html
index abc6bb98..cf172379 100644
--- a/layouts/partials/post_meta.html
+++ b/layouts/partials/post_meta.html
@@ -2,18 +2,27 @@
 
   <div>
     <i class="fa fa-calendar fa-fw"></i>
-    <time>{{ with .Site.Params.dateFormat }}{{ $.Date.Format . }}{{ else }}{{ .Date.Format "02 Jan 2006, 15:04" }}{{ end }}</time>
+    <a class="u-url" href="{{ .Permalink }}"><time class="dt-published">{{ with .Site.Params.dateFormat }}{{ $.Date.Format . }}{{ else }}{{ .Date.Format "02 Jan 2006, 15:04 MST" }}{{ end }}</time></a>
   </div>
 
   {{ $baseUrl := .Site.BaseURL }}
 
+  <!-- IndieWeb Author Insertion -->
+  {{ with $.Param "author" }}
+  <div>
+    <i class="fa fa-address-card fa-fw"></i>
+    <a rel="author" class="p-author h-card" href="{{ with .Params.authorcard }}{{ . }}{{ else }}{{ $baseUrl }}/about/{{ end }}">{{ . }}</a>
+  </div>
+  {{ end }}  
+
+
   {{ if isset .Params "topics" }}
   {{ $count := len .Params.topics }}
   {{ if gt $count 0 }}
   <div>
     <i class="fa fa-folder fa-fw"></i>
     {{ range $k, $v := .Params.topics }}
-      <a class="post-taxonomy-topic" href="{{ $baseUrl }}topics/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
+      <a class="post-taxonomy-topic p-category" href="{{ $baseUrl }}topics/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
     {{ end }}
   </div>
   {{ end }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index f9f6f09f..4dbdb9cf 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,14 +1,16 @@
 {{ partial "header.html" . }}
-
+<article class="h-entry">
 <div class="header">
-  <h1>{{ .Title }}</h1>
-  <h2>{{ .Description }}</h2>
+  <h1 class="p-name">{{ .Title }}</h1>
+  <h2 class="p-summary">{{ .Description }}</h2>
 </div>
 <div class="content">
 
   {{ partial "post_meta.html" . }}
 
+<div class="e-content">
   {{ .Content }}
+</div>
   
   {{ partial "share.html" . }}
 
@@ -21,5 +23,6 @@ <h2>{{ .Description }}</h2>
   {{ partial "telegram.html" . }}
 
 </div>
+</article>
 
 {{ partial "footer.html" . }}
diff --git a/layouts/shortcodes/h-card.html b/layouts/shortcodes/h-card.html
new file mode 100644
index 00000000..a6a6188d
--- /dev/null
+++ b/layouts/shortcodes/h-card.html
@@ -0,0 +1,14 @@
+<div class="h-card">
+	<div class="pure-g">
+		<div class="pure-u-1-1">
+			<div style="padding: 0 .2em">
+				<img class="u-photo pure-img-responsive" src="{{ .Get "photo" }}">
+			</div>
+		</div>
+	</div>
+  My name is <span class="p-name">{{ .Get "name" }}</span>, or more formally <span class="p-honorific-prefix">{{ .Get "honorific" }}</span> <span class="p-given-name">{{ .Get "given-name" }}</span> <abbr class="p-additional-name">{{ .Get "middle-name" }}</abbr> <span class="p-family-name">{{ .Get "family-name" }}</span>.<br />
+  My nickname is <span class="p-nickname">{{ .Get "nickname" }}</span>.
+  This site you're on, entitled <a class="u-url u-uid" rel="me" href="{{ site.BaseURL }}">{{ site.Title }}</a>, is my personal website as part of the <a href="https://indieweb.org/">IndieWeb</a><br />
+  
+  If you need to contact me, please encrypt your messages using <a class="u-key" href="{{ .Get "keyurl" }}">my public key</a>.
+</div>