diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 52969aeb..6cd2a5df 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,22 +1,22 @@
 {{ partial "header.html" . }}
 {{ partial "blog-header.html" . }}
     <main id="single">
-      <article>
+      <article itemscope itemtype="http://schema.org/Article" class="h-entry">
         <div id="info">
-          <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+          <h1 itemprop="name" class="p-name"><a href="{{ .Permalink }}" itemprop="url" class="u-url">{{ .Title }}</a></h1>
           <div class="meta">
-            by <a rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a> &middot; 
-            <a href="{{ .Permalink }}">{{ .Date.Format "January 2, 2006" }}</a> &middot; 
+            by <span itemprop="author" itemscope itemtype="http://schema.org/Person" class="p-author"><a itemprop="url" rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis" class="h-card"><span itemprop="name" class="p-name">Jake Jarvis</span></a></span> &middot; 
+            <a href="{{ .Permalink }}"><time itemprop="datePublished" content="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}" class="dt-published">{{ .Date.Format "January 2, 2006" }}</time></a> &middot; 
             <!-- {{ if lt 1 .WordCount }}{{ .WordCount }} words{{ else }}{{ .WordCount }} word{{ end }} &middot; -->
             {{ .ReadingTime }} minute read
             <div class="tags">
             {{ with .Params.tags }}{{ if ge (len .) 1 }}
-              {{ range . }}<span class="tag"><!--<a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">-->{{ . }}<!--</a>--></span> {{ end }}
+              {{ range . }}<span class="tag p-category"><!--<a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">-->{{ . }}<!--</a>--></span> {{ end }}
             {{ end }}{{ end }}
             </div>
           </div>
         </div>
-        <div id="content">
+        <div id="content" itemprop="articleBody" class="e-content">
 {{ .Content }}
         </div>
         <div id="commento"></div>
diff --git a/layouts/index.html b/layouts/index.html
index 278d98f7..9e1c0c7e 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,8 +1,8 @@
 {{ partial "header.html" . }}
-    <main itemscope itemtype="http://schema.org/Person">
+    <main itemscope itemtype="http://schema.org/Person" class="h-card">
       <header>
-        <img itemprop="image" id="me" src="{{ "me.jpg" | absURL }}" alt="Photo of Jake Jarvis" title="Photo of Jake Jarvis">
-        <h1>Hi! I'm <span itemprop="name">Jake Jarvis</span>. <span id="wave">&#x1F44B;<!--&#x1F3FB;--></span></h1>
+        <img itemprop="image" id="me" class="u-photo" src="{{ "me.jpg" | absURL }}" alt="Photo of Jake Jarvis" title="Photo of Jake Jarvis">
+        <h1>Hi! I'm <a itemprop="url" rel="me author" class="u-url" href="{{ .Site.BaseURL }}" title="Jake Jarvis"><span itemprop="name" class="p-name">Jake Jarvis</span></a>. <span id="wave">&#x1F44B;<!--&#x1F3FB;--></span></h1>
         <h2 itemprop="description">I'm a <span itemprop="jobTitle">web and mobile developer</span> based in <a href="https://www.youtube-nocookie.com/embed/rLwbzGyC6t4?hl=en&amp;fs=1&amp;showinfo=1&amp;rel=0&amp;iv_load_policy=3" title="&quot;Boston Accent Trailer - Late Night with Seth Meyers&quot; on YouTube" id="boston" target="_blank" rel="noopener noreferrer nofollow"><span itemprop="homeLocation">Boston</span></a>.</h2>
       </header>
       <p>My recent focus has been on <a href="https://nodejs.org/en/" title="Node.js Official Website" id="node" target="_blank" rel="noopener noreferrer nofollow">Node</a>, <a href="https://expressjs.com/" title="Express Official Website" id="express" target="_blank" rel="noopener noreferrer nofollow">Express</a>, and <a href="https://www.mongodb.com/blog/post/the-modern-application-stack-part-1-introducing-the-mean-stack" title="&quot;Introducing The MEAN Stack&quot; on MongoDB" id="mongo" target="_blank" rel="noopener noreferrer nofollow">MongoDB</a> stacks behind modern <a href="https://stackoverflow.blog/2018/01/11/brutal-lifecycle-javascript-frameworks/" title="&quot;The Brutal Lifecycle of JavaScript Frameworks&quot; by Ian Allen" id="javascript" target="_blank" rel="noopener noreferrer nofollow">JavaScript frameworks</a> like <a href="https://reactjs.org/" title="React Official Website" id="react" target="_blank" rel="noopener noreferrer nofollow">React</a>, <a href="https://angular.io/" title="Angular Official Website" id="angular" target="_blank" rel="noopener noreferrer nofollow">Angular</a>, and <a href="https://vuejs.org/" title="Vue.js Official Website" id="vue" target="_blank" rel="noopener noreferrer nofollow">Vue</a>...</p>
