diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix
index 6b89d02..76270ab 100644
--- a/hosts/Garand-Desktop/system-modules.nix
+++ b/hosts/Garand-Desktop/system-modules.nix
@@ -89,7 +89,6 @@ _: {
     /*
     Productivity / Knowledge Management
     */
-    bitwarden.enable = false; # Bitwarden: password manager (desktop)
     iotas.enable = true; # Iotas: lightweight notes manager
     # appImages.logseq.enable = false; # Logseq: knowledge base and outliner
 
diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix
index b7f78b7..90a45aa 100644
--- a/hosts/Garand-Laptop/system-modules.nix
+++ b/hosts/Garand-Laptop/system-modules.nix
@@ -89,7 +89,6 @@ _: {
     /*
     Productivity / Knowledge Management
     */
-    bitwarden.enable = false; # Bitwarden: password manager (desktop)
     iotas.enable = true; # Iotas: lightweight notes manager
     # appImages.logseq.enable = false; # Logseq: knowledge base and outliner
 
diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix
index 4eb828c..d0de3e0 100644
--- a/hosts/default/system-modules.nix
+++ b/hosts/default/system-modules.nix
@@ -89,7 +89,6 @@ _: {
     /*
     Productivity / Knowledge Management
     */
-    bitwarden.enable = false; # Bitwarden: password manager (desktop)
     iotas.enable = false; # Iotas: lightweight notes manager
     # appImages.logseq.enable = false; # Logseq: knowledge base and outliner
 
diff --git a/modules/core/packages/essentials.nix b/modules/core/packages/essentials.nix
index f0d74f7..907f60e 100644
--- a/modules/core/packages/essentials.nix
+++ b/modules/core/packages/essentials.nix
@@ -9,6 +9,9 @@
     fortune
     yt-dlp
     pdfium-binaries
+    bitwarden-cli
+    xdg-utils
+    gcc
     # File management
     trash-cli
     file-roller
diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix
index 4a1b58f..a203e43 100644
--- a/modules/core/packages/packages.nix
+++ b/modules/core/packages/packages.nix
@@ -14,7 +14,6 @@
   };
 
   packages = with pkgs; {
-    bitwarden = bitwarden-desktop;
     eddieAirVPN = eddie;
     gnomeCalculator = gnome-calculator;
     gedit = gedit;
diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix
index 0f2db94..de1515b 100644
--- a/modules/home/hyprland/binds.nix
+++ b/modules/home/hyprland/binds.nix
@@ -7,7 +7,7 @@
 
   mainBinds = [
     "SUPER, A, exec, anki #\"Flashcard learning application\""
-    "SUPER, B, exec, bitwarden #\"Password manager\""
+    "SUPER, B, exec, noctalia msg panel-toggle launcher \"/bw \" #\"Password manager\""
     "SUPER, C, exec, chromium #\"Ungoogled Chromium\""
     "SUPER, D, exec, vesktop #\"Discord client\""
     "SUPER, E, exec, noctalia msg panel-toggle launcher \"/emo \" #\"Emoji picker\""
@@ -37,7 +37,7 @@
     "SUPER SHIFT, Escape, exec, noctalia msg panel-toggle session #\"Open Session Menu\""
     "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop #\"ChatGPT AI chat\""
     "SUPER SHIFT, J, exec, dex ${desktopEntriesPath}/jellyfinClient.desktop #\"Jellyfin PWA\""
-    # "SUPER SHIFT, K, exec, noctalia-shell ipc call plugin:keybind-cheatsheet toggle #\"Toggle keybind cheatsheet\""
+    "SUPER SHIFT, K, exec, noctalia msg panel-toggle kenn/keybind-cheatsheet:cheatsheet #\"Toggle keybind cheatsheet\""
     "SUPER SHIFT, M, exec, plexamp #\"Music player for Plex\""
     "SUPER SHIFT, N, exec, nextcloud #\"Nextcloud desktop sync client\""
     "SUPER SHIFT, O, exec, obs #\"Open Broadcaster Software\""
diff --git a/modules/home/noctalia/settings/bar.nix b/modules/home/noctalia/settings/bar.nix
index 19ea01d..1843e37 100644
--- a/modules/home/noctalia/settings/bar.nix
+++ b/modules/home/noctalia/settings/bar.nix
@@ -24,6 +24,7 @@ _: {
       center = ["workspaces"];
       end = [
         "tray"
+        "keybinds"
         "notifications"
         "bluetooth"
         "battery"
diff --git a/modules/home/noctalia/settings/plugins/bitwarden.nix b/modules/home/noctalia/settings/plugins/bitwarden.nix
new file mode 100644
index 0000000..3eab47e
--- /dev/null
+++ b/modules/home/noctalia/settings/plugins/bitwarden.nix
@@ -0,0 +1,11 @@
+_: {
+  programs.noctalia.settings.plugin_settings."noctalia/bitwarden" = {
+    server_url = "https://vw.garandplg.com";
+    vault_timeout = "30";
+    gen_length = 128;
+    gen_uppercase = true;
+    gen_lowercase = true;
+    gen_number = true;
+    gen_special = true;
+  };
+}
diff --git a/modules/home/noctalia/settings/plugins/default.nix b/modules/home/noctalia/settings/plugins/default.nix
index 83a4b79..ce171bc 100644
--- a/modules/home/noctalia/settings/plugins/default.nix
+++ b/modules/home/noctalia/settings/plugins/default.nix
@@ -1,14 +1,18 @@
 _: {
   programs.noctalia.settings.plugins = {
     enabled = [
-      "noctalia/screen_recorder"
+      "noctalia/bitwarden"
       "oldirtty/color_picker"
       "nightwatch75/file-search"
+      "kenn/keybind-cheatsheet"
       "avivbintangaringga/nix-monitor"
+      "noctalia/screen_recorder"
     ];
   };
 
   imports = [
+    ./bitwarden.nix
+    ./keybind-cheatsheet.nix
     ./screen-recorder.nix
     ./nix-monitor.nix
   ];
diff --git a/modules/home/noctalia/settings/plugins/keybind-cheatsheet.nix b/modules/home/noctalia/settings/plugins/keybind-cheatsheet.nix
new file mode 100644
index 0000000..6b815ec
--- /dev/null
+++ b/modules/home/noctalia/settings/plugins/keybind-cheatsheet.nix
@@ -0,0 +1,7 @@
+_: {
+  programs.noctalia.settings.plugin_settings."kenn/keybind-cheatsheet" = {
+    compositor = "hyprland";
+    columns = 3;
+    show_actions = true;
+  };
+}
diff --git a/modules/home/noctalia/settings/widget.nix b/modules/home/noctalia/settings/widget.nix
index 8889e0b..e974b37 100644
--- a/modules/home/noctalia/settings/widget.nix
+++ b/modules/home/noctalia/settings/widget.nix
@@ -11,7 +11,7 @@
       scale = 1.3;
     };
 
-    cpu.display = "text";
+    cpu.visualization = "gauge";
 
     launcher.glyph = "rocket";
 
@@ -20,25 +20,27 @@
     network.show_label = false;
 
     network_rx = {
-      display = "text";
+      visualization = "gauge";
       network_speed_compact = true;
     };
 
     network_tx = {
-      display = "text";
+      visualization = "gauge";
       network_speed_compact = true;
     };
 
-    ram.display = "text";
+    ram.visualization = "gauge";
 
     recorder.type = "noctalia/screen_recorder:recorder";
 
+    keybinds.type = "kenn/keybind-cheatsheet:keybinds";
+
     spacer_2.type = "spacer";
 
     spacer_3.type = "spacer";
 
     sysmon = {
-      visualization = "text";
+      visualization = "gauge";
       path = "/home";
       stat = "disk_free_pct";
     };