diff --git a/src/_includes/asummersend/navbar.njk b/src/_includes/asummersend/navbar.njk
index d5f76038..8c547b66 100644
--- a/src/_includes/asummersend/navbar.njk
+++ b/src/_includes/asummersend/navbar.njk
@@ -1,8 +1,5 @@
----
-shrineHomeUrl: /shrines/asummersend/
----
-
 {% extends "global/navbar.njk" %}
+{% set shrineHomeUrl = "/shrines/asummersend/" %}
 
 {% block navbarLinks %}
 {% set navPages = collections.all | eleventyNavigation("A Summer’s End Shrine") %}
diff --git a/src/_includes/cassettebeasts/navbar.njk b/src/_includes/cassettebeasts/navbar.njk
index afe324de..bd36dcc4 100644
--- a/src/_includes/cassettebeasts/navbar.njk
+++ b/src/_includes/cassettebeasts/navbar.njk
@@ -1,14 +1,11 @@
----
-shrineHomeUrl: /shrines/cassettebeasts/
----
-
 {% extends "global/navbar.njk" %}
+{% set shrineHomeUrl = "/shrines/cassettebeasts/" %}
 
 {% block navbarLinks %}
-    {% set navPages = collections.all | eleventyNavigation("Cassette Beasts Shrine") %}
-    {%- for entry in navPages %}
-        <li>
-            <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
-        </li>
-    {%- endfor %}
-{% endblock %}
\ No newline at end of file
+{% set navPages = collections.all | eleventyNavigation("Cassette Beasts Shrine") %}
+{%- for entry in navPages %}
+<li>
+    <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
+</li>
+{%- endfor %}
+{% endblock %}
diff --git a/src/_includes/global/navbar.njk b/src/_includes/global/navbar.njk
index 92efe917..f3d29647 100644
--- a/src/_includes/global/navbar.njk
+++ b/src/_includes/global/navbar.njk
@@ -1,13 +1,13 @@
 {% set navLinksEl %}
     {%- if tags and tags.includes("shrine pages") %}
-        <li>
-            <a {% if currentUrl === shrineHomeUrl %}aria-current="page"{% endif %} href="{{ shrineHomeUrl }}">Shrine Home</a>
-        </li>
+    <li>
+        <a {% if currentUrl === shrineHomeUrl %}aria-current="page"{% endif %} href="{{ shrineHomeUrl }}">Shrine Home</a>
+    </li>
     {%- endif -%}
     {% block navbarLinks %}{% endblock %}
     {%- if tags and tags.includes("shrine pages") %}
-        <li><a href="/shrines/">Shrine Directory</a></li>
-        <li><a href="/">Main Site</a></li>
+    <li><a href="/shrines/">Shrine Directory</a></li>
+    <li><a href="/">Main Site</a></li>
     {%- endif -%}
 {% endset %}
 
@@ -102,4 +102,4 @@
         .navbar__toggle, .navbar__popover { display: none; }
         .navbar__links { display: flex; }
     }
-{% endcss %}
\ No newline at end of file
+{% endcss %}
diff --git a/src/_includes/pokemonoras/navbar.njk b/src/_includes/pokemonoras/navbar.njk
index 809d9ae7..2392998d 100644
--- a/src/_includes/pokemonoras/navbar.njk
+++ b/src/_includes/pokemonoras/navbar.njk
@@ -1,8 +1,5 @@
----
-shrineHomeUrl: /shrines/pokemonoras/
----
-
 {% extends "global/navbar.njk" %}
+{% set shrineHomeUrl = "/shrines/pokemonoras/" %}
 
 {% block navbarLinks %}
 {% set navPages = collections.all | eleventyNavigation("ORAS Shrine") %}
diff --git a/src/_includes/starwarskotor/navbar.njk b/src/_includes/starwarskotor/navbar.njk
index 69c20366..83928c31 100644
--- a/src/_includes/starwarskotor/navbar.njk
+++ b/src/_includes/starwarskotor/navbar.njk
@@ -1,8 +1,5 @@
----
-shrineHomeUrl: /shrines/starwarskotor/
----
-
 {% extends "global/navbar.njk" %}
+{% set shrineHomeUrl = "/shrines/starwarskotor/" %}
 
 {% block navbarLinks %}
 {% set navPages = collections.all | eleventyNavigation("KotOR Shrine") %}