diff --git a/settings/hyprland.nix b/settings/hyprland.nix
index f26c073..e8c0703 100644
--- a/settings/hyprland.nix
+++ b/settings/hyprland.nix
@@ -287,7 +287,7 @@ in
 
             -- Floating / layout
             hl.bind(mod .. " + V", hl.dsp.window.float({ action = "toggle" }))
-            hl.bind(mod .. " + F", hl.dsp.window.fullscreen({ state = 0 }))
+            hl.bind(mod .. " + F", hl.dsp.window.fullscreen())
             hl.bind(mod .. " + P", hl.dsp.window.pseudo())
             hl.bind(mod .. " + S", hl.dsp.layout("togglesplit"))
 
@@ -310,27 +310,27 @@ in
             hl.bind(mod .. " + SHIFT + down",  hl.dsp.window.move({ direction = "down" }))
 
             -- Workspaces
-            hl.bind(mod .. " + 1", hl.dsp.workspace.change(1))
-            hl.bind(mod .. " + 2", hl.dsp.workspace.change(2))
-            hl.bind(mod .. " + 3", hl.dsp.workspace.change(3))
-            hl.bind(mod .. " + 4", hl.dsp.workspace.change(4))
-            hl.bind(mod .. " + 5", hl.dsp.workspace.change(5))
-            hl.bind(mod .. " + 6", hl.dsp.workspace.change(6))
-            hl.bind(mod .. " + 7", hl.dsp.workspace.change(7))
-            hl.bind(mod .. " + 8", hl.dsp.workspace.change(8))
-            hl.bind(mod .. " + 9", hl.dsp.workspace.change(9))
-            hl.bind(mod .. " + 0", hl.dsp.workspace.change(10))
+            hl.bind(mod .. " + 1", hl.dsp.focus({ workspace = 1 }))
+            hl.bind(mod .. " + 2", hl.dsp.focus({ workspace = 2 }))
+            hl.bind(mod .. " + 3", hl.dsp.focus({ workspace = 3 }))
+            hl.bind(mod .. " + 4", hl.dsp.focus({ workspace = 4 }))
+            hl.bind(mod .. " + 5", hl.dsp.focus({ workspace = 5 }))
+            hl.bind(mod .. " + 6", hl.dsp.focus({ workspace = 6 }))
+            hl.bind(mod .. " + 7", hl.dsp.focus({ workspace = 7 }))
+            hl.bind(mod .. " + 8", hl.dsp.focus({ workspace = 8 }))
+            hl.bind(mod .. " + 9", hl.dsp.focus({ workspace = 9 }))
+            hl.bind(mod .. " + 0", hl.dsp.focus({ workspace = 10 }))
 
-            hl.bind(mod .. " + SHIFT + 1", hl.dsp.window.move_to_workspace({ id = 1,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 2", hl.dsp.window.move_to_workspace({ id = 2,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 3", hl.dsp.window.move_to_workspace({ id = 3,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 4", hl.dsp.window.move_to_workspace({ id = 4,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 5", hl.dsp.window.move_to_workspace({ id = 5,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 6", hl.dsp.window.move_to_workspace({ id = 6,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 7", hl.dsp.window.move_to_workspace({ id = 7,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 8", hl.dsp.window.move_to_workspace({ id = 8,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 9", hl.dsp.window.move_to_workspace({ id = 9,  silent = true }))
-            hl.bind(mod .. " + SHIFT + 0", hl.dsp.window.move_to_workspace({ id = 10, silent = true }))
+            hl.bind(mod .. " + SHIFT + 1", hl.dsp.window.move({ workspace = 1,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 2", hl.dsp.window.move({ workspace = 2,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 3", hl.dsp.window.move({ workspace = 3,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 4", hl.dsp.window.move({ workspace = 4,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 5", hl.dsp.window.move({ workspace = 5,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 6", hl.dsp.window.move({ workspace = 6,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 7", hl.dsp.window.move({ workspace = 7,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 8", hl.dsp.window.move({ workspace = 8,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 9", hl.dsp.window.move({ workspace = 9,  follow = false }))
+            hl.bind(mod .. " + SHIFT + 0", hl.dsp.window.move({ workspace = 10, follow = false }))
 
             -- Screenshots — Shift+Super+S matches GNOME binding
             hl.bind(mod .. " + SHIFT + S", hl.dsp.exec_cmd("hyprshot -m region --clipboard-only"))