diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk
index 94abaf2..de1070a 100644
--- a/src/_includes/partials/footer.njk
+++ b/src/_includes/partials/footer.njk
@@ -1,10 +1,8 @@
-{% set activePage = page.url | url %}
-
 <footer class="site-foot">
   <div class="wrapper">
     <div class="site-foot__inner">
       <nav class="site-foot__inner text-step-0" aria-label="{{ meta.navigation.ariaBottom }}">
-        &copy; {% year %} <a href="/" {% if activePage === '/' %} aria-current="page" {% endif %}>{{ meta.siteName }} <small>{{ pkg.version }}</small>  </a>
+        &copy; {% year %} <a href="/"{% if page.url == "/" %} aria-current="page"{% endif %}>{{ meta.siteName }} <small>{{ pkg.version }}</small>  </a>
 
         {% for item in navigation.bottom %}
         <a
@@ -22,8 +20,6 @@
 
 				<nav class="site-foot__inner" aria-label="{{ meta.navigation.ariaSocial }}">
 
-
-
 							<!-- gets the first item from the feed loop set in meta -->
 							<a href="{{ meta.blog.feedLinks[0].url }}" rel="alternate" type="{{ meta.blog.feedLinks[0].type }}">
 								<span class="visually-hidden">{{ meta.blog.feedLinks[0].title }}</span>
@@ -58,7 +54,7 @@
 				class="button"
 				theme-toggle
 			>
-				<span id="theme-switcher-value"></span>
+				<span id="theme-switcher-value">{{ meta.themeSwitch.initial }}</span>
 			</button>
 
 		</div>
diff --git a/src/_includes/partials/header.njk b/src/_includes/partials/header.njk
index 5a89bdb..1732f6e 100644
--- a/src/_includes/partials/header.njk
+++ b/src/_includes/partials/header.njk
@@ -2,8 +2,7 @@
 
 <header class="wrapper">
   <div class="repel ontop" style="--gap: 0;">
-    {% set activePage = page.url | url %}
-			<a href="/" class="logo | cluster" {% if activePage === '/' %} aria-current="page" {% endif %}>
+			<a href="/" class="logo | cluster"{% if page.url == "/" %} aria-current="page"{% endif %}>
 			{% include "svg/star.svg" %}
 			<span>{{ meta.siteName }}</span>
 			</a>