diff --git a/_includes/layouts/links.njk b/_includes/layouts/links.njk
index 26f2312..df7ab0b 100644
--- a/_includes/layouts/links.njk
+++ b/_includes/layouts/links.njk
@@ -1,13 +1,13 @@
 ---
 layout: layouts/linksPage.njk
 ---
-<div class="links-container">
-	<img class="profilePic" src="{{ metadata.author.profilePic }}">
-	<h1 class="socialTitle">Nathan Upchurch</h1>
+<div class="links-container h-card">
+	<img class="profilePic u-photo" src="{{ metadata.author.profilePic }}">
+	<h1 class="socialTitle p-name">Nathan Upchurch</h1>
 	<p class="page-block nodropcap">Here's where you can find me on the internet:</p>
 	<div class="socialLinks">
 		{% for link in metadata.socialLinks %}
-		<a class="link-button" {% if link.customAttribute %} {{ link.customAttribute | safe }} {% endif %} href="{{ link.linkURL }}">
+		<a class="link-button u-url" {% if link.customAttribute %} {{ link.customAttribute | safe }} {% endif %} href="{{ link.linkURL }}">
 			<button type="button"><img src="{{ link.iconURL }}" />{{ link.linkDisplay }}</button>
 		</a>
 		{% endfor %}
diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
index 483d6e0..b9a16b3 100644
--- a/_includes/layouts/post.njk
+++ b/_includes/layouts/post.njk
@@ -4,22 +4,22 @@ layout: layouts/base.njk
 <article class="post">
 <h1>{{ title | safe }}</h1>
 {% if not hideMetadata %}
-<div class="post-metadata">
+<div class="post-metadata h-card">
 	{% if author %}
 	{% if author.profilePic %}
-	<img class="profilePic" src="{{ author.profilePic }}">
+	<img class="profilePic u-photo" src="{{ author.profilePic }}">
 	{% endif %}
 	<div class="post-metadata-copy">
-		<p>{% if author.url %}<a href="{{ author.url }}">{% endif %}
-		{% if author.name %}By {{ author.name }}{% endif %}{% if author.url %}</a>&nbsp;•&nbsp;{% endif %}<time datetime="{{ page.date | htmlDateString }}">{{ page.date | niceDate }}</time>&nbsp;•&nbsp;{{ content | emojiReadTime }}</p>
+		<p>{% if author.url %}<a class="u-url" href="{{ author.url }}">{% endif %}
+		{% if author.name %}By <span class="p-name">{{ author.name }}</span>{% endif %}{% if author.url %}</a>&nbsp;•&nbsp;{% endif %}<time datetime="{{ page.date | htmlDateString }}">{{ page.date | niceDate }}</time>&nbsp;•&nbsp;{{ content | emojiReadTime }}</p>
 
 	{% else %}
 	{% if metadata.author.profilePic %}
-	<img class="profilePic" src="{{ metadata.author.profilePic }}">
+	<img class="profilePic u-photo" src="{{ metadata.author.profilePic }}">
 	{% endif %}
 	<div class="post-metadata-copy">
-		<p>{% if metadata.author.url %}<a href="{{ metadata.author.url }}">{% endif %}
-		{% if metadata.author.name %}By {{ metadata.author.name }}{% endif %}{% if metadata.author.url %}</a>&nbsp;•&nbsp;{% endif %}<time datetime="{{ page.date | htmlDateString }}">{{ page.date | niceDate }}</time>&nbsp;•&nbsp;{{ content | emojiReadTime }}</p>
+		<p>{% if metadata.author.url %}<a hclass="u-url" ref="{{ metadata.author.url }}">{% endif %}
+		{% if metadata.author.name %}By <span class="p-name">{{ metadata.author.name }}</span>{% endif %}{% if metadata.author.url %}</a>&nbsp;•&nbsp;{% endif %}<time datetime="{{ page.date | htmlDateString }}">{{ page.date | niceDate }}</time>&nbsp;•&nbsp;{{ content | emojiReadTime }}</p>
 
 	{% endif %}