diff --git a/flake.nix b/flake.nix
index 8040a6b..8576b4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,13 +45,13 @@
           modules = sharedModules ++ [
             ./hosts/common/workstation.nix
             ./hosts/electra/configuration.nix
-            ./hosts/common/wm/sway.nix
+            ./hosts/common/wm/gnome.nix
             home-manager.nixosModules.home-manager
             ({ config, ...}: {
               home-manager.users.alisceon.imports = [
                 ./home/alisceon/base.nix
                 ./home/alisceon/workstation.nix
-                ./home/wm/sway.nix
+                ./home/wm/gnome.nix
               ];
             }) # end home-manager
           ]; # end modules
diff --git a/home/alisceon/base.nix b/home/alisceon/base.nix
index c971b84..6f40790 100644
--- a/home/alisceon/base.nix
+++ b/home/alisceon/base.nix
@@ -101,7 +101,6 @@
         silent = true;
       }; # end direnv
     }; # end programs
-
     # nixpkgs config
     xdg.configFile."nixpkgs/config.nix".source =  ../conf/config.nix;
   } # end file
diff --git a/home/alisceon/workstation.nix b/home/alisceon/workstation.nix
index 5a1a87f..9689f81 100644
--- a/home/alisceon/workstation.nix
+++ b/home/alisceon/workstation.nix
@@ -31,6 +31,14 @@
     userDirs.enable = true;
     mime.enable = true;
   };
+  gtk = {
+    enable = true;
+    cursorTheme.package = pkgs.vanilla-dmz;
+    cursorTheme.name = "Vanilla-DMZ";
+    font.package = pkgs.inconsolata;
+    font.name = "Inconsolata";
+    font.size = 14;
+  };
 
   services.syncthing = {
     enable = true;
diff --git a/home/wm/gnome.nix b/home/wm/gnome.nix
index 087e7f6..7091a28 100644
--- a/home/wm/gnome.nix
+++ b/home/wm/gnome.nix
@@ -38,6 +38,36 @@
     };
     "org/gnome/shell/keybindings" = {
       show-screenshot-ui = [ "<Shift><Super>s" ];
+
+    };
+    "org/gnome/desktop/wm/keybindings" = {
+      switch-to-workspace-1 = [ "<Super>1" ];
+      switch-to-workspace-2 = [ "<Super>2" ];
+      switch-to-workspace-3 = [ "<Super>3" ];
+      switch-to-workspace-4 = [ "<Super>4" ];
+      switch-to-workspace-5 = [ "<Super>5" ];
+      switch-to-workspace-6 = [ "<Super>6" ];
+      switch-to-workspace-7 = [ "<Super>7" ];
+      switch-to-workspace-8 = [ "<Super>8" ];
+      switch-to-workspace-9 = [ "<Super>9" ];
+      switch-to-workspace-10 = [ "<Super>0" ];
+      move-to-workspace-1 = [ "<Shift><Super>1" ];
+      move-to-workspace-2 = [ "<Shift><Super>2" ];
+      move-to-workspace-3 = [ "<Shift><Super>3" ];
+      move-to-workspace-4 = [ "<Shift><Super>4" ];
+      move-to-workspace-5 = [ "<Shift><Super>5" ];
+      move-to-workspace-6 = [ "<Shift><Super>6" ];
+      move-to-workspace-7 = [ "<Shift><Super>7" ];
+      move-to-workspace-8 = [ "<Shift><Super>8" ];
+      move-to-workspace-9 = [ "<Shift><Super>9" ];
+      move-to-workspace-10 = [ "<Shift><Super>0" ];
+      close = [ "<Alt>F4" "<Shift><Super>q" ];
+      toggle-fullscreen = [ "<Super>f" ];
+    };
+    "org/gnome/desktop/wm/preferences" = {
+      focus-mode = "mouse";
+      auto-raise = true;
+      auto-raise-delay = 500;
     };
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
diff --git a/home/wm/sway.nix b/home/wm/sway.nix
index a56ad6e..ab17f54 100644
--- a/home/wm/sway.nix
+++ b/home/wm/sway.nix
@@ -251,6 +251,28 @@
         }
       ]; # end events
     }; # end swayidle
+    mako = {
+      enable = true;
+      settings = {
+        "actionable=true" = {
+          anchor = "top-left";
+        };
+        actions = true;
+        anchor = "top-right";
+        background-color = color_f_bg;
+        border-color = color_f_bg;
+        border-radius = 0;
+        default-timeout = 0;
+        font = "${style_font} ${style_font_sz}";
+        height = 100;
+        width = 300;
+        icons = true;
+        ignore-timeout = false;
+        layer = "top";
+        margin = 10;
+        markup = true;
+      }; #end settings
+    }; # end mako
   }; # end services
   programs = {
     rofi = {
diff --git a/hosts/common/base.nix b/hosts/common/base.nix
index 4dc324b..c11074a 100644
--- a/hosts/common/base.nix
+++ b/hosts/common/base.nix
@@ -79,6 +79,10 @@
       eza # ls replacement
       nh # nix helper
       jq # JSON processor
+      ncdu
+      pciutils
+      usbutils
+      tree
 
       # Shells
       bash
@@ -109,4 +113,6 @@
     extraGroups = [ "wheel" "networkmanager" "podman" ];
     shell = pkgs.nushell;
   }; # end users
+
+  programs.command-not-found.enable = true;
 } #end file
diff --git a/hosts/common/wm/sway.nix b/hosts/common/wm/sway.nix
index 3debb1a..3bc52e2 100644
--- a/hosts/common/wm/sway.nix
+++ b/hosts/common/wm/sway.nix
@@ -19,7 +19,14 @@
       enable = true;
     }; # end light
   }; # end programs
-  security.polkit.enable = true;
+  security = {
+    polkit.enable = true;
+    pam.services = {
+      greetd.enableGnomeKeyring = true;
+      greetd-password.enableGnomeKeyring = true;
+      login.enableGnomeKeyring = true;
+    }; # end pam.services
+  }; # end security
   services = {
     greetd = {                                                      
       enable = true;