diff --git a/author.hbs b/author.hbs
index 4e7db4a..d7f5899 100644
--- a/author.hbs
+++ b/author.hbs
@@ -4,10 +4,10 @@
     </div>
     <div class="page-header__contents">
       <div class="post-header container mx-auto main">
-        <p>
+        <p class="page-header__text">
           <span class="post-header__tag-name">Author</span>
         </p>
-        <div class="post-header__tag-heading">
+        <div class="post-header__heading post-header__heading--tag">
           {{#if profile_image}}
           <style>
             .author-image {
@@ -16,30 +16,33 @@
               background-position: center;
             }
           </style>
-          <span class="post-header__tag-heading-color author-image"></span>
+          <span class="post-header__heading--tag-color author-image"></span>
           {{else}}
-          <span class="post-header__tag-heading-color"></span>
+          <span class="post-header__heading--tag-color"></span>
           {{/if}}
-          <h1>
+          <h1 class="post-header__heading--tag-text">
             {{name}}
           </h1>
         </div>
-        <p>
+        <p class="page-header__text">
           {{plural ../pagination.total empty='No posts' singular='% post' plural='% posts'}}
         </p>
-        <p>
+        <p class="page-header__text">
           {{#if website}}
-          <span class=""><a href="{{website}}" target="_blank" rel="noopener">Website</a></span>
+          <span class=""><a class="post-header__social" href="{{website}}" target="_blank"
+              rel="noopener">Website</a></span>
           {{/if}}
           {{#if twitter}}
-          <span class=""><a href="{{twitter_url}}" target="_blank" rel="noopener">Twitter</a></span>
+          <span class=""><a class="post-header__social" href="{{twitter_url}}" target="_blank"
+              rel="noopener">Twitter</a></span>
           {{/if}}
           {{#if facebook}}
-          <span class=""><a href="{{facebook_url}}" target="_blank" rel="noopener">Facebook</a></span>
+          <span class=""><a class="post-header__social" href="{{facebook_url}}" target="_blank"
+              rel="noopener">Facebook</a></span>
           {{/if}}
         </p>
         {{#if bio}}
-        <p>{{bio}}</p>
+        <p class="page-header__text">{{bio}}</p>
         {{/if}}
       </div>
     </div>
diff --git a/index.hbs b/index.hbs
index a0655d8..d01fb92 100644
--- a/index.hbs
+++ b/index.hbs
@@ -9,8 +9,8 @@
         {{#if @site.logo}}
         <img src="{{img_url @site.logo size=" l"}}" alt="{{@site.title}}" class="page-header__icon">
         {{/if}}
-        <h1>{{@site.title}}</h1>
-        <p>{{@site.description}}</p>
+        <h1 class="page-header__heading">{{@site.title}}</h1>
+        <p class="page-header__text">{{@site.description}}</p>
       </div>
     </div>
   </div>
diff --git a/package.json b/package.json
index 2a6b462..58608bb 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "yuika"
   ],
   "dependencies": {
-    "@damillora/shian": "^1.1.0",
+    "@damillora/shian": "^2.0.0",
     "autoprefixer": "^10.2.1",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.2.0",
diff --git a/page.hbs b/page.hbs
index 0df2095..3527edc 100644
--- a/page.hbs
+++ b/page.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="page-header__contents">
       <div class="post-header container mx-auto main">
-        <h1>{{title}}</h1>
+        <h1 class="page-header__heading">{{title}}</h1>
       </div>
     </div>
   </div>
diff --git a/partials/navigation.hbs b/partials/navigation.hbs
index 1bf0073..3654424 100644
--- a/partials/navigation.hbs
+++ b/partials/navigation.hbs
@@ -8,7 +8,7 @@
     {{/foreach}}
 
     <div class="menu__item" id="darkMode">
-        <i class="material-icons md-24">brightness_low</i>
+        <i class="menu__icon material-icons md-24">brightness_low</i>
         <p class="menu__text">Dark Mode</p>
     </div>
 </div>
\ No newline at end of file
diff --git a/partials/post-background.hbs b/partials/post-background.hbs
index 63499fa..8c60493 100644
--- a/partials/post-background.hbs
+++ b/partials/post-background.hbs
@@ -13,13 +13,13 @@ for it, and apply those styles to the <header> tag. Else, we just output a <head
         <div>
             <div class="post-card__image">
                 {{#if feature_image}}
-                <img srcset="{{img_url feature_image size="s"}} 300w, {{img_url feature_image size="m"}} 600w"
-                sizes="(max-width: 768px) 100vw, 35vw"
+                <img class="post-card__image-inner" srcset="{{img_url feature_image size="s"}} 300w, {{img_url
+                    feature_image size="m" }} 600w" sizes="(max-width: 768px) 100vw, 35vw"
                     src="{{img_url feature_image size="m"}}" alt="{{title}}" loading="lazy">
                 {{else}}
-                <img srcset="{{img_url @site.cover_image size="s"}} 300w, {{img_url @site.cover_image size="m"}} 600w"
-                sizes="(max-width: 768px) 100vw, 35vw"
+                <img class="post-card__image-inner" srcset="{{img_url @site.cover_image size="s"}} 300w, {{img_url
+                    @site.cover_image size="m" }} 600w" sizes="(max-width: 768px) 100vw, 35vw"
                     src="{{img_url @site.cover_image size="m"}}" alt="{{title}}" loading="lazy">
                 {{/if}}
             </div>
-        </div>
+        </div>
\ No newline at end of file
diff --git a/partials/post-card.hbs b/partials/post-card.hbs
index c53c255..fb5b1a5 100644
--- a/partials/post-card.hbs
+++ b/partials/post-card.hbs
@@ -6,7 +6,7 @@
     <div class="post-card__tag-row">
       {{#if primary_tag}}
       {{#primary_tag}}
-      <a href="{{url}}">
+      <a class="post-card__tag-info" href="{{url}}">
         {{#if accent_color}}
         <span class="post-card__tag-color" style="background-color: {{accent_color}};"></span>
         {{else}}
@@ -17,12 +17,12 @@
       {{/primary_tag}}
       {{/if}}
       {{#has visibility="paid"}}
-      <a href="/subscribe">
+      <a class="post-card__tag-info" href="/subscribe">
         <span class="post-card__paywall">Paid content</span>
       </a>
       {{/has}}
       {{#has visibility="members"}}
-      <a href="/subscribe">
+      <a class="post-card__tag-info" href="/subscribe">
         <span class="post-card__paywall">Member-exclusive</span>
       </a>
       {{/has}}
@@ -44,16 +44,14 @@
       <div class="post-card__author-images">
         {{#foreach authors}}
         {{#if profile_image}}
-        <div class="post-card__author-image">
-          <a href="{{url}}">
-            <img src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
-          </a>
-        </div>
+        <a href="{{url}}">
+          <img class="post-card__author-image" src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
+        </a>
         {{/if}}
         {{/foreach}}
       </div>
       <div class="post-card__author-names">
-        <p>{{#has author="count:>2"}}Multiple authors{{else}}{{authors}}{{/has}}</p>
+        {{#has author="count:>2"}}Multiple authors{{else}}{{authors}}{{/has}}
       </div>
     </div>
     {{/if}}
@@ -61,4 +59,4 @@
       <p>{{excerpt words="30"}}</p>
     </div>
   </div>
-</article>
+</article>
\ No newline at end of file
diff --git a/partials/primary-tag.hbs b/partials/primary-tag.hbs
index f53584c..2ff6094 100644
--- a/partials/primary-tag.hbs
+++ b/partials/primary-tag.hbs
@@ -1,24 +1,24 @@
-<div class="post-header__tag-row">
+<div class="tag__row">
   {{#if primary_tag}}
   {{#primary_tag}}
   <a href="{{url}}">
     {{#if accent_color}}
-    <span class="post-header__tag-color" style="background-color: {{accent_color}};"></span>
+    <span class="tag__color" style="background-color: {{accent_color}};"></span>
     {{else}}
-    <span class="post-header__tag-color"></span>
+    <span class="tag__color"></span>
     {{/if}}
-    <span class="post-header__tag-name">{{name}}</span>
+    <span class="tag__name--post-header">{{name}}</span>
   </a>
   {{/primary_tag}}
   {{/if}}
   {{#has visibility="paid"}}
   <a href="/subscribe">
-    <span class="post-header__paywall">Paid content</span>
+    <span class="tag__paywall">Paid content</span>
   </a>
   {{/has}}
   {{#has visibility="members"}}
   <a href="/subscribe">
-    <span class="post-header__paywall">Member-exclusive</span>
+    <span class="tag__paywall">Member-exclusive</span>
   </a>
   {{/has}}
 </div>
\ No newline at end of file
diff --git a/partials/site-header.hbs b/partials/site-header.hbs
index 6d2fb6a..6e265c6 100644
--- a/partials/site-header.hbs
+++ b/partials/site-header.hbs
@@ -5,14 +5,12 @@
   <div class="site-header__inner">
     <header class="header">
       <div class="header__top">
-        <div class="header__title">
-          <a href="/">
-            <h1>{{@site.title}}</h1>
-          </a>
-        </div>
+        <a class="header__title" href="/">
+          {{@site.title}}
+        </a>
         <div class="header__nav-button" id="menushow">
           <span class="header__icon material-icons" alt="menu">menu</span>
-          <p>Menu</p>
+          <p class="header__nav-button-text">Menu</p>
         </div>
       </div>
       {{navigation}}
diff --git a/post.hbs b/post.hbs
index 84a090d..b029799 100644
--- a/post.hbs
+++ b/post.hbs
@@ -8,7 +8,7 @@
     <div class="page-header__contents">
       <div class="post-header container mx-auto main">
         {{> primary-tag}}
-        <h1>{{title}}</h1>
+        <h1 class="page-header__heading">{{title}}</h1>
         <p class="post-header__time">
           <span>
             <time datetime="{{date format=" YYYY-MM-DD"}}">
@@ -23,16 +23,20 @@
           <div class="post-header__author-images">
             {{#foreach authors}}
             {{#if profile_image}}
-            <div class="post-header__author-image">
-              <a href="{{url}}">
-                <img src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
-              </a>
-            </div>
+            <a href="{{url}}">
+              <img class="post-header__author-image" src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
+            </a>
             {{/if}}
             {{/foreach}}
           </div>
           <div class="post-header__author-names">
-            <p>{{#has author="count:>2"}}Multiple authors{{else}}{{authors}}{{/has}}</p>
+            {{#has author="count:>2"}}
+            Multiple authors
+            {{else}}
+            {{#foreach authors}}
+              <a href="{{url}}" title="{{name}}" class="post-header__author-name">{{name}}</a>
+            {{/foreach}}
+            {{/has}}
           </div>
         </div>
         {{/if}}
@@ -50,8 +54,8 @@
       <a href="{{url}}" class="post-navigator__nav post-navigator__nav--previous-post">
         <span class="material-icons post-navigator__icon">arrow_back</span>
         <div class="post-navigator__nav-content post-navigator__nav-content--previous-post">
-          <p class="post-navigator__nav-title">Previous post</p>
-          <p>{{title}}</p>
+          <p class="post-navigator__nav-indicator">Previous post</p>
+          <p class="post-navigator__nav-title">{{title}}</p>
         </div>
       </a>
       {{/prev_post}}
@@ -59,14 +63,16 @@
       {{#next_post}}
       <a href="{{url}}" class="post-navigator__nav post-navigator__nav--next-post">
         <div class="post-navigator__nav-content post-navigator__nav-content--next-post">
-          <p class="post-navigator__nav-title">Next post</p>
-          <p>{{title}}</p>
+          <p class="post-navigator__nav-indicator">Next post</p>
+          <p class="post-navigator__nav-title">{{title}}</p>
         </div>
         <span class="material-icons post-navigator__icon">arrow_forward</span>
       </a>
       {{/next_post}}
     </div>
   </div>
+
+
   <div id="comments" class="container mx-auto main">
     {{#is "preview"}}
     <p>Comments are disabled for post previews</p>
@@ -77,24 +83,22 @@
   </div>
   <div class="container mx-auto">
     {{#if primary_tag}}
-    {{#get "posts" filter="tags:{{primary_tag.slug}}+id:-{{id}}" limit="3" as |related_posts|}}
+    {{#get "posts" include="tags" filter="tags:{{primary_tag.slug}}+id:-{{id}}" limit="3" as |related_posts|}}
     {{#if related_posts}}
-    {{#../primary_tag}}
-    <div class="px-3 w-full">
-      <p class="text-2xl">
+    <div class="post-list">
+      <div>
         More in
+        {{#../primary_tag}}
         <a href="{{url}}">
           {{#if accent_color}}
-          <span class="tag-accent-color medium" style="background-color: {{accent_color}};"></span>
+          <span class="tag__color" style="background-color: {{accent_color}};"></span>
           {{else}}
-          <span class="tag-accent-color medium"></span>{{name}}
+          <span class="tag__color"></span>
           {{/if}}
-          <span class="hover:underline">{{name}}</span>
+          <span class="tag__name">{{name}}</span>
         </a>
-      </p>
-    </div>
-    {{/../primary_tag}}
-    <div class="post-list">
+        {{/../primary_tag}}
+      </div>
       {{#foreach related_posts}}
       {{> post-card}}
       {{/foreach}}
@@ -103,10 +107,9 @@
     {{/get}}
     {{/if}}
   </div>
-
-
   {{/post}}
+
   {{#contentFor "scripts"}}
   <script>
   </script>
-  {{/contentFor}}
+  {{/contentFor}}
\ No newline at end of file
diff --git a/tag.hbs b/tag.hbs
index 313d9cb..66a40fe 100644
--- a/tag.hbs
+++ b/tag.hbs
@@ -8,17 +8,17 @@
         <p>
           <span class="post-header__tag-name">Tag</span>
         </p>
-        <div class="post-header__tag-heading">
+        <div class="post-header__heading post-header__heading--tag">
           {{#if accent_color}}
-          <span class="post-header__tag-heading-color" style="background-color: {{accent_color}};"></span>
+          <span class="post-header__heading--tag-color" style="background-color: {{accent_color}};"></span>
           {{else}}
-          <span class="post-header__tag-heading-color"></span>
+          <span class="post-header__heading--tag-color"></span>
           {{/if}}
-          <h1>
+          <h1 class="post-header__heading--tag-text">
             {{name}}
           </h1>
         </div>
-        <p>{{description}}</p>
+        <p class="page-header__text">{{description}}</p>
       </div>
     </div>
   </div>
diff --git a/yarn.lock b/yarn.lock
index 3dea786..efcdb84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -830,10 +830,10 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
-"@damillora/shian@^1.1.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@damillora/shian/-/shian-1.2.0.tgz#762db594d0d3fbfdfa56e3a89cdac67aaec1a642"
-  integrity sha512-+5/jcSbVonxdtc4oKGVEtnMm6VLxkv00UnU0+UoB2W4NSG62140QbWdqerrbeOjzeI3WAJAEbI74b6XCbZ1V2A==
+"@damillora/shian@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@damillora/shian/-/shian-2.0.0.tgz#f64d3dedf2a6bbfa06c9477f242bea8375261621"
+  integrity sha512-grK0nfoXmE8PGDuM6E1TbQxzW1sGuen08Ux3GPTMkJOjNKPoNHlTQ+HvmGyJQo9qaf3prNkK1RsoopFsn2FEbQ==
 
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.2"