diff --git a/sxhkdrc b/sxhkdrc
index 89c3041..dee65f5 100644
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -14,55 +14,53 @@ ctrl + grave
 	# ~/.config/sxhkd/toggle-gb-ru-kb.sh
 
 # make sxhkd reload its configuration files:
-mode_switch + Escape
+super + Escape
 	killall sxhkd && /usr/bin/sxhkd -c /home/ray/.config/sxhkd/sxhkdrc /home/ray/.config/sxhkd/sxhkdrc.bspwm /home/ray/.config/sxhkd/sxhkdrc.bspwm.machineone &
 
+super + p
 	dmenu_recency
 
-mode_switch + p
-	dmenu_recency
-
-mode_switch + b
+super + b
 	qutesesh
 
-mode_switch + shift + p
+super + shift + p
 	keepmenu -d /home/ray/.Syncthing/Pass/Passwords.kdbx
 
-mode_switch + ctrl + shift + p
+super + ctrl + shift + p
 	keepmenu -d /home/ray/.Syncthing/Pass/PasswordsClient.kdbx
 
-mode_switch + ctrl + p
+super + ctrl + p
 	tmux-select
 
-mode_switch + Return
+super + Return
 	alacritty --config-file ~/.config/alacritty/alacritty--light.toml
 
-mode_switch + shift + Return
+super + shift + Return
 	alacritty
 
 ## screenshots
-mode_switch + Print
+super + Print
 	i3-scrot
 
-mode_switch + shift + Print
+super + shift + Print
 	i3-scrot -d
 
-mode_switch + ctrl + Print
+super + ctrl + Print
 	scrot-grab
 
-mode_switch + e
+super + e
 	dmenu_power
 
-mode_switch + shift + e
+super + shift + e
 	slock
 
-mode_switch + o
+super + o
 	bookmarks /home/ray/.Syncthing/bookmarks/urls.txt
 
-mode_switch + shift o
+super + shift o
 	bookmarks /home/ray/.Syncthing/bookmarks/paths-machineone.txt
 
-mode_switch + ctrl o
+super + ctrl o
 	bspc rule --add Alacritty --one-shot follow=on state=floating rectangle=1200x600+610+1200 && alacritty --config-file ~/.config/alacritty/alacritty--light-small.toml -e nvim /home/ray/.Syncthing/bookmarks/
 
 # KP_Home
diff --git a/sxhkdrc.bspwm b/sxhkdrc.bspwm
index 77ca705..27a6a8b 100644
--- a/sxhkdrc.bspwm
+++ b/sxhkdrc.bspwm
@@ -3,22 +3,22 @@
 #
 
 # quit/restart bspwm
-mode_switch + shift + {q,r}
+super + shift + {q,r}
 	bspc {quit,wm -r}
 
 # close and kill
-mode_switch + BackSpace
+super + BackSpace
 	bspc node -c
 
 # ctrl + KP_Subtract
 # 	bspc node -k
 
 # alternate between the tiled and monocle layout
-mode_switch + m
+super + m
 	bspc desktop -l next
 
 # swap the current node and the biggest node
-# mode_switch + g
+# super + g
 # 	bspc node -s biggest
 
 
@@ -27,18 +27,18 @@ mode_switch + m
 #
 
 # set the window state
