diff --git a/src/_includes/asummersend/navbar.njk b/src/_includes/asummersend/navbar.njk
index 6e414b19..fc901403 100644
--- a/src/_includes/asummersend/navbar.njk
+++ b/src/_includes/asummersend/navbar.njk
@@ -1,12 +1,11 @@
+---
+shrineHomeUrl: /shrines/asummersend/
+---
+
 {% extends "global/navbar.njk" %}
 
 {% block navbarLinks %}
-    {% set shrineHomeUrl %}/shrines/asummersend/{% endset %}
     {% set navPages = collections.all | eleventyNavigation("A Summer’s End Shrine") %}
-    {% set currentUrl %}{{ page.url }}{% endset %}
-    <li>
-        <a {% if currentUrl === shrineHomeUrl %}aria-current="page"{% endif %} href="{{ shrineHomeUrl }}">Shrine Home</a>
-    </li>
     {%- for entry in navPages %}
         <li>
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
diff --git a/src/_includes/cassettebeasts/navbar.njk b/src/_includes/cassettebeasts/navbar.njk
index 537f52eb..afe324de 100644
--- a/src/_includes/cassettebeasts/navbar.njk
+++ b/src/_includes/cassettebeasts/navbar.njk
@@ -1,12 +1,11 @@
+---
+shrineHomeUrl: /shrines/cassettebeasts/
+---
+
 {% extends "global/navbar.njk" %}
 
 {% block navbarLinks %}
-    {% set shrineHomeUrl %}/shrines/cassettebeasts/{% endset %}
     {% set navPages = collections.all | eleventyNavigation("Cassette Beasts Shrine") %}
-    {% set currentUrl %}{{ page.url }}{% endset %}
-    <li>
-        <a {% if currentUrl === shrineHomeUrl %}aria-current="page"{% endif %} href="{{ shrineHomeUrl }}">Shrine Home</a>
-    </li>
     {%- for entry in navPages %}
         <li>
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
diff --git a/src/_includes/global/navbar.njk b/src/_includes/global/navbar.njk
index da38824d..38a5f2a6 100644
--- a/src/_includes/global/navbar.njk
+++ b/src/_includes/global/navbar.njk
@@ -2,6 +2,11 @@
 https://kalechips.net/projects/snippets/burger #}
 
 {% set navLinksEl %}
+{%- if tags and tags.includes("shrine pages") %}
+    <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>
diff --git a/src/_includes/starwarskotor/navbar.njk b/src/_includes/starwarskotor/navbar.njk
index fca13940..1107f7ef 100644
--- a/src/_includes/starwarskotor/navbar.njk
+++ b/src/_includes/starwarskotor/navbar.njk
@@ -1,12 +1,11 @@
+---
+shrineHomeUrl: /shrines/starwarskotor/
+---
+
 {% extends "global/navbar.njk" %}
 
 {% block navbarLinks %}
-    {% set shrineHomeUrl %}/shrines/starwarskotor/{% endset %}
     {% set navPages = collections.all | eleventyNavigation("KotOR Shrine") %}
-    {% set currentUrl %}{{ page.url }}{% endset %}
-    <li>
-        <a {% if currentUrl === shrineHomeUrl %}aria-current="page"{% endif %} href="{{ shrineHomeUrl }}">Shrine Home</a>
-    </li>
     {%- for entry in navPages %}
         <li>
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>