diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 1f1fd6a..2ca4a8c 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -28,7 +28,7 @@ super + shift + q
 
 # Tabbing through current windows
 super + Tab
-    bspc window -f next
+    bspc node -f next.local
 
 # Open Terminal
 super + alt + Return
@@ -47,15 +47,15 @@ super + e
 
 # {Focus,Move} windows around
 super + {_,shift +} {Left,Right,Up,Down}
-    bspc window -{f,s} {left,right,up,down}
+    bspc node -{f,s} {left,right,up,down}
 
 #Create preselection
 super + ctrl + {Left,Right,Up,Down}
-    bspc window -p {left,right,up,down}
+    bspc node -p {left,right,up,down}
 
 #Insert into latest preselection
 super + ctrl + i
-    bspc window -w last.!automatic
+    bspc node -w last.!automatic
 
 #Flip Desktop
 super + ctrl + {h,v}
@@ -63,7 +63,7 @@ super + ctrl + {h,v}
 
 #dmenu2
 super + space
-    ~/.config/scripts/dmenu_run.sh
+    ~/.config/scripts/debmenu.sh
 
 #menu
 super + alt + space
@@ -75,15 +75,15 @@ super + ctrl + Escape
 
 # Resize push
 super + alt + {Left,Down,Up,Right}
-    bspc window -e {left -10, down +10, up -10, right +10}
+    bspc node -e {left -10, down +10, up -10, right +10}
 
 # Resize pull
 super + ctrl + alt + {Left,Down,Up,Right}
-    bspc window -e {right -10, up +10, down -10, left +10}
+    bspc node -e {right -10, up +10, down -10, left +10}
 
 # Close Window
 super + q
-    bspc window -c
+    bspc node -c
 
 # Rotate Desktop
 super + shift + r
@@ -92,26 +92,26 @@ super + shift + r
 # Maximize and float
 super + {m,f}
     state={fullscreen,floating}; \
-    bspc query -W -w "focused.$\{state\}" && state=tiled; \
-    bspc window -t "$state"
+    bspc query -N -n "focused.$\{state\}" && state=tiled; \
+    bspc node -t "$state"
 
 # Direct access and move windows to desktop
 super + {_,shift +}{1-9}
-    bspc {desktop -f,window -d} $(bspc query -M -m):^{1-9}
+    bspc {desktop -f,node -d} $(bspc query -M -m):^{1-9}
 
 # move windows
-super + button{1,3}
-    bspc pointer -g {move,resize_corner}
-
-super + !button{1,3}
-    bspc pointer -t %i %i
-
-super + @button{1,3}
-    bspc pointer -u
+#super + button{1,3}
+#    bspc pointer -g {move,resize_corner}
+#
+#super + !button{1,3}
+#    bspc pointer -t %i %i
+#
+#super + @button{1,3}
+#    bspc pointer -u
 
 # toggle visibility
 super + d
-    bspc control --toggle-visibility
+    ~/.config/scripts/toggle-hidden.sh
 
 # monitor switch
 XF86Display
@@ -128,3 +128,6 @@ XF86AudioPrev
 
 ctrl + alt + Delete
     notify-send "Don't panic" "Everything will be alright"
+
+super + Escape
+    ~/.config/scripts/short_clock.sh