Index: portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm
===================================================================
diff -u -N -r168ad3e24445eb2e7957489502a3674ad92adc81 -r0f0398dc1a596a892a5582b98ebe245dbea073a3
--- portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm	(.../includeLoginNav.vm)	(revision 168ad3e24445eb2e7957489502a3674ad92adc81)
+++ portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm	(.../includeLoginNav.vm)	(revision 0f0398dc1a596a892a5582b98ebe245dbea073a3)
@@ -160,18 +160,18 @@
 
                                     #end ## END of IF (${tabsSites.tutorial})
 
-                                    #if (${tabsSites.themeSwitcher})
+                                    #if (${themeSwitcher})
 
                                         <li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented Mrphs-userNav__submenuitem-toggle">
-                                            <label for="themeSwitcher" class="sakaiThemeSwitch">${rloader.sit_themeSwitcher}</label>
-                                            <button role="switch" aria-checked="true"
-                                                id="themeSwitcher" class="Mrphs-userNav__submenuitem--themeSwitcher switch">
-                                                <span>${rloader.sit_themeSwitcherOn}</span>
+                                            <label for="sakai-darkThemeSwitcher" class="sakaiThemeSwitch">${rloader.sit_themeSwitcher}</label>
+                                            <button role="switch" aria-checked="false"
+                                                id="sakai-darkThemeSwitcher" class="Mrphs-userNav__submenuitem--themeSwitcher switch">
                                                 <span>${rloader.sit_themeSwitcherOff}</span>
+                                                <span>${rloader.sit_themeSwitcherOn}</span>
                                             </button>
                                         </li>
 
-                                    #end ## END of IF (${tabsSites.themeSwitcher})
+                                    #end ## END of IF (${themeSwitcher})
 
                             #end ## END of IF (${site.isMyWorkspace})