diff --git a/src/lib/e_app_sys_menu.svelte b/src/lib/e_app_sys_menu.svelte
index 1e8e9860..0c9b8163 100644
--- a/src/lib/e_app_sys_menu.svelte
+++ b/src/lib/e_app_sys_menu.svelte
@@ -102,10 +102,7 @@ max-w-max -->
 
         text-sm sm:text-sm md:text-md lg:text-md xl:text-md 2xl:text-lg
 
-        bg:blue-100/20 dark:bg-blue-800/30
-        dark:text-slate-400 dark:hover:text-slate-200
-        hover:bg-blue-200/90 hover:dark:bg-blue-900/90
-        active:bg-blue-200 active:dark:bg-blue-900
+        bg-blue-200/50
 
         border-2 rounded-lg
         border-blue-300/20 dark:border-blue-700/20
@@ -121,13 +118,16 @@ max-w-max -->
     class:w-full={expand}
     class:hidden={false}
     class:border-transparent={!expand}
-    class:hover:bg-transparent={!expand}
+    class:bg-transparent={!expand}
     >
 
 <!-- class:hidden={!expand} -->
 <!-- class:preset-filled-warning-100-900={expand} -->
 <div
+    class:opacity-50={!expand}
     class:opacity-100={expand}
+    class:light:bg-blue-500={expand}
+    class:dark:bg-blue-500={expand}
     class="
         hidden-print
         flex flex-col items-end justify-end
@@ -138,15 +138,12 @@ max-w-max -->
 
         w-full
 
-        bg-gray-500/75
-        hover:bg-blue-100/90 active:bg-blue-200 focus:bg-blue-300
-        dark:dark-gray-800/80 dark:hover:bg-gray-800/90
+        light:bg-blue-200/10
+        dark:bg-blue-800/10
+        hover:opacity-100
 
         relative
 
-        opacity-80
-        hover:opacity-100
-
         transition-all
         delay-1000 hover:delay-500
         duration-200 hover:duration-200
@@ -435,6 +432,8 @@ max-w-max -->
                     $ae_sess.app_cfg.show_element__passcode_input = true;
                 } else {
                     $ae_sess.app_cfg.show_element__passcode_input = false;
+                    $ae_loc.sys_menu.expand_user = false; // Not in use yet
+                    $ae_sess.show__sign_in_out__fields = false;
                 }
                 // $ae_loc.app_cfg.show_element__passcode_input = true;
                 await tick();
@@ -523,8 +522,11 @@ max-w-max -->
                     expand = true;
                     $ae_loc.sys_menu.expand = true;
                     // $ae_loc.sys_menu.expand_btn = false;
+                    // $ae_loc.sys_menu.expand_access_type = true;
                 } else {
                     $ae_loc.sys_menu.expand = false;
+                    $ae_loc.sys_menu.expand_user = false; // Not in use yet
+                    $ae_sess.show__sign_in_out__fields = false;
                     // $ae_loc.sys_menu.expand_btn = true;
                 }
             // $ae_loc.sys_menu.expand_btn = !expand_btn;