diff --git a/flake.lock b/flake.lock
index e06ea32..83ddac9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,17 +52,17 @@
     "caelestia-cli-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1751862939,
-        "narHash": "sha256-BlQQF73Qkk2uKfS0yYEQLWdnkf+uWzbvyqkvLqpyUCM=",
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "rev": "e2a34210e58cbd593be63fd4b3e5d2d6257f5c37",
-        "type": "github"
+        "lastModified": 1752673247,
+        "narHash": "sha256-0zEy8aVBZ66RWRx2NPzgURF3iv1pRHuTB3Zld5KkZLU=",
+        "ref": "refs/heads/main",
+        "rev": "e5f1231749bc7c795302b9dc004c891ce162fb2b",
+        "revCount": 260,
+        "type": "git",
+        "url": "https://git.sakamoto.dev/kenji/caelestia-cli"
       },
       "original": {
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.sakamoto.dev/kenji/caelestia-cli"
       }
     },
     "caelestia-shell": {
@@ -77,11 +77,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1752553895,
-        "narHash": "sha256-sXhqL2vcfGSry51Hf7uYretkCrfti6uzvd0YFwdLA1g=",
+        "lastModified": 1752673285,
+        "narHash": "sha256-rXEB4fG2MK7vEiAww7JsGNK0oYGWbW12m9T0g1IwiVM=",
         "ref": "refs/heads/master",
-        "rev": "06c6711b13925b9b5970bd0dc17573bf5a618140",
-        "revCount": 8,
+        "rev": "d51d8ee1d4dbd8db0367423bc7b3be5c15c8a1bc",
+        "revCount": 9,
         "type": "git",
         "url": "https://git.sakamoto.dev/kenji/caelestia-nix"
       },
diff --git a/packages/hyprland/config/binds.nix b/packages/hyprland/config/binds.nix
index fa7c07e..3676665 100644
--- a/packages/hyprland/config/binds.nix
+++ b/packages/hyprland/config/binds.nix
@@ -130,6 +130,7 @@
 
         # Special workspace toggles
         "Control+Shift, Escape, exec, caelestia toggle sysmon"
+        "$mod, Escape, exec, caelestia toggle sysmon"
         "$mod, M, exec, caelestia toggle music"
         "$mod, D, exec, caelestia toggle communication"
         "$mod, R, exec, caelestia toggle todo"
@@ -140,8 +141,6 @@
         "$mod, T, togglespecialworkspace, special:steam"
         "$mod SHIFT, T, movetoworkspace, special:steam"
 
-        "$mod, ESCAPE, togglespecialworkspace, special:btop"
-
         # Toggle special workspace
         "$mod, S, exec, caelestia toggle specialws"
 
diff --git a/packages/hyprland/config/env.nix b/packages/hyprland/config/env.nix
index 34c91df..ce98f35 100644
--- a/packages/hyprland/config/env.nix
+++ b/packages/hyprland/config/env.nix
@@ -6,7 +6,8 @@
 }: {
   wayland.windowManager.hyprland.settings = {
     env = [
-      ""
+      "HYPRCURSOR_THEME, Bibata-Original-Classic"
+      "HYPRCURSOR_SIZE, 24"
     ];
   };
 }
diff --git a/packages/hyprland/config/rules.nix b/packages/hyprland/config/rules.nix
index dee665b..311011a 100644
--- a/packages/hyprland/config/rules.nix
+++ b/packages/hyprland/config/rules.nix
@@ -92,7 +92,6 @@
 
       "special:gaming, monitor:DP-1, persistent:true"
       "special:steam, monitor:DP-1, persistent:true, on-created-empty:steam"
-      "special:btop, persistent:true, on-created-empty:btop"
     ];
 
     # ######## Layer rules ########
diff --git a/packages/hyprland/home.nix b/packages/hyprland/home.nix
index a1b0016..e2d8915 100644
--- a/packages/hyprland/home.nix
+++ b/packages/hyprland/home.nix
@@ -9,6 +9,7 @@
     ./config/rules.nix
     ./config/animation.nix
     ./config/decoration.nix
+    ./config/env.nix
   ];
 
   home.file.".config/hypr/scripts/wsaction.fish" = {
@@ -79,11 +80,6 @@
         workspace_back_and_forth = true;
         scroll_event_delay = 0;
       };
-
-      env = [
-        "HYPRCURSOR_THEME, Bibata-Original-Classic"
-        "HYPRCURSOR_SIZE, 24"
-      ];
     };
   };
 }