@@ -19,11 +19,11 @@
         <a href="https://gigaom.com/2009/10/06/fresh-faces-in-tech-10-kid-entrepreneurs-to-watch/6/" title="&quot;Fresh Faces in Tech: 10 Kid Entrepreneurs to Watch&quot; on Gigaom" id="news-7" target="_blank" rel="noopener noreferrer nofollow">outlets</a>.
       </p>
       <p>You can find some of my work on <a href="https://github.com/jakejarvis" title="Jake Jarvis on GitHub" id="github" target="_blank" rel="me noopener noreferrer">GitHub</a> or <a href="https://www.linkedin.com/in/jakejarvis/" title="Jake Jarvis on LinkedIn" id="linkedin" target="_blank" rel="me noopener noreferrer">LinkedIn</a>, my adventures on <a href="https://twitter.com/jakejarvis" title="Jake Jarvis on Twitter" class="twitter" target="_blank" rel="me noopener noreferrer">Twitter</a>, <a href="https://www.facebook.com/jakejarvis" title="Jake Jarvis on Facebook" id="facebook" target="_blank" rel="me noopener noreferrer">Facebook</a>, <a href="https://www.instagram.com/jakejarvis/" title="Jake Jarvis on Instagram" id="instagram" target="_blank" rel="me noopener noreferrer">Instagram</a>, or <a href="https://mastodon.social/@jakejarvis" title="Jake Jarvis on Mastodon" id="mastodon" target="_blank" rel="me noopener noreferrer">Mastodon</a>, and my standard <a href="{{ "resume.pdf" | absURL }}" title="View PDF Resume" id="resume" target="_blank" rel="noopener">PDF resume here</a>.</p>
-      <p>If any of this fits with what you're looking for, I'd love to hear from you via <a itemprop="email" href="&#x6D;&#x61;&#x69;&#x6C;&#x74;&#x6F;&#x3A;&#x6A;&#x61;&#x6B;&#x65;&#x40;&#x6A;&#x61;&#x72;&#x76;&#x2E;&#x69;&#x73;" title="Send Email" id="email">email</a><sup>&nbsp;<a href="https://keybase.io/jakejarvis/pgp_keys.asc?fingerprint=87fb4b6006dd1beb3ed47fabd36cb66f4002b25b" title="Jake Jarvis&#39;s Public Key on Keybase" id="pgp" target="_blank" rel="noopener noreferrer nofollow">D36C B66F 4002 B25B</a></sup>, <a href="https://twitter.com/messages/compose?recipient_id=229769022" title="Send Direct Message on Twitter" class="twitter" target="_blank" rel="noopener noreferrer nofollow">DM</a>, or <a href="sms:+1-908-444-6655" title="Send SMS: +1 (908) 444-6655" id="sms">text</a>!</p>
+      <p>If any of this fits with what you're looking for, I'd love to hear from you via <a itemprop="email" class="u-email" href="&#x6D;&#x61;&#x69;&#x6C;&#x74;&#x6F;&#x3A;&#x6A;&#x61;&#x6B;&#x65;&#x40;&#x6A;&#x61;&#x72;&#x76;&#x2E;&#x69;&#x73;" title="Send Email" id="email">email</a><sup>&nbsp;<a href="https://keybase.io/jakejarvis/pgp_keys.asc?fingerprint=87fb4b6006dd1beb3ed47fabd36cb66f4002b25b" title="Jake Jarvis&#39;s Public Key on Keybase" id="pgp" target="_blank" rel="noopener noreferrer nofollow">D36C B66F 4002 B25B</a></sup>, <a href="https://twitter.com/messages/compose?recipient_id=229769022" title="Send Direct Message on Twitter" class="twitter" target="_blank" rel="noopener noreferrer nofollow">DM</a>, or <a href="sms:+1-908-444-6655" title="Send SMS: +1 (908) 444-6655" id="sms">text</a>!</p>
       <footer>
         <div id="blog"><a href="{{ "notes/" | absURL }}" title="Jake Jarvis&#39;s Blog" rel="me">Read more at my blog...</a></div>
         <div id="panda"><a href="https://nationalzoo.si.edu/webcams/panda-cam#maincontent" title="Live Panda Party!" target="_blank" rel="noopener noreferrer nofollow"><span>&#x1F43C;</span></a></div>
-        <div id="info"><span id="copyright"><a href="https://web.archive.org/web/20010501000000*/jakejarvis.com" title="View Old Versions on Wayback Machine" id="wayback" target="_blank" rel="noopener noreferrer nofollow">&copy; 2001 &ndash;</a> {{ now.Format "2006" }} <a itemprop="url" rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a>.</span> <a href="https://git.jarv.is/jake/jarv.is" title="View Source Code Repository" id="source" target="_blank" rel="noopener">View source.</a></div>
+        <div id="info"><span id="copyright"><a href="https://web.archive.org/web/20010501000000*/jakejarvis.com" title="View Old Versions on Wayback Machine" id="wayback" target="_blank" rel="noopener noreferrer nofollow">&copy; 2001 &ndash;</a> {{ now.Format "2006" }} <a href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a>.</span> <a href="https://git.jarv.is/jake/jarv.is" title="View Source Code Repository" id="source" target="_blank" rel="noopener">View source.</a></div>
       </footer>
     </main>
 {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/blog-footer.html b/layouts/partials/blog-footer.html
index a432aeab..97f8d1f5 100644
--- a/layouts/partials/blog-footer.html
+++ b/layouts/partials/blog-footer.html
@@ -1,5 +1,5 @@
     <footer>
-      <div id="copyright"><a href="https://web.archive.org/web/20010501000000*/jakejarvis.com" title="View Old Versions on Wayback Machine" id="wayback" target="_blank" rel="noopener noreferrer nofollow">&copy; 2001 &ndash;</a> {{ now.Format "2006" }} <a rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a>.</div>
+      <div id="copyright"><a href="https://web.archive.org/web/20010501000000*/jakejarvis.com" title="View Old Versions on Wayback Machine" id="wayback" target="_blank" rel="noopener noreferrer nofollow">&copy; 2001 &ndash;</a> {{ now.Format "2006" }} <a href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a>.</div>
       <div id="panda"><a href="https://nationalzoo.si.edu/webcams/panda-cam#maincontent" title="Live Panda Party!" target="_blank" rel="noopener noreferrer nofollow"><span>&#x1F43C;</span></a></div>
       <div id="poweredby"><a href="https://github.com/gohugoio/hugo" title="Hugo on GitHub" id="hugo" target="_blank" rel="noopener noreferrer nofollow">Powered by Hugo.</a> <a href="https://git.jarv.is/jake/jarv.is" title="View Source Code Repository" id="source" target="_blank" rel="noopener">View source.</a></div>
     </footer>
diff --git a/layouts/partials/blog-header.html b/layouts/partials/blog-header.html
index 4ae168f7..10b0aa8f 100644
--- a/layouts/partials/blog-header.html
+++ b/layouts/partials/blog-header.html
@@ -3,11 +3,10 @@
       <a href="{{ .Site.BaseURL }}" id="logo" title="Jake Jarvis">
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 144.1">
           <title>Jake Jarvis</title>
-          <polygon fill="#6fbc4e" points="57.6 88.7 19.2 110.9 19.2 110.9 38.4 121.9 76.8 99.8 76.8 99.8 57.6 88.7 57.6 88.7"/>
           <polygon fill="#6fbc4e" points="57.6 0 38.4 11.1 38.4 11.1 76.8 33.2 96 22.1 96 22.1 57.6 0 57.6 0"/>
           <polygon fill="#6fbc4e" points="19.2 66.5 0 77.6 0 77.6 19.2 88.7 38.4 77.6 38.4 77.6 19.2 66.5 19.2 66.5"/>
+          <polygon fill="#6fbc4e" points="57.6 88.7 19.2 110.9 19.2 110.9 38.4 121.9 76.8 99.8 76.8 99.8 57.6 88.7 57.6 88.7"/>
           <polygon fill="#ffb900" points="38.4 11.1 38.4 33.3 57.6 44.3 57.6 88.7 76.8 99.8 76.8 33.2 38.4 11.1 38.4 11.1"/>
-          <polygon fill="#ffb900" points="57.6 44.2 57.6 44.3 57.6 44.3 57.6 44.2 57.6 44.2"/>
           <polygon fill="#ffb900" points="19.2 110.9 19.2 110.8 19.2 88.7 0 77.6 0 121.9 38.4 144.1 38.4 121.9 19.2 110.9 19.2 110.9"/>
           <polygon fill="#009cdf" points="76.8 33.2 76.8 99.8 76.8 99.8 38.4 121.9 38.4 144.1 96 110.9 96 22.1 76.8 33.2 76.8 33.2"/>
           <polygon fill="#009cdf" points="19.2 110.9 38.4 99.8 38.4 77.6 19.2 88.7 19.2 110.9 19.2 110.9"/>
diff --git a/static/style.css b/static/style.css
index 846a5626..d1e10c37 100644
--- a/static/style.css
+++ b/static/style.css
@@ -74,6 +74,11 @@ body#home sup {
   vertical-align: middle;
 }
 
+body#home h1 a {
+  color: inherit;
+  border: none;
+}
+
 
 /* Responsive Awesomeness */