diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f40a55a..181b0b2 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -18,11 +18,6 @@
 
     <div class="container-fluid bg-dimmed wrapper">
 
-      <!-- INITIALIZE DARK THEME -->
-      {{ if site.Params.darkTheme.enable }}
-        {{ partial "helpers/darkmode.html" }}
-      {{ end }}
-
       <!----- ADD NAVBAR --------------->
       {{ block "navbar" . }} {{ end }}
 
diff --git a/layouts/index.html b/layouts/index.html
index 66d8452..6b8f29e 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -34,11 +34,6 @@
   </head>
   <body data-spy="scroll" data-target="#top-navbar" data-offset="100">
 
-    <!-- INITIALIZE DARK THEME -->
-    {{ if site.Params.darkTheme.enable }}
-      {{ partial "helpers/darkmode.html" }}
-    {{ end }}
-
     <!--- NAVBAR ------------------------->
     {{- partial "navigators/navbar.html" . -}}
 
diff --git a/layouts/partials/helpers/darkmode.html b/layouts/partials/helpers/darkmode.html
deleted file mode 100644
index c0ccb5d..0000000
--- a/layouts/partials/helpers/darkmode.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- This is a 'hack' for initializing the color scheme selection. See /js/darkmode.js -->
-<div id="themeInitialization" style="display: none;"
-    default-theme=" {{ site.Params.darkTheme.default }} "></div>
\ No newline at end of file
diff --git a/layouts/partials/navigators/navbar-2.html b/layouts/partials/navigators/navbar-2.html
index c129f6e..8828fe2 100644
--- a/layouts/partials/navigators/navbar-2.html
+++ b/layouts/partials/navigators/navbar-2.html
@@ -47,6 +47,9 @@
       {{ if .IsTranslated }}
         {{ partial "navigators/lang-selector-2.html" . }}
       {{ end }}
+      {{ if site.Params.darkTheme.enable }}
+        {{ partial "navigators/theme-selector.html" . }}
+      {{ end }}
       </ul>
     </div>
   </div>
diff --git a/layouts/partials/navigators/theme-selector.html b/layouts/partials/navigators/theme-selector.html
index ef4f294..9d299c5 100644
--- a/layouts/partials/navigators/theme-selector.html
+++ b/layouts/partials/navigators/theme-selector.html
@@ -1,4 +1,7 @@
 <li class="nav-item dropdown">
+<!-- This is a 'hack' for initializing the color scheme selection. See /js/darkmode.js -->
+<div id="themeInitialization" style="display: none;"
+    default-theme=" {{ site.Params.darkTheme.default }} "></div>
 <a class="nav-link dropdown-toggle"  href="#" id="themeSelector" role="button"
     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Theme</a>
 <div class="dropdown-menu" aria-labelledby="themeSelector">
