diff --git a/layouts/_partials/page-metadata/post-full.html b/layouts/_partials/page-metadata/post-full.html
index d184c55..5dea827 100644
--- a/layouts/_partials/page-metadata/post-full.html
+++ b/layouts/_partials/page-metadata/post-full.html
@@ -1,5 +1,5 @@
 {{ if or .Date .Params.authors .Site.Params.readingtime .Site.Params.gitFileURL }}
-    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+    <section class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
         {{ if .Date }}
             <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_date" }}">
                 {{ partial "icon.html" "calendar" }}
@@ -26,5 +26,5 @@
         {{ partial "page-metadata/item/categories.html" . }}
 
         {{ partial "page-metadata/item/tags.html" . }}
-    </div>
+    </section>
 {{ end }}
diff --git a/layouts/_partials/page-metadata/post-short.html b/layouts/_partials/page-metadata/post-short.html
index 9b799af..ab202f7 100644
--- a/layouts/_partials/page-metadata/post-short.html
+++ b/layouts/_partials/page-metadata/post-short.html
@@ -1,5 +1,5 @@
 {{ if or .Date .Params.authors .Site.Params.readingtime }}
-    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+    <section class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
         {{ if .Date }}
             <span class="page-metadata-item" aria-label="date">
                 {{ partial "icon.html" "calendar" }}
@@ -14,5 +14,5 @@
         {{ partial "page-metadata/item/series.html" . }}
         {{ partial "page-metadata/item/categories.html" . }}
         {{ partial "page-metadata/item/tags.html" . }}
-    </div>
+    </section>
 {{ end }}
diff --git a/layouts/_partials/share.html b/layouts/_partials/share.html
index 05fded3..f52db42 100644
--- a/layouts/_partials/share.html
+++ b/layouts/_partials/share.html
@@ -1,4 +1,4 @@
-<div class="share-buttons">
+<section class="share-buttons">
     {{ if .Site.Params.shareButtons.twitter }}
         <a class="twitter-share"
            target="_blank"
@@ -66,4 +66,4 @@
             {{- partial "icon.html" "printer" -}}
         </a>
     {{ end }}
-</div>
+</section>
diff --git a/layouts/page.html b/layouts/page.html
index 5800455..1382b45 100644
--- a/layouts/page.html
+++ b/layouts/page.html
@@ -1,74 +1,76 @@
 {{ define "main" }}
-    <div class="page-title">
-        <h1>
-            {{ .Title | markdownify }}
-            {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-        </h1>
-    </div>
+    <article>
+        <div class="page-title">
+            <h1>
+                {{ .Title | markdownify }}
+                {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+            </h1>
+        </div>
 
-    {{ partial "page-metadata/post-full.html" . }}
-    {{ partial "series-box.html" . }}
+        {{ partial "page-metadata/post-full.html" . }}
+        {{ partial "series-box.html" . }}
 
-    {{ if .Params.Toc }}
-        <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
-            <details>
-                <summary>{{ i18n "table_of_contents" }}</summary>
+        {{ if .Params.Toc }}
+            <section class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
+                <details>
+                    <summary>{{ i18n "table_of_contents" }}</summary>
+                    {{ .TableOfContents }}
+                </details>
+            </section>
+            <div class="table-of-contents print">
+                {{ i18n "table_of_contents" }}
                 {{ .TableOfContents }}
-            </details>
-        </div>
-        <div class="table-of-contents print">
-            {{ i18n "table_of_contents" }}
-            {{ .TableOfContents }}
-        </div>
-    {{ end }}
+            </div>
+        {{ end }}
 
-    {{ partial "feature-figure.html" . }}
+        {{ partial "feature-figure.html" . }}
 
-    <article class="post-content" data-pagefind-body>
-        {{ .Content }}
+        <div class="post-content" data-pagefind-body>
+            {{ .Content }}
+        </div>
+
+        {{ partial "series-box.html" . }}
+
+        {{ if or .NextInSection .PrevInSection }}
+            <nav class="prevnext">
+                {{ with .NextInSection }}
+                    <a class="prev" href="{{ .Permalink }}">
+                        <div class="prev-caption">
+                            &larr; {{ i18n "newer_post" }}
+                        </div>
+                        <div class="prev-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="prev"></div>
+                {{ end }}
+
+                {{ with .PrevInSection }}
+                    <a class="next" href="{{ .Permalink }}">
+                        <div class="next-caption">
+                            {{ i18n "older_post" }} &rarr;
+                        </div>
+                        <div class="next-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="next"></div>
+                {{ end }}
+            </nav>
+        {{ end }}
+
+        {{ if .Site.Params.shareButtons }}
+            {{ partial "share.html" . }}
+        {{ end }}
+
+        {{ if .Params.comments }}
+            <section class="comments">
+                {{ partial "comments.html" . }}
+            </section>
+        {{ end }}
     </article>
-
-    {{ partial "series-box.html" . }}
-
-    {{ if or .NextInSection .PrevInSection }}
-        <div class="prevnext">
-            {{ with .NextInSection }}
-                <a class="prev" href="{{ .Permalink }}">
-                    <div class="prev-caption">
-                        &larr; {{ i18n "newer_post" }}
-                    </div>
-                    <div class="prev-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="prev"></div>
-            {{ end }}
-
-            {{ with .PrevInSection }}
-                <a class="next" href="{{ .Permalink }}">
-                    <div class="next-caption">
-                        {{ i18n "older_post" }} &rarr;
-                    </div>
-                    <div class="next-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="next"></div>
-            {{ end }}
-        </div>
-    {{ end }}
-
-    {{ if .Site.Params.shareButtons }}
-        {{ partial "share.html" . }}
-    {{ end }}
-
-    {{ if .Params.comments }}
-        <div class="comments">
-            {{ partial "comments.html" . }}
-        </div>
-    {{ end }}
 {{ end }}