diff --git a/layouts/partials/body/darkmode.html b/layouts/partials/body/darkmode.html
index 53f2c67..de338bf 100644
--- a/layouts/partials/body/darkmode.html
+++ b/layouts/partials/body/darkmode.html
@@ -2,5 +2,7 @@
     id="dark-mode-toggle-1"
     appearance="toggle"
     permanent=true
-    style="display:inline-block; contain: none; height:20px;position: relative; top: -3px;"
+    legend="Theme Switcher"
+          dark="Dark"
+      light="Light"
 ></dark-mode-toggle>
\ No newline at end of file
diff --git a/layouts/partials/components/navmenu.html b/layouts/partials/components/navmenu.html
index a30b812..ab81a01 100644
--- a/layouts/partials/components/navmenu.html
+++ b/layouts/partials/components/navmenu.html
@@ -26,6 +26,5 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
         <a itemprop="url"{{ if $is_active }} class="active"{{ end }}{{ if eq .Identifier "search" }} rel="search"{{ end }} href="{{ .URL }}">{{ if .Pre }}{{ .Pre | safeHTML }} {{ end }}{{ .Name }}{{ if .Post }} {{ .Post | safeHTML }}{{ end }}</a>
       {{ end }}
     {{ end }}
-    {{ if eq .name "utility" }}{{ partial "body/darkmode.html" . }}{{ end}}
   </nav>
 {{ end }}
diff --git a/layouts/partials/footer/hcard.html b/layouts/partials/footer/hcard.html
index 0eba985..352e029 100644
--- a/layouts/partials/footer/hcard.html
+++ b/layouts/partials/footer/hcard.html
@@ -1,7 +1,6 @@
 <hr>
 <p class="h-card vcard">
 	<img class="u-photo" src="/wp-content/uploads/avatar.jpg" alt="" width="14px"/>
-
 	<a style="text-decoration: none" href={{ .Site.BaseURL }} class="p-name u-url url author metatag" rel="me">
         Rohan Verma
 	</a> /
@@ -10,7 +9,11 @@
 	</a> 
 </p>
 <hr>
+{{ partial "body/darkmode.html" . }}
+<hr>
 
+<div style="width: 50%; margin: 0 auto;">
 <a href="https://xn--sr8hvo.ws/%E2%98%A0%F0%9F%8D%97%F0%9F%8F%A4/previous">←</a>
 IndieWeb Webring 🕸💍
-<a href="https://xn--sr8hvo.ws/%E2%98%A0%F0%9F%8D%97%F0%9F%8F%A4/next">→</a>
\ No newline at end of file
+<a href="https://xn--sr8hvo.ws/%E2%98%A0%F0%9F%8D%97%F0%9F%8F%A4/next">→</a>
+</div>
\ No newline at end of file