diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 58556e7..b86c401 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,8 +1,12 @@
 #!/bin/sh
 
 # MONITORS #
-
-bspc monitor -d 1 2 3 4 5 6 7 8 9
+if [ $(uname -n) == 'arch-desktop']; then
+	bspc monitor HDMI-0 -d 6 7 8 9 0
+	bspc monitor HDMI-1 -d 1 2 3 4 5
+else
+	bspc monitor -d 1 2 3 4 5 6 7 8 9
+fi
 
 # CONFIGURATION #
 
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index d1ad869..469f054 100755
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -89,8 +89,8 @@ super + {o,i}
 	bspc wm -h on
 
 # focus or send to the given desktop
-alt + {_,shift + }{1-9}
-	bspc {desktop -f,node -d} '{1-9}'
+alt + {_,shift + }{1-9,0}
+	bspc {desktop -f,node -d} '{1-9,10}'
 
 #
 # preselect
diff --git a/.xinitrc b/.xinitrc
index 6e0507e..4a3ffd2 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -35,8 +35,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     done
     unset f
 fi
+
 # Automatic brightness controll
-clight &
+[[ $(uname -n) == "arch-laptop" ]] && clight &
 
 # Set cursor
 xsetroot -cursor_name left_ptr