diff --git a/src/_includes/layouts/asummersend.vto b/src/_includes/layouts/asummersend.vto
index 8a3edde7..cd3c31f5 100644
--- a/src/_includes/layouts/asummersend.vto
+++ b/src/_includes/layouts/asummersend.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 sectionName: A Summer’s End — Hong Kong 1986 Shrine
 ---
 {{- css }}{{ include "../../assets/css/asummersend.css" }}{{- /css }}
@@ -60,7 +60,7 @@ function getTodayEvent() {
 {{ set navPages = collections.all |> eleventyNavigation("A Summer’s End Shrine") }}
 {{- for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }}aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
 {{ /set }}
diff --git a/src/_includes/layouts/base.vto b/src/_includes/layouts/base.vto
index 1aeaf9f2..b326613c 100644
--- a/src/_includes/layouts/base.vto
+++ b/src/_includes/layouts/base.vto
@@ -46,7 +46,7 @@
         {{ include "partials/hero.vto" }}
         {{ include "partials/navbar.vto" }}
         <main id="content">
-            {{ content }}
+            {{ include "partials/content.vto" }}
         </main>
         {{ include "partials/footer.vto" }}
     </body>
diff --git a/src/_includes/layouts/cassettebeasts.vto b/src/_includes/layouts/cassettebeasts.vto
index b8053397..31820265 100644
--- a/src/_includes/layouts/cassettebeasts.vto
+++ b/src/_includes/layouts/cassettebeasts.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 sectionName: Cassette Beasts Shrine
 ---
 {{- css }}{{ include "../../assets/css/cassettebeasts.css" }}{{- /css }}
@@ -56,7 +56,7 @@ function getTodayEvent() {
 {{ set navPages = collections.all |> eleventyNavigation("Cassette Beasts Shrine") }}
 {{ for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }}aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
 {{ /set }}
diff --git a/src/_includes/layouts/links.vto b/src/_includes/layouts/links.vto
index 447a59f1..c6f3fc1f 100644
--- a/src/_includes/layouts/links.vto
+++ b/src/_includes/layouts/links.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 articleElement: true
 isContentDivided: true
 ---
diff --git a/src/_includes/layouts/main.vto b/src/_includes/layouts/main.vto
index 4d33f9ef..2871d291 100644
--- a/src/_includes/layouts/main.vto
+++ b/src/_includes/layouts/main.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 ---
 {{ layout "partials/hero.vto" }}
 {{ set heroImg }}<img fetchpriority="high" src="/assets/leilukin/Leilukins-Hub-website-banner.avif" alt="Banner of Leilukin's Hub" width="900" height="300">{{ /set }}
@@ -147,7 +147,7 @@ function getTodayEvent() {
 {{ set navPages = collections["navbar links"] |> eleventyNavigation }}
 {{ for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }}aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
 {{ /set }}
@@ -161,18 +161,18 @@ function getTodayEvent() {
         <a href="{{ sitemeta.feedPath }}"><svg class="inline-icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z"/></svg>RSS Feed</a>
     </li>
     <li><a
-        {{ if currentUrl === "/sitemap/" }}aria-current="page"{{ /if }}
+        {{ if currentUrl === "/sitemap/" }} aria-current="page"{{ /if }}
         href="/sitemap/
     ">Site Map</a></li>
     {{ for link of collections["footer links"] }}
     <li><a
-        {{ if link.url == page.url }}aria-current="page"{{ /if }}
+        {{ if link.url == page.url }} aria-current="page"{{ /if }}
         href="{{ link.url }}"
     >{{ link.data.title }}</a></li>
     {{ /for }}
     {{ for statement of collections.statements }}
     <li><a
-        {{ if statement.url == page.url }}aria-current="page"{{ /if }}
+        {{ if statement.url == page.url }} aria-current="page"{{ /if }}
         href="{{ statement.url }}"
     >{{ statement.data.title }}</a></li>
     {{ /for }}
diff --git a/src/_includes/layouts/pokemonoras.vto b/src/_includes/layouts/pokemonoras.vto
index 4144bfff..b0891625 100644
--- a/src/_includes/layouts/pokemonoras.vto
+++ b/src/_includes/layouts/pokemonoras.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 sectionName: Pokémon Omega Ruby and Alpha Sapphire Shrine
 ---
 {{- css }}{{ include "../../assets/css/pokemonoras.css" }}{{- /css }}
@@ -50,7 +50,7 @@ function getTodayEvent() {
 {{ set navPages = collections.all |> eleventyNavigation("ORAS Shrine") }}
 {{ for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }}aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
 {{ /set }}
diff --git a/src/_includes/layouts/slashpage.vto b/src/_includes/layouts/slashpage.vto
index 1a2d2b0e..eabc158c 100644
--- a/src/_includes/layouts/slashpage.vto
+++ b/src/_includes/layouts/slashpage.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 ---
 
 {{ content }}
diff --git a/src/_includes/layouts/starwarskotor.vto b/src/_includes/layouts/starwarskotor.vto
index ae4ba298..c5a0bdbc 100644
--- a/src/_includes/layouts/starwarskotor.vto
+++ b/src/_includes/layouts/starwarskotor.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 sectionName: "Star Wars: Knights of the Old Republic Shrine" 
 ---
 {{- css }}{{ include "../../assets/css/starwarskotor.css" }}{{- /css }}
@@ -56,7 +56,7 @@ function getTodayEvent() {
 {{ set navPages = collections.all |> eleventyNavigation("KotOR Shrine") }}
 {{ for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }}aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
 {{ /set }}
diff --git a/src/_includes/partials/changelogs.vto b/src/_includes/partials/changelogs.vto
index fb935f2c..cc9d33fc 100644
--- a/src/_includes/partials/changelogs.vto
+++ b/src/_includes/partials/changelogs.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/base
 articleElement: true
 ---
 
@@ -9,13 +9,13 @@ articleElement: true
     <p class="changelog__nav--title" id="changelog-nav-title">Changelog Archive:</p>
     <ul class="inline-nav changelog__nav--links">
         <li><a
-            {{ if currentUrl === "/changelogs/" }}aria-current="page"{{ /if }}
+            {{ if currentUrl === "/changelogs/" }} aria-current="page"{{ /if }}
             href="/changelogs"
         >Latest</a></li>
         {{ set navPages = collections.all |> eleventyNavigation("Changelogs") |> toReversed }}
         {{ for entry of navPages }}
         <li><a
-            {{ if entry.url == page.url }}aria-current="page"{{ /if }}
+            {{ if entry.url == page.url }} aria-current="page"{{ /if }}
             href="{{ entry.url }}"
         >{{ entry.title }}</a></li>
         {{ /for }}
diff --git a/src/_includes/layouts/content.vto b/src/_includes/partials/content.vto
similarity index 99%
rename from src/_includes/layouts/content.vto
rename to src/_includes/partials/content.vto
index 7730e6bd..72a221ed 100644
--- a/src/_includes/layouts/content.vto
+++ b/src/_includes/partials/content.vto
@@ -1,6 +1,3 @@
----
-layout: layouts/base
----
 <header class="main__header">
     {{ if isArticle || hasBreadcrumbs }}
     <nav class="breadcrumbs" aria-labelledby="breadcrumbs-title">
diff --git a/src/_includes/partials/navbar.vto b/src/_includes/partials/navbar.vto
index 8fc3bee2..5b866e30 100644
--- a/src/_includes/partials/navbar.vto
+++ b/src/_includes/partials/navbar.vto
@@ -1,7 +1,7 @@
 {{ set navLinksEl }}
     {{ if tags && tags.includes("shrine pages") }}
     <li>
-        <a {{ if currentUrl === shrineHomeUrl }}aria-current="page"{{ /if }} href="{{ shrineHomeUrl }}">Shrine Home</a>
+        <a {{ if currentUrl === shrineHomeUrl }} aria-current="page"{{ /if }} href="{{ shrineHomeUrl }}">Shrine Home</a>
     </li>
     {{ /if }}
     {{ navbarLinks }}
diff --git a/src/articles/articles.11tydata.js b/src/articles/articles.11tydata.js
index 39db2e9b..cb121220 100644
--- a/src/articles/articles.11tydata.js
+++ b/src/articles/articles.11tydata.js
@@ -1,6 +1,6 @@
 export default {
     tags: ["articles", "contents", "feed items"],
-    layout: "layouts/content",
+    layout: "layouts/base",
     permalink: "/articles/{{ page.fileSlug }}/",
     isArticle: true,
     eleventyComputed: {
diff --git a/src/blog/posts.vto b/src/blog/posts.vto
index 7610743e..a03f8470 100644
--- a/src/blog/posts.vto
+++ b/src/blog/posts.vto
@@ -1,6 +1,6 @@
 ---
 title: Blog Archive
-layout: layouts/content
+layout: layouts/base
 tags: blog pages
 eleventyComputed:
     desc: Archive of blog posts on {{ sitemeta.siteName }}
diff --git a/src/blog/posts/posts.11tydata.js b/src/blog/posts/posts.11tydata.js
index d62c4fc3..10a6fbce 100644
--- a/src/blog/posts/posts.11tydata.js
+++ b/src/blog/posts/posts.11tydata.js
@@ -1,5 +1,5 @@
 export default {
-    layout: "layouts/content",
+    layout: "layouts/base",
     tags: ["posts", "contents", "feed items"],
     isArticle: true,
     eleventyComputed: {
diff --git a/src/index.vto b/src/index.vto
index 2869139c..5844f4e3 100644
--- a/src/index.vto
+++ b/src/index.vto
@@ -1,5 +1,5 @@
 ---
-layout: layouts/content
+layout: layouts/main
 tags: navbar links
 metadata:
     title: Home
diff --git a/src/links/pages/pages.11tydata.js b/src/links/pages/pages.11tydata.js
index 5952266b..ed0aa0b5 100644
--- a/src/links/pages/pages.11tydata.js
+++ b/src/links/pages/pages.11tydata.js
@@ -1,5 +1,5 @@
 export default {
-    layout: "layouts/content",
+    layout: "layouts/base",
     permalink: "/links/{{ page.fileSlug }}/",
     hasBreadcrumbs: true,
     eleventyComputed: {
diff --git a/src/projects/projects.11tydata.js b/src/projects/projects.11tydata.js
index 25a8acc6..585f71ae 100644
--- a/src/projects/projects.11tydata.js
+++ b/src/projects/projects.11tydata.js
@@ -1,6 +1,6 @@
 export default {
     tags: "project pages",
-    layout: "layouts/content",
+    layout: "layouts/base",
     hasBreadcrumbs: true,
     eleventyComputed: {
         eleventyNavigation: {
diff --git a/src/slashes/slashes.11tydata.js b/src/slashes/slashes.11tydata.js
index e16f53f1..e2f2c678 100644
--- a/src/slashes/slashes.11tydata.js
+++ b/src/slashes/slashes.11tydata.js
@@ -1,6 +1,6 @@
 export default {
     tags: "pages",
-    layout: "layouts/content",
+    layout: "layouts/base",
     permalink: "/{{ page.fileSlug }}/",
     eleventyComputed: {
         eleventyNavigation: {