diff --git a/i3-gaps-home/.config/i3/config b/i3-gaps-home/.config/i3/config
index e9009a38..c3cd7273 100644
--- a/i3-gaps-home/.config/i3/config
+++ b/i3-gaps-home/.config/i3/config
@@ -85,18 +85,18 @@ bindsym $Mod+7 workspace 7
 bindsym $Mod+8 workspace 8
 
 # switch to workspace - numpad alternatives
-bindsym $mod+Mod2+KP_1 workspace 1
-bindsym $mod+Mod2+KP_2 workspace 2
-bindsym $mod+Mod2+KP_3 workspace 3
-bindsym $mod+Mod2+KP_4 workspace 4
-bindsym $mod+Mod2+KP_5 workspace 5
-bindsym $mod+Mod2+KP_6 workspace 6
-bindsym $mod+Mod2+KP_7 workspace 7
-bindsym $mod+Mod2+KP_8 workspace 8
+bindsym $Mod+Mod2+KP_1 workspace 1
+bindsym $Mod+Mod2+KP_2 workspace 2
+bindsym $Mod+Mod2+KP_3 workspace 3
+bindsym $Mod+Mod2+KP_4 workspace 4
+bindsym $Mod+Mod2+KP_5 workspace 5
+bindsym $Mod+Mod2+KP_6 workspace 6
+bindsym $Mod+Mod2+KP_7 workspace 7
+bindsym $Mod+Mod2+KP_8 workspace 8
 
 # switch to next or previous workspace
-bindsym $mod+Mod1+Left  workspace prev
-bindsym $mod+Mod1+Right workspace next
+bindsym Control+Mod1+Left  workspace prev
+bindsym Control+Mod1+Right workspace next
 
 # move focused container to workspace
 bindsym $Mod+Shift+1 move container to workspace 1; workspace 1
@@ -218,6 +218,7 @@ assign [class="(?i)(?:geany)"]   → 2
 assign [class="(?i)(?:thunar)"]  → 3
 
 # focus, floating, & sticky
+for_window [class="(?i)(?:firefox|geany|thunar)"]    focus
 for_window [class="(?i)(?:qt5ct|pinentry)"]          floating enable, focus
 for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
 for_window [window_role="(?i)(?:pop-up|setup)"]      floating enable