diff --git a/home/.Xresources b/home/.Xresources
index 3e0a25be..2fabb6f8 100644
--- a/home/.Xresources
+++ b/home/.Xresources
@@ -31,6 +31,7 @@ rofi.color-window: #1c2023, #919ba0, #1c2023
 rofi.color-normal: #1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023
 rofi.color-urgent: argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49
 rofi.color-active: argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49
+rofi.kb-cancel: Escape,Alt+F1
 
 ! xterm
 xterm*termName: xterm-256color
diff --git a/home/.config/i3/config b/home/.config/i3/config
index 014ef691..d1377988 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -79,6 +79,7 @@ bindsym Mod1+F1 exec --no-startup-id rofi_run -r
 # kill focused window
 bindsym $Mod+Shift+q kill
 bindsym Mod1+q kill
+bindsym Mod1+F4 kill
 
 # launchers
 bindsym Control+space exec --no-startup-id rofi_run -r
@@ -133,6 +134,21 @@ bindsym $Mod+6 workspace $WS6
 bindsym $Mod+7 workspace $WS7
 bindsym $Mod+8 workspace $WS8
 
+# switch to workspace - numpad alternatives
+bindsym $mod+Mod2+KP_1 workspace $WS1
+bindsym $mod+Mod2+KP_2 workspace $WS2
+bindsym $mod+Mod2+KP_3 workspace $WS3
+bindsym $mod+Mod2+KP_4 workspace $WS4
+bindsym $mod+Mod2+KP_5 workspace $WS5
+bindsym $mod+Mod2+KP_6 workspace $WS6
+bindsym $mod+Mod2+KP_7 workspace $WS7
+bindsym $mod+Mod2+KP_8 workspace $WS8
+
+# switch to next or previous workspace
+bindsym $mod+Mod1+Left workspace prev
+bindsym $mod+Mod1+Right workspace next
+
+
 # move focused container to workspace
 bindsym $Mod+Shift+1 move container to workspace $WS1; workspace $WS1
 bindsym $Mod+Shift+2 move container to workspace $WS2; workspace $WS2
@@ -143,6 +159,17 @@ bindsym $Mod+Shift+6 move container to workspace $WS6; workspace $WS6
 bindsym $Mod+Shift+7 move container to workspace $WS7; workspace $WS7
 bindsym $Mod+Shift+8 move container to workspace $WS8; workspace $WS8
 
+# move focused container to workspace - numpad alternatives
+bindsym $Mod+Shift+Mod2+KP_End move container to workspace $WS1; workspace $WS1
+bindsym $Mod+Shift+Mod2+KP_Down move container to workspace $WS2; workspace $WS2
+bindsym $Mod+Shift+Mod2+KP_Next move container to workspace $WS3; workspace $WS3
+bindsym $Mod+Shift+Mod2+KP_Left move container to workspace $WS4; workspace $WS4
+bindsym $Mod+Shift+Mod2+KP_Begin move container to workspace $WS5; workspace $WS5
+bindsym $Mod+Shift+Mod2+KP_Right move container to workspace $WS6; workspace $WS7
+bindsym $Mod+Shift+Mod2+KP_Home move container to workspace $WS7; workspace $WS7
+bindsym $Mod+Shift+Mod2+KP_Up move container to workspace $WS8; workspace $WS8
+
+
 ############################################################
 ##############     Reload configs           ################
 ############################################################
@@ -158,7 +185,7 @@ bindsym $Mod+Shift+c reload
 ########################################################
 
 # Scratchpad, Floating
-bindsym $Mod+Shift+space floating toggle
+bindsym $Mod+space floating toggle
 floating_modifier  Mod1
 
 bindsym $Mod+Shift+z move scratchpad