diff --git a/.config/sway/config b/.config/sway/config
index 7a40065..11cf6fe 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -39,17 +39,14 @@ bindsym $mod+h splith
 bindsym $mod+v splitv
 
 # toggle fullscreen mode
-bindsym $mod+c fullscreen
+bindsym $mod+c fullscreen toggle
 
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
-# toggle the current focus between tiling and floating mode
-bindsym $mod+Shift+space floating toggle
-
-# swap focus between the tiling area and the floating area
+# toggle tiling / floating
 bindsym $mod+space focus mode_toggle
 
 # focus the parent container
@@ -68,11 +65,11 @@ bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut.
 # You can send windows there and get them back later.
 
 # Move the currently focused window to the scratchpad
-bindsym $mod+delete move scratchpad
+bindsym $mod+Shift+minus move scratchpad
 
 # Show the next scratchpad window or hide the focused scratchpad window.
 # If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+insert scratchpad show
+bindsym $mod+minus scratchpad show
 
 #
 # Moving around:
diff --git a/.config/sway/config.d/10-workspaces.conf b/.config/sway/config.d/10-workspaces.conf
index 41f3b7f..4560d67 100644
--- a/.config/sway/config.d/10-workspaces.conf
+++ b/.config/sway/config.d/10-workspaces.conf
@@ -1,5 +1,5 @@
 #
-# Setup workspaces
+# Workspace setup
 #
 set $ws0 "0"
 set $ws1 "1"
@@ -15,21 +15,6 @@ set $ws10 "10"
 set $ws11 "11"
 set $ws12 "12"
 
-# Bin workspaces to specific screens
-workspace $ws0 output $screen0
-workspace $ws1 output $screen0
-workspace $ws2 output $screen0
-workspace $ws3 output $screen0
-workspace $ws4 output $screen0
-workspace $ws5 output $screen0
-workspace $ws6 output $screen1
-workspace $ws7 output $screen1
-workspace $ws8 output $screen1
-workspace $ws9 output $screen1
-workspace $ws10 output $screen1
-workspace $ws11 output $screen1
-workspace $ws12 output $screen1
-
 # Switch to workspace
 bindsym $mod+grave workspace number $ws0
 bindsym $mod+1 workspace number $ws1