diff --git a/home/environments/hyprland/binds.nix b/home/environments/hyprland/binds.nix
index 12258a16..4c2b11fa 100644
--- a/home/environments/hyprland/binds.nix
+++ b/home/environments/hyprland/binds.nix
@@ -11,6 +11,10 @@
   in {
     "$mod" = "SUPER";
     binds.workspace_back_and_forth = true;
+    misc = {
+      session_lock_xray = true;
+      key_press_enables_dpms = true;
+    };
     bindm = [
       "$mod, mouse:272, movewindow"
       "$mod, mouse:273, resizewindow"
@@ -38,8 +42,8 @@
         ", XF86AudioPrev, exec, ${getExe pkgs.playerctl} prev"
 
         "$mod, RETURN, exec, ${getExe config.programs.vicinae.package} toggle"
-        "$mod, grave,  exec, ${uwsmApp term}"
-        "$mod SHIFT, grave,  exec, ${uwsmApp term} --class AlacrittyFloating"
+        "$mod, grave,  exec, ${term}"
+        "$mod SHIFT, grave,  exec, ${term} --class AlacrittyFloating"
         ", Print, exec, ${uwsmSingleApp "grimblast"} copy area"
         "CTRL ALT, DELETE, exec, ${uwsmApp "hyprctl kill"}"
         "CTRL ALT SHIFT, DELETE, exec, loginctl terminate-user \"\""
@@ -86,6 +90,9 @@
         "$mod CTRL SHIFT, up, hy3:movewindow, u, once, visible"
         "$mod CTRL SHIFT, down, hy3:movewindow, d, once, visible"
 
+        "$mod, c, togglespecialworkspace"
+        "$mod SHIFT, c, movetoworkspace, special"
+
         "$mod, P, exec, ${getExe pkgs.hyprpicker} -na"
 
         "CTRL, Print, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave output"
diff --git a/home/environments/hyprland/window-rules.nix b/home/environments/hyprland/window-rules.nix
index 864b24d1..4207e83a 100644
--- a/home/environments/hyprland/window-rules.nix
+++ b/home/environments/hyprland/window-rules.nix
@@ -1,17 +1,20 @@
 _: {
-  wayland.windowManager.hyprland.settings.windowrulev2 = [
-    "suppressevent fullscreen, class:steam_app_default"
-    "workspace 2, class:steam_app_default"
-    "suppressevent maximize, class:.*"
+  wayland.windowManager.hyprland.settings = {
+    windowrule = [
+      "match:initial_class AlacrittyFloating, float on"
+    ];
+    windowrulev2 = [
+      "suppressevent fullscreen, class:steam_app_default, content game"
+      "suppressevent maximize, class:.*"
 
-    "tile, class:battle\.net\.exe"
+      "tile, class:battle\.net\.exe"
 
-    "renderunfocused, class:discord, initialTitle:Discord"
+      "renderunfocused, class:discord, initialTitle:Discord"
 
-    "unset, title:Wine System Tray"
-    "workspace special:hidden silent, title:Wine System Tray"
-    "noinitialfocus, title:Wine System Tray"
+      "unset, title:Wine System Tray"
+      "workspace special:hidden silent, title:Wine System Tray"
+      "noinitialfocus, title:Wine System Tray"
 
-    "float, class:^(AlacrittyFloating)$"
-  ];
+    ];
+  };
 }