diff --git a/layouts/404.html b/layouts/404.html
index 4e62a288..9484f50d 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -3,13 +3,13 @@
 {{- end -}}
 
 {{- define "content" -}}
-  <div class="page" id="content-404">
+  <article class="page" id="content-404">
     <h1 id="error-emoji"></h1>
     <p class="error-text">
       {{- T "pageNotFoundText" -}}&nbsp;
       <a href="javascript:void(0);" title="{{ T `back` }}" onclick="window.history.back();"><i class="fa-regular fa-hand-point-left fa-fw"></i></a>
     </p>
-  </div>
+  </article>
   <script type="text/javascript">
     (function() {
       var emojiArray = ['\\(o_o)/', '(˚Δ˚)b', '(^-^*)', '(≥o≤)', '(^_^)b', '(·_·)','(=\'X\'=)', '(>_<)', '(;-;)'];
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index cdac38c6..10695be8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,16 +2,14 @@
 
 {{- define "content" -}}
   {{- $params := .Scratch.Get "params" -}}
-  <div class="page single special">
-    {{- /* Title */ -}}
-    <h1 class="single-title animate__animated animate__pulse animate__faster">
-      {{- .Title -}}
-    </h1>
+  <article class="page single special">
+    <div class="header">
+      {{- /* Title */ -}}
+      <h1 class="single-title animate__animated animate__pulse animate__faster">{{- .Title -}}</h1>
 
-    {{- /* Subtitle */ -}}
-    {{- with $params.subtitle -}}
-      <h2 class="single-subtitle">{{ . }}</h2>
-    {{- end -}}
+      {{- /* Subtitle */ -}}
+      {{- with $params.subtitle -}}<p class="single-subtitle animate__animated animate__fadeIn">{{ . }}</p>{{- end -}}
+    </div>
 
     {{- /* Content */ -}}
     <div class="content" id="content">
@@ -20,5 +18,5 @@
 
     {{- /* Comment */ -}}
     {{- partial "single/comment.html" . -}}
-  </div>
+  </article>
 {{- end -}}
diff --git a/layouts/friends/single.html b/layouts/friends/single.html
index 52c16556..c281a356 100644
--- a/layouts/friends/single.html
+++ b/layouts/friends/single.html
@@ -2,16 +2,14 @@
 
 {{- define "content" -}}
 {{- $params := .Scratch.Get "params" -}}
-  <div class="page single special friends">
-    {{- /* Title */ -}}
-    <h1 class="single-title animate__animated animate__pulse animate__faster">
-      {{- .Title -}}
-    </h1>
+  <article class="page single special friends">
+    <div class="header">
+      {{- /* Title */ -}}
+      <h1 class="single-title animate__animated animate__pulse animate__faster">{{- .Title -}}</h1>
 
-    {{- /* Subtitle */ -}}
-    {{- with $params.subtitle -}}
-      <h2 class="single-subtitle">{{ . }}</h2>
-    {{- end -}}
+      {{- /* Subtitle */ -}}
+      {{- with $params.subtitle -}}<p class="single-subtitle animate__animated animate__fadeIn">{{ . }}</p>{{- end -}}
+    </div>
 
     {{- /* Friend links */ -}}
     {{- $loading := resources.Get "svg/loading.svg" | minify -}}
@@ -38,5 +36,5 @@
 
     {{- /* Comment */ -}}
     {{- partial "single/comment.html" . -}}
-  </div>
+  </article>
 {{- end -}}
\ No newline at end of file
diff --git a/layouts/offline/single.html b/layouts/offline/single.html
index 232e2fb0..d1e67524 100644
--- a/layouts/offline/single.html
+++ b/layouts/offline/single.html
@@ -3,15 +3,17 @@
 {{- end -}}
 
 {{- define "content" -}}
-  <div class="page" id="content-offline">
-    <h1 class="offline-title animate__animated animate__pulse animate__faster">{{- T "offlineTitle" -}}</h1>
-    <h2 class="offline-subtitle">
-      <i class="fa-stack fa-xs">
-        <i class="fa-solid fa-wifi fa-stack-1x"></i>
-        <i class="fa-solid fa-ban fa-stack-2x"></i>
-      </i>
-      <span>ERROR_INTERNET_DISCONNECTED</span>
-    </h2>
+  <article class="page" id="content-offline">
+    <div class="header">
+      <h1 class="offline-title animate__animated animate__pulse animate__faster">{{- T "offlineTitle" -}}</h1>
+      <p class="offline-subtitle animate__animated animate__headShake">
+        <i class="fa-stack fa-xs">
+          <i class="fa-solid fa-wifi fa-stack-1x"></i>
+          <i class="fa-solid fa-ban fa-stack-2x"></i>
+        </i>
+        <span>ERROR_INTERNET_DISCONNECTED</span>
+      </p>
+    </div>
     <p class="error-text">{{- T "offlineText" -}}</p>
-  </div>
+  </article>
 {{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/recently-updated.html b/layouts/partials/recently-updated.html
index 618c1b14..0b482678 100644
--- a/layouts/partials/recently-updated.html
+++ b/layouts/partials/recently-updated.html
@@ -8,7 +8,7 @@
       {{- if ne .Lastmod.Unix .Date.Unix }}
         {{- $postCount = add $postCount 1 -}}
         {{- if eq $hasTitle false -}}
-          <h3 class="group-title">{{- T "recentlyUpdated" -}}</h3>
+          <h2 class="group-title">{{- T "recentlyUpdated" -}}</h2>
           {{- $hasTitle = true -}}
         {{- end -}}
         <article class="archive-item">
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 746b7715..73cec96e 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -18,13 +18,13 @@
   </aside>
 
   <article class="page single">
-    {{- /* Title */ -}}
-    <h1 class="single-title animate__animated animate__flipInX">{{ .Title }}</h1>
+    <div class="header">
+      {{- /* Title */ -}}
+      <h1 class="single-title animate__animated animate__flipInX">{{ .Title }}</h1>
 
-    {{- /* Subtitle */ -}}
-    {{- with $params.subtitle -}}
-      <h2 class="single-subtitle">{{ . }}</h2>
-    {{- end -}}
+      {{- /* Subtitle */ -}}
+      {{- with $params.subtitle -}}<p class="single-subtitle animate__animated animate__fadeIn">{{ . }}</p>{{- end -}}
+    </div>
 
     {{- /* Meta */ -}}
     <div class="post-meta">