-mode_switch + {t,shift + t,shift + f,f}
+super + {t,shift + t,shift + f,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
-mode_switch + s
+super + s
 	bspc node -g sticky
 
 # # set the node flags
-# mode_switch + ctrl + {m,x,y,z}
+# super + ctrl + {m,x,y,z}
 # 	bspc node -g {marked,locked,sticky,private}
 #
 # # send the newest marked node to the newest preselected node
-# mode_switch + y
+# super + y
 # 	bspc node newest.marked.local -n newest.!automatic.local
 
 #
@@ -46,47 +46,47 @@ mode_switch + s
 #
 
 # Focus the next/previous node in the current desktop:
-mode_switch + bracket{left,right}
+super + bracket{left,right}
 	bspc node -f {next,prev}.local
 
 # focus the node in the given direction
-mode_switch + {_,shift + }{h,j,k,l}
+super + {_,shift + }{h,j,k,l}
 	bspc node -{f,s} {west,south,north,east}
 
 focus the parent node
-mode_switch + Prior
+super + Prior
 	bspc node -f @parent
 
 # focus the node for the given path jump
-# mode_switch + {p,b,comma,period}
+# super + {p,b,comma,period}
 # 	bspc node -f @{parent,brother,first,second}
 
 # focus the next/previous node in the current desktop
-# mode_switch + {_,shift + }c
+# super + {_,shift + }c
 # 	bspc node -f {next,prev}.local
 
 focus the next/previous desktop in the current monitor
-mode_switch + ctrl + bracket{left,right}
+super + ctrl + bracket{left,right}
 	bspc desktop -f {prev,next}.local
 
 # focus the last node/desktop
-# mode_switch + grave
+# super + grave
 #   bspc node -f last
-mode_switch + c
+super + c
 	bspc node -f last
 
 # focus the older or newer node in the focus history
-# mode_switch + {o,i}
+# super + {o,i}
 # 	bspc wm -h off; \
 # 	bspc node {older,newer} -f; \
 # 	bspc wm -h on
 
 # window-select script
-mode_switch + space
+super + space
 	window-select
-mode_switch + shift + space
+super + shift + space
 	window-select all
-mode_switch + ctrl + space
+super + ctrl + space
 	window-select monitor
 
 #
@@ -94,23 +94,23 @@ mode_switch + ctrl + space
 #
 
 # preselect the direction
-mode_switch + ctrl + {h,j,k,l}
+super + ctrl + {h,j,k,l}
 	bspc node -p {west,south,north,east}
 
 # preselect the ratio
-mode_switch + ctrl + {1-9}
+super + ctrl + {1-9}
 	bspc node -o 0.{1-9}
 
 # cancel the preselection for the focused node
-# mode_switch + ctrl + space
+# super + ctrl + space
 # 	bspc node -p cancel
 
 # cancel the preselection for the focused desktop
-# mode_switch + ctrl + shift + space
+# super + ctrl + shift + space
 # 	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
 
 # mark and send to preselected
-mode_switch + ctrl + m
+super + ctrl + m
 	bspc node -g marked && bspc node newest.marked.local -n newest.!automatic.local
 
 #
@@ -118,14 +118,14 @@ mode_switch + ctrl + m
 #
 
 # expand a window by moving one of its side outward
-mode_switch + alt + {h,j,k,l}
+super + alt + {h,j,k,l}
 	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
 
 # contract a window by moving one of its side inward
-mode_switch + alt + shift + {h,j,k,l}
+super + alt + shift + {h,j,k,l}
 	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
 
 # move a floating window
-mode_switch + {Left,Down,Up,Right}
+super + {Left,Down,Up,Right}
 	bspc node -v {-20 0,0 20,0 -20,20 0}
 
diff --git a/sxhkdrc.bspwm.machineone b/sxhkdrc.bspwm.machineone
index aeb86d6..ad6d633 100644
--- a/sxhkdrc.bspwm.machineone
+++ b/sxhkdrc.bspwm.machineone
@@ -10,17 +10,17 @@
 KP_Insert
 	bspc desktop -f '0' && bspc desktop -f 'F10'
 
-mode_switch + {_,shift + }{1-9,0}
+super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} '{1-9,0}'
 
-mode_switch + {_,shift + }{minus}
+super + {_,shift + }{minus}
 	bspc {desktop -f,node -d} '{V1}'
 
-mode_switch + {_,shift + }{equal}
+super + {_,shift + }{equal}
 	bspc {desktop -f,node -d} '{V2}'
 
-mode_switch + {_,shift + }{F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12}
+super + {_,shift + }{F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12}
 	bspc {desktop -f,node -d} '{F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12}'
 
-mode_switch + {_,shift + }{x}
+super + {_,shift + }{x}
 	bspc {desktop -f,node -d} '{x}'