diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 3a091e6..25ed405 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -48,6 +48,7 @@ input {
     kb_layout = us
     follow_mouse = 1
     kb_options = compose:rctrl
+    numlock_by_default = true
 }
 
 general {
@@ -159,23 +160,23 @@ bind = $mainMod, 7, exec, hyprsome workspace 7
 bind = $mainMod, 8, exec, hyprsome workspace 8
 bind = $mainMod, 9, exec, hyprsome workspace 9
 
-bind = $mainMod SHIFT, 1, exec, hyprsome move 1
-bind = $mainMod SHIFT, 2, exec, hyprsome move 2
-bind = $mainMod SHIFT, 3, exec, hyprsome move 3
-bind = $mainMod SHIFT, 4, exec, hyprsome move 4
-bind = $mainMod SHIFT, 5, exec, hyprsome move 5
-bind = $mainMod SHIFT, 6, exec, hyprsome move 6
-bind = $mainMod SHIFT, 7, exec, hyprsome move 7
-bind = $mainMod SHIFT, 8, exec, hyprsome move 8
-bind = $mainMod SHIFT, 9, exec, hyprsome move 9
+bind = $mainMod SHIFT, 1, exec, hyprsome movefocus 1
+bind = $mainMod SHIFT, 2, exec, hyprsome movefocus 2
+bind = $mainMod SHIFT, 3, exec, hyprsome movefocus 3
+bind = $mainMod SHIFT, 4, exec, hyprsome movefocus 4
+bind = $mainMod SHIFT, 5, exec, hyprsome movefocus 5
+bind = $mainMod SHIFT, 6, exec, hyprsome movefocus 6
+bind = $mainMod SHIFT, 7, exec, hyprsome movefocus 7
+bind = $mainMod SHIFT, 8, exec, hyprsome movefocus 8
+bind = $mainMod SHIFT, 9, exec, hyprsome movefocus 9
 
-bind = $mainMod SHIFT, T, movetoworkspace, empty
+bind = $mainMod SHIFT, T, exec, hyprsome move-empty
+bind = $mainMod, T, exec, hyprsome focus-empty
 
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, TAB, workspace, m+1
 bind = $mainMod SHIFT, TAB, workspace, m-1
-bind = $mainMod, T, workspace, empty
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
diff --git a/hypr/hyprsome/src/main.rs b/hypr/hyprsome/src/main.rs
index 6ba836a..8db2946 100644
--- a/hypr/hyprsome/src/main.rs
+++ b/hypr/hyprsome/src/main.rs
@@ -344,7 +344,7 @@ fn main() {
             movefocus(&get_empty_workspace());
         },
         Commands::FocusEmpty => {
-            send_to_workspace(&get_empty_workspace());
+            select_workspace(&get_empty_workspace());
         },
     }
 }