diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 5503a6b..11f9a9a 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,15 +1,15 @@
 #!/bin/sh
 
-sxhkd &
-
 host_name=$(cat /proc/sys/kernel/hostname)
 if [[ $host_name == "portalo" ]]; then
-    bspc monitor HDMI-1 -d web terminal 3 4 5 6 game
-    bspc monitor DVI-D-1 -d side-view voip messenger
+    bspc monitor HDMI-1 -n primary
+    bspc monitor DVI-D-1 -n secondary
+
+    bspc monitor primary -d web terminal 3 4 5 6 game
+    bspc monitor secondary -d side-view voip messenger
+
+    bspc wm -O primary secondary
 
-    bspc desktop ^7 --layout monocle
-    #bspc desktop ^9 --layout monocle
-    bspc desktop ^10 --layout monocle
 elif [[ $host_name == *"laptop"* ]]; then
     bspc monitor eDP-1 -d web terminal 3 4 5 6 7 8 9 10
 else
@@ -17,6 +17,7 @@ else
 fi
 
 bspc desktop web --layout monocle
+bspc desktop game --layout monocle
 
 bspc config border_width         1
 bspc config window_gap           10
@@ -38,6 +39,8 @@ bspc rule -a 'firefox:Toolkit' follow='true' desktop='side-view' state='fullscre
 bspc rule -a 'vlc' follow='true' desktop='side-view' state='fullscreen'
 bspc rule -a 'MPlayer' follow='true' desktop='side-view' state='fullscreen'
 bspc rule -a 'mpv:gl' follow='true' desktop='side-view' state='fullscreen'
+bspc rule -a 'FreeTube' follow='true' desktop='side-view'
+
 
 bspc rule -a 'TeamSpeak 3' desktop='voip' locked='true'
 bspc rule -a 'Alacritty:mail' desktop='voip' locked='true'
@@ -53,4 +56,3 @@ bspc rule -a 'sticky-note:sticky-note' state='floating' sticky='on' border='off'
 bspc rule -a 'Xarchiver' state='floating'
 
 $HOME/.config/polybar/launch.sh &
-$HOME/.config/bspwm/swallow.py &
diff --git a/.xprofile b/.xprofile
index ae001a8..04e7ccd 100644
--- a/.xprofile
+++ b/.xprofile
@@ -1,4 +1,3 @@
-[ -f "$HOME/.config/user-dirs.dirs" ] && source $HOME/.config/user-dirs.dirs
 source $HOME/.config/environment
 
 xcompmgr -n -f -D3 &
@@ -16,11 +15,17 @@ fi
 
 _autostart_on_launch()
 {
+    xrandr --output DVI-D-1 --left-of HDMI-1
+    xrandr --output HDMI-1 --mode 2560x1440 --refresh 144
+
     dunst &
     ckb-next --background &
     parcellite &
     solaar --window hide &
-    xrandr --output HDMI-1 --mode 2560x1440 --refresh 144
+
+    sxhkd &
+    $HOME/.config/bspwm/swallow.py &
+    $HOME/.config/bspwm/focus-voip.py &
 
     conky --daemonize --config="$HOME/.config/conky/clock.conf"
     conky --daemonize --config="$HOME/.config/conky/cpu_ram_storage.conf"
@@ -44,9 +49,6 @@ _autostart_on_launch()
     alacritty --class "mail" --command sh -c "neomutt" &
     sleep 1
     element-desktop &
-    sleep 1
-    bspc node "@voip:/first" -f
-    xdg-open "steam://open/friends/"
 
     mopidy &
 }