diff --git a/bspwm/autostart b/bspwm/autostart
index fd816a4..6d7c051 100755
--- a/bspwm/autostart
+++ b/bspwm/autostart
@@ -1,6 +1,22 @@
 #!/bin/bash
 
+# Some UI stuff
+nitrogen --restore
+~/.config/scripts/bar.sh &
+
+# Battery observer
+~/.config/scripts/batteryobserver.sh &
+
+# Composition manager
+compton &
+
+# Automounting
+thunder --daemon &
+udsikie -2 -N &
+
+# Autostart programs
+( sleep 3; (
 thunderbird &
 psi-plus &
 urxvt -name "Weechat" -e "weechat" &
-
+) ) &
diff --git a/xprofile b/xprofile
index d6ab4b6..79a15fd 100755
--- a/xprofile
+++ b/xprofile
@@ -2,12 +2,9 @@
 
 export QT_STYLE_OVERRIDE=gtk
 
-# trap "jobs -p | awk '{print \$3}' | xargs kill" SIGHUP SIGINT SIGTERM
-
 xset s noblank
 xset s off
 xset -dpms
-#xss-lock -- ~/.config/scripts/lock.sh &
 
 setxkbmap de -variant nodeadkeys
 
@@ -19,18 +16,3 @@ xsetroot -cursor_name left_ptr &
 #rm -f /tmp/bspwm*
 
 ~/.config/scripts/prepare_monitors.sh
-#feh --bg-scale ~/.config/wallpaper
-nitrogen --restore &
-
-#Autostart
-#thunderbird &
-#psi-plus &
-
-.config/scripts/bar.sh &
-.config/scripts/batteryobserver.sh &
-#conky -c ~/.config/conky/barrc &
-#~/.config/scripts/panel dzen2 &
-#sxhkd -c ~/.config/sxhkd/sxhkdrc &
-xcompmgr &
-thunder --daemon &
-udiskie -2 -N &