diff --git a/config/bspwm/bspwmrc_desktop b/config/bspwm/bspwmrc_desktop
index cb1919d..cbbf753 100755
--- a/config/bspwm/bspwmrc_desktop
+++ b/config/bspwm/bspwmrc_desktop
@@ -33,8 +33,17 @@ bspc config gapless_monocle      true
 bspc config focused_border_color \#444444
 bspc config normal_border_color \#080808
 
-bspc monitor DisplayPort-0 -d 4 5 6 7 8
-bspc monitor DisplayPort-1 -d 1 2 3
-bspc monitor HDMI-A-0 -d 9  0
-
+bspc monitor DisplayPort-1 -d 1 2 3 4 5 6ﱮ 7 8 9 0
+bspc monitor DisplayPort-0 -d 1 2 3 4 5ﱮ 6 7 8 9 0
+bspc monitor HDMI-A-0 -d 1ﭮ 2 3ﱮ 4 5 6 7 8 9 0
+# 
+# 
+# 
+# 
+# 
+# ﱮ
+# ﭮ
+# 
+# 
+# 
 bspc rule -a Zathura state=tiled
diff --git a/config/polybar/desktop_config b/config/polybar/desktop_config
index cee7bcc..5f02341 100644
--- a/config/polybar/desktop_config
+++ b/config/polybar/desktop_config
@@ -217,31 +217,19 @@ label-unmounted-foreground = ${colors.foreground-alt}
 [module/bspwm]
 type = internal/bspwm
 
-ws-icon-0 = "1;"
-ws-icon-1 = "2;"
-ws-icon-2 = "3;"
-ws-icon-3 = "4;"
-ws-icon-4 = "5;"
-ws-icon-5 = "6;"
-ws-icon-6 = "7;"
-ws-icon-7 = "8;ﱮ"
-ws-icon-8 = "9;ﭮ"
-ws-icon-9 = "0;"
-ws-icon-default = ""
-
-label-focused = %name%:%icon%
+label-focused = %name%
 label-focused-background = ${colors.background-alt}
 label-focused-underline= ${colors.primary}
 label-focused-padding = 1
 
-label-occupied = %name%:%icon%
+label-occupied = %name%
 label-occupied-padding = 1
 
-label-urgent = %name%:%icon%!
+label-urgent = %name%!
 label-urgent-background = ${colors.alert}
 label-urgent-padding = 1
 
-label-empty = %name%:%icon%
+label-empty = %name%
 label-empty-foreground = ${colors.foreground-alt}
 label-empty-padding = 1
 
diff --git a/config/sxhkd/sxhkdrc_desktop b/config/sxhkd/sxhkdrc_desktop
new file mode 100644
index 0000000..49c1c56
--- /dev/null
+++ b/config/sxhkd/sxhkdrc_desktop
@@ -0,0 +1,139 @@
+#
+# wm independent hotkeys
+#
+
+# terminal emulator
+super + Return
+    alacritty
+
+# program launcher
+super + d
+    rofi -show run -font "Monospace Bold 12" -m -1 -fullscreen -padding 300 -hide-scrollbar
+
+# make sxhkd reload its configuration files:
+super + Escape
+    pkill -USR1 -x sxhkd
+
+#
+# bspwm hotkeys
+#
+
+# quit/restart bspwm
+super + alt + {q,r}
+    bspc {quit,wm -r}
+
+# close and kill
+super + {_,shift + }w
+    bspc node -{c,k}
+
+# alternate between the tiled and monocle layout
+super + m
+    bspc desktop -l next
+
+# send the newest marked node to the newest preselected node
+super + y
+    bspc node newest.marked.local -n newest.!automatic.local
+
+# swap the current node and the biggest window
+super + g
+    bspc node -s biggest.window
+
+#
+# state/flags
+#
+
+# set the window state
+super + {t,shift + t,s,f}
+    bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+
+# set the node flags
+super + ctrl + {m,x,y,z}
+    bspc node -g {marked,locked,sticky,private}
+
+#
+# focus/swap
+#
+
+# focus the node in the given direction
+super + {_,shift + }{h,j,k,l}
+    bspc node -{f,s} {west,south,north,east}
+
+# focus the node for the given path jump
+super + {p,b,comma,period}
+    bspc node -f @{parent,brother,first,second}
+
+# focus the next/previous window in the current desktop
+super + {_,shift + }c
+    bspc node -f {next,prev}.local.!hidden.window
+
+# focus the next/previous desktop in the current monitor
+super + bracket{left,right}
+    bspc desktop -f {prev,next}.local
+
+# focus the last node/desktop
+super + {grave,Tab}
+    bspc {node,desktop} -f last
+
+# focus the older or newer node in the focus history
+super + {o,i}
+    bspc wm -h off; \
+    bspc node {older,newer} -f; \
+    bspc wm -h on
+
+# focus or send to the given desktop
+super + {_,shift + } {1,2,3} ; {1-9,0}
+    bspc {desktop -f,node -d} '^{1,2,3}:^{1-9,10}'
+
+#
+# preselect
+#
+
+# preselect the direction
+super + ctrl + {h,j,k,l}
+    bspc node -p {west,south,north,east}
+
+# preselect the ratio
+super + ctrl + {1-9}
+    bspc node -o 0.{1-9}
+
+# cancel the preselection for the focused node
+super + ctrl + space
+    bspc node -p cancel
+
+# cancel the preselection for the focused desktop
+super + ctrl + shift + space
+    bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
+
+#
+# move/resize
+#
+
+# expand a window by moving one of its side outward
+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
+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
+super + {Left,Down,Up,Right}
+    bspc node -v {-20 0,0 20,0 -20,20 0}
+
+# Multimedia
+XF86Audio{Raise,Lower}Volume
+    amixer sset Master {5%+,5%-}
+XF86AudioMute
+    amixer sset Master toggle
+
+# Tabbed
+super + t; {h,j,k,l}
+    tabc add {west,south,north,east} $(bspc query -N -n focused)
+super + t; r
+    tabbed=$(bspc query -N -n focused)
+    child=$(tabc list $tabbed | head -n1)
+    tabc remove $child
+
+# xbacklight has to be installed
+XF86MonBrightness{Up,Down}
+        adjust_brightness.py {10,-10}
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc_laptop
similarity index 99%
rename from config/sxhkd/sxhkdrc
rename to config/sxhkd/sxhkdrc_laptop
index c548297..e1cd4c6 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc_laptop
@@ -81,7 +81,7 @@ super + {o,i}
     bspc wm -h on
 
 # focus or send to the given desktop
-super + {_,shift + }{1-9,0}
+super + {_,shift + } {1-9,0}
     bspc {desktop -f,node -d} '^{1-9,10}'
 
 #
diff --git a/config/zsh/plugins/zsh-syntax-highlighting b/config/zsh/plugins/zsh-syntax-highlighting
index 62c5575..e7d3fbc 160000
--- a/config/zsh/plugins/zsh-syntax-highlighting
+++ b/config/zsh/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 62c5575848f1f0a96161243d18497c247c9f52df
+Subproject commit e7d3fbc50b0209cb9f9b0812fd40298be03c7808