diff --git a/lib/clacks_web/templates/frontend/_status.html.eex b/lib/clacks_web/templates/frontend/_status.html.eex
index 20886b3..f4e3cc7 100644
--- a/lib/clacks_web/templates/frontend/_status.html.eex
+++ b/lib/clacks_web/templates/frontend/_status.html.eex
@@ -1,7 +1,7 @@
-<div class="status">
+<div class="status h-entry">
   <div class="status-meta">
     <h2 class="status-author-nickname">
-      <a href="<%= local_actor_link(@author) %>">
+      <a href="<%= local_actor_link(@author) %>" class="p-author">
         <%= @author.data["preferredUsername"] %>
       </a>
     </h2>
@@ -11,11 +11,11 @@
       </a>
     </h3>
     <p class="status-meta-right">
-      <span><%= display_timestamp(@note["published"]) %></span>
-      <a href="<%= @note["url"] || @note["id"] %>" class="status-permalink">Permalink</a>
+      <time datetime="<%= @note["published"] %>" class="dt-published"><%= display_timestamp(@note["published"]) %></time>
+      <a href="<%= @note["url"] || @note["id"] %>" class="status-permalink u-url">Permalink</a>
     </p>
   </div>
-  <div class="status-content">
+  <div class="status-content e-content">
     <%= @note["content"] %>
   </div>
   <div class="status-actions">
diff --git a/lib/clacks_web/templates/frontend/profile.html.eex b/lib/clacks_web/templates/frontend/profile.html.eex
index 48d83d8..f013726 100644
--- a/lib/clacks_web/templates/frontend/profile.html.eex
+++ b/lib/clacks_web/templates/frontend/profile.html.eex
@@ -1,14 +1,12 @@
-<h1><%= @actor.data["preferredUsername"] %></h1>
-<h2>
-  <%= if @actor.local do %>
-    <%= display_username(@actor) %>
-  <% else %>
-    <a href="<%= @actor.ap_id %>">
+<div class="h-card">
+  <h1 class="p-name"><%= @actor.data["preferredUsername"] %></h1>
+  <h2>
+    <a href="<%= @actor.ap_id %>" class="p-nickname u-url">
       <%= display_username(@actor) %>
     </a>
-  <% end %>
-</h2>
-<p><%= @actor.data["summary"] %></p>
+  </h2>
+  <p><%= @actor.data["summary"] %></p>
+</div>
 
 <div class="actor-actions">
   <%= unless @current_user.actor.ap_id == @actor.ap_id do %>