diff --git a/static/style.css b/static/style.css
index a84ee11..24d07f9 100644
--- a/static/style.css
+++ b/static/style.css
@@ -140,37 +140,37 @@ blockquote strong em {
 header.h-card {
     margin-bottom: 64px;
 }
-.h-card {
+header.h-card {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
 }
-.h-card .header-image {
+header.h-card .header-image {
     flex: 1;
     flex-basis: auto;
     margin: 8px 32px 8px 0;
     text-align: center;
 }
-.h-card .header-description {
+header.h-card .header-description {
     flex: 100;
     flex-basis: auto;
     /* min-width: 360px; */
     margin: 8px 0;
     /* text-align: center; */
 }
-.h-card .profile-picture {
+header.h-card .profile-picture {
     max-width: 160px;
     border-radius: 100%;
 }
-.h-card h1 {
+header.h-card h1 {
     font-size: 1.4em;
     margin: 0 0 16px;
 }
-.h-card p {
+header.h-card p {
     font-size: 1.1em;
     margin: 0 0 8px;
 }
-.h-card .social a {
+header.h-card .social a {
     display: inline-block;
     width: 20px;
     height: 20px;
diff --git a/views/blog_post.pug b/views/blog_post.pug
index 1c34822..d915396 100644
--- a/views/blog_post.pug
+++ b/views/blog_post.pug
@@ -6,8 +6,13 @@ block content
             | Back to: 
             a(href="/") blog
     
-    article.longform
-        h1 !{$post['title']}
-        p.longform__header Posted on !{$post['date_formatted']} by !{$post['author']}
-        .longform__content
+    article.longform.h-entry
+        h1.p-name !{$post['title']}
+        p.longform__header
+            | Posted on 
+            time(datetime="{$post['date']}").dt-published !{$post['date_formatted']}
+            |  by 
+            a(href="/" rel="author").p-author.h-card !{$post['author']}
+        
+        .longform__content.e-content
             | !{$post['content']}
diff --git a/views/index.pug b/views/index.pug
index c0dd6c7..cb0e4f2 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -3,9 +3,9 @@ extends layout
 mixin entry($item)
     article.longform_list__item.h-entry
         p
-            a(href="{$item['urlrel']}").p-name !{$item['title']}
+            a(href="{$item['urlrel']}").p-name.u-url !{$item['title']}
             br
-            | On 
+            | Posted on 
             time(datetime="{$item['date']}").dt-published !{$item['date_formatted']}
 
 block content
diff --git a/views/notes.pug b/views/notes.pug
index 35a8371..f7085ea 100644
--- a/views/notes.pug
+++ b/views/notes.pug
@@ -3,9 +3,9 @@ extends layout
 mixin entry($item)
     article.longform_list__item.h-entry
         p
-            a(href="{$item['urlrel']}").p-name !{$item['title']}
+            a(href="{$item['urlrel']}").p-nameu-url !{$item['title']}
             br
-            | On 
+            | Posted on 
             time(datetime="{$item['date']}").dt-published !{$item['date_formatted']}
 
 block content
diff --git a/views/notes_post.pug b/views/notes_post.pug
index b712d14..d41967a 100644
--- a/views/notes_post.pug
+++ b/views/notes_post.pug
@@ -7,9 +7,14 @@ block content
             a(href="/about") about me
             |  > 
             a(href="/notes") notes
-    
-    article.longform
-        h1 !{$post['title']}
-        p.longform__header Posted on !{$post['date_formatted']} by !{$post['author']}
-        .longform__content
-            | !{$post['content']}
+            
+        article.longform.h-entry
+            h1.p-name !{$post['title']}
+            p.longform__header
+                | Posted on 
+                time(datetime="{$post['date']}").dt-published !{$post['date_formatted']}
+                |  by 
+                a(href="/" rel="author").p-author.h-card !{$post['author']}
+            
+            .longform__content.e-content
+                | !{$post['content']}