diff --git a/themes/typing/layout/_partial/article.ejs b/themes/typing/layout/_partial/article.ejs
index 9954f85..62ec185 100644
--- a/themes/typing/layout/_partial/article.ejs
+++ b/themes/typing/layout/_partial/article.ejs
@@ -1,17 +1,17 @@
-<article id="<%= post.layout %>-<%= post.slug %>" class="article article-type-<%= post.layout %>" itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+<article id="<%= post.layout %>-<%= post.slug %>" class="h-entry article article-type-<%= post.layout %>" itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
   <%- partial('_partial/header') %>
   <hr/>
-  <div class="hentry article-inner">
+  <div class="article-inner">
     <%- partial('post/gallery') %>
     <% if (post.link || post.title) { %>
       <header class="article-header">
-        <%- partial('post/title', {class_name: 'entry-title article-title'}) %>
+        <%- partial('post/title', {class_name: 'p-name entry-title article-title'}) %>
       </header>
     <% } %>
     <% if (post.subtitle) { %>
-      <p class="entry-summary"><%- post.subtitle %></p>
+      <p class="p-summary"><%- post.subtitle %></p>
     <% } %>
-    <div class="entry-content article-entry typo" itemprop="articleBody">
+    <div class="e-content article-entry typo" itemprop="articleBody">
       <%- toc(page.content, {list_number: false}) %>
       <%- post.content %>
     </div>
diff --git a/themes/typing/layout/_partial/post/category.ejs b/themes/typing/layout/_partial/post/category.ejs
index 19005de..00f5371 100644
--- a/themes/typing/layout/_partial/post/category.ejs
+++ b/themes/typing/layout/_partial/post/category.ejs
@@ -2,7 +2,7 @@
   <div class="article-category">
     <%- list_categories(post.categories, {
       show_count: false,
-      class: 'article-category',
+      class: 'p-category article-category',
       style: 'none',
       separator: '/'
     }) %>
diff --git a/themes/typing/layout/_partial/post/date.ejs b/themes/typing/layout/_partial/post/date.ejs
index 3d2a1af..c057ad3 100644
--- a/themes/typing/layout/_partial/post/date.ejs
+++ b/themes/typing/layout/_partial/post/date.ejs
@@ -1,6 +1,6 @@
 <%/* Date format is specified to skip timezone conversion */%>
 <% if (is_post()) { %>
-  <time class="published" datetime="<%= date(post.date, 'YYYY-MM-DD[T00:00:00.000Z]') %>" itemprop="datePublished"><%= date(post.date, 'D MMM YYYY') %></time>
+  <time class="dt-published" datetime="<%= date(post.date, 'YYYY-MM-DD[T00:00:00.000Z]') %>" itemprop="datePublished"><%= date(post.date, 'D MMM YYYY') %></time>
 <% } else { %>
   <time datetime="<%= date(post.date, 'YYYY-MM-DD[T00:00:00.000Z]') %>" itemprop="datePublished"><%= date(post.date, 'D MMM YYYY') %></time>
 <% } %>
diff --git a/themes/typing/layout/_partial/post/tag.ejs b/themes/typing/layout/_partial/post/tag.ejs
index 646faa5..ef33cb2 100644
--- a/themes/typing/layout/_partial/post/tag.ejs
+++ b/themes/typing/layout/_partial/post/tag.ejs
@@ -1,7 +1,7 @@
 <% if (post.tags && post.tags.length) { %>
   <%- listTags(post.tags, {
     show_count: false,
-    class: 'article-tag',
+    class: 'p-category article-tag',
     transform: titlecase
   }) %>
 <% } %>
diff --git a/themes/typing/layout/_partial/post/updated-date.ejs b/themes/typing/layout/_partial/post/updated-date.ejs
index fcb561d..fadb529 100644
--- a/themes/typing/layout/_partial/post/updated-date.ejs
+++ b/themes/typing/layout/_partial/post/updated-date.ejs
@@ -1,3 +1,3 @@
 <%/* User-specified updated date */%>
 <%/* default post.updated is (almost) always is the time 'hexo generate' is executed */%>
-<time class="updated" datetime="<%= date(post.lastUpdated, 'YYYY-MM-DD[T00:00:00.000Z]') %>" itemprop="dateModified"><%= date(post.lastUpdated, 'D MMM YYYY') %></time>
+<time class="dt-updated" datetime="<%= date(post.lastUpdated, 'YYYY-MM-DD[T00:00:00.000Z]') %>" itemprop="dateModified"><%= date(post.lastUpdated, 'D MMM YYYY') %></time>