diff --git a/assets/css/custom.css b/assets/css/custom.css
index 98cdfa1..7ad5ee5 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -1,6 +1,6 @@
 dark-mode-toggle {
-  --dark-mode-toggle-dark-icon: url("/wp-content/moon.png");
-  --dark-mode-toggle-dark-icon: url("/wp-content/moon.png");
+  --dark-mode-toggle-dark-icon: url("/wp-content/sun.png");
+  --dark-mode-toggle-light-icon: url("/wp-content/moon.png");
 }
 
 body.light {
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index c335ac9..a42ca96 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -57,7 +57,6 @@
   {{ $hackcss_mode := .Site.Params.hackcss.mode | default "hack" }}
   {{ $hackcss_palette := .Site.Params.hackcss.palette | default "dark" }}
   <body class="{{ if ne $hackcss_disabled true }}{{ $hackcss_mode }} {{ $hackcss_palette }} main container{{ end }}">
-    {{ partial "body/darkmode.html" . }} 
     <header>{{ block "header" . }}{{ end }}</header>
     <main>{{ block "main" . }}{{ end }}</main>
     <footer>
diff --git a/layouts/partials/body/darkmode.html b/layouts/partials/body/darkmode.html
index fab5f51..53f2c67 100644
--- a/layouts/partials/body/darkmode.html
+++ b/layouts/partials/body/darkmode.html
@@ -2,5 +2,5 @@
     id="dark-mode-toggle-1"
     appearance="toggle"
     permanent=true
-    style="position:absolute;top:5px;right:50%"
+    style="display:inline-block; contain: none; height:20px;position: relative; top: -3px;"
 ></dark-mode-toggle>
\ No newline at end of file
diff --git a/layouts/partials/components/navmenu.html b/layouts/partials/components/navmenu.html
new file mode 100644
index 0000000..a30b812
--- /dev/null
+++ b/layouts/partials/components/navmenu.html
@@ -0,0 +1,31 @@
+{{/*
+Copyright (C) 2019  Josh Habdas <jhabdas@protonmail.com>
+
+This file is part of After Dark.
+
+After Dark is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+After Dark is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/ -}}
+
+{{ if not (eq .settings.hidden true) }}
+  <nav itemscope itemtype="https://schema.org/SiteNavigationElement">
+    <meta itemprop="name" content="{{ .name | humanize }} Menu">
+    {{ range .entries }}
+      {{ $is_active := or ($.page.IsMenuCurrent $.name .) ($.page.HasMenuCurrent $.name .) }}
+      {{ if (not (in $.settings.exclude .Identifier)) }}
+        <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 }}
