diff --git a/xmonad-session-rc b/xmonad-session-rc
index d9c56c5..8f0f86b 100644
--- a/xmonad-session-rc
+++ b/xmonad-session-rc
@@ -1,5 +1,4 @@
 #!/bin/bash
-export PATH=~/.config/composer/vendor/bin:~/bin:"$PATH"
 xrdb -merge .Xresources
 
 # Touchpad
@@ -11,8 +10,7 @@ eval $(ssh-agent)
 trayer --edge bottom --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x000000 --alpha 0 --height 16 --monitor primary&
 xscreensaver -no-splash&
 nm-applet --sm-disable&
-gnome-power-manager&
-~/.xmonad/action-manager/start.sh ~/.xmonad/actiondisplay ~/.xmonad/actioncontrol --state-file ~/.xmonad/actionstate --redshift-location 51:5 --redshift-temperature 6000:2000&
+~/.xmonad/action-manager/start.sh ~/.xmonad/actiondisplay ~/.xmonad/actioncontrol --state-file ~/.xmonad/actionstate --volume-enabled --redshift-enabled --redshift-location 51:5 --redshift-temperature 6000:2000 --caffeine-enabled&
 
 # Fix for java applications
 export _JAVA_AWT_WM_NONREPARENTING=1
@@ -23,8 +21,8 @@ export OOO_FORCE_DESKTOP=gnome
 # Auto-start applications
 bash ~/.xmonad/battery-monitor.sh&
 gajim&
-keepass2 ~/cloud.vbgn.be/passwords.kdbx&
-icedove&
+keepass2 ~/Documents/passwords.kdbx&
+thunderbird&
 mate-terminal -e ssh-add ~/.ssh/id_rsa&
 dropbox start&
 nextcloud&
diff --git a/xmonad.hs b/xmonad.hs
index dcff739..8f80d96 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -45,11 +45,13 @@ baseXPConfig = defaultXPConfig {
 
 workspaceManageHook :: ManageHook
 workspaceManageHook = composeAll [
-     className =? "Thunderbird" --> doShift "2:com"
+     className =? "Firefox" --> doShift "1:web"
+    ,className =? "Thunderbird" --> doShift "2:com"
     ,className =? "Gajim" --> doShift "2:com"
     ,className =? "jetbrains-phpstorm" --> doShift "3:dev"
     ,className =? "jetbrains-pycharm" --> doShift "3:dev"
     ,className =? "jetbrains-clion" --> doShift "3:dev"
+    ,className =? "code" --> doShift "3:dev"
     ,className =? "qtcreator" --> doShift "3:dev"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "Xmessage" --> doFloat