diff --git a/action-manager b/action-manager
index 8a899f5..211b84f 160000
--- a/action-manager
+++ b/action-manager
@@ -1 +1 @@
-Subproject commit 8a899f53ea8ac4579eafd82b56907c78ba1ea169
+Subproject commit 211b84f16cbb206a959bdc4f5ea88e527bcfcae4
diff --git a/battery-monitor.sh b/battery-monitor.sh
old mode 100644
new mode 100755
index 068ee81..d8b3708
--- a/battery-monitor.sh
+++ b/battery-monitor.sh
@@ -18,6 +18,7 @@ while true; do
         bash -c 'echo "Battery critical, suspending"; acpi -b' | xmessage -nearmouse -file -&
         sleep 5
         systemctl hibernate
+        sleep 600 # Wait 10 minutes, so we only hibernate once
     fi
     sleep 10
 done
diff --git a/bridge-network.sh b/bridge-network.sh
index edcfd44..95d421b 100644
--- a/bridge-network.sh
+++ b/bridge-network.sh
@@ -3,7 +3,6 @@ nmcli radio wifi off
 sleep 1
 rfkill unblock wlan
 sleep 1
-orig_iptables_forward=$(sysctl net.bridge.bridge-nf-call-iptables | tr -d ' ' || echo 'net.bridge.bridge-nf-call-iptables=1')
 sysctl net.bridge.bridge-nf-call-iptables=0
 ip addr flush dev $1
 ip addr flush dev $2
@@ -21,7 +20,6 @@ ip link set down br0
 brctl delbr br0
 ip link set promisc off dev $1
 ip link set promisc off dev $2
-sysctl "$orig_iptables_forward"
 killall dhclient
 nmcli radio wifi on
 nmcli device connect $1
diff --git a/xmonad-session-rc b/xmonad-session-rc
index 5a50fb4..ce0e6f2 100644
--- a/xmonad-session-rc
+++ b/xmonad-session-rc
@@ -12,7 +12,7 @@ trayer --edge bottom --align right --SetDockType true --SetPartialStrut true --e
 xscreensaver -no-splash&
 nm-applet --sm-disable&
 gnome-power-manager&
-~/.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&
+~/.xmonad/action-manager/start.sh ~/.xmonad/actiondisplay ~/.xmonad/actioncontrol --state-file ~/.xmonad/actionstate --redshift-location 51:5 --redshift-temperature 6000:2000&
 
 # Fix for java applications
 export _JAVA_AWT_WM_NONREPARENTING=1
@@ -23,7 +23,7 @@ export OOO_FORCE_DESKTOP=gnome
 # Auto-start applications
 bash ~/.xmonad/battery-monitor.sh&
 gajim&
-keepass2 ~/Documents/passwords.kdbx&
+keepass2 ~/cloud.vbgn.be/passwords.kdbx&
 icedove&
 mate-terminal -e ssh-add ~/.ssh/id_rsa&
 dropbox start&
diff --git a/xmonad.hs b/xmonad.hs
index 6cbdab5..dcff739 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -45,16 +45,16 @@ baseXPConfig = defaultXPConfig {
 
 workspaceManageHook :: ManageHook
 workspaceManageHook = composeAll [
-     className =? "Icedove" --> doShift "2:com"
+     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 =? "MATLAB R2016b - academic use" --> doShift "3:dev"
     ,className =? "qtcreator" --> doShift "3:dev"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "Xmessage" --> doFloat
     ,className =? "Clementine" --> doShift "8:media"
+    ,className =? "vlc" --> doShift "8:media"
     ]
 
 xmobarAction :: String  -- action
@@ -75,7 +75,7 @@ main = do
         , logHook =  dynamicLogWithPP xmobarPP
                         { ppOutput = hPutStrLn xmobar_proc
                         , ppHidden = xmobarSwitchWs
-                        , ppTitle = xmobarColor "green" "" . shorten 80
+                        , ppTitle = xmobarColor "green" "" . shorten 90
                         , ppSort = fmap(.scratchpadFilterOutWorkspace) (ppSort xmobarPP)
                         , ppOrder = \(ws:_:t:_) -> [ ws, t]
                         }
@@ -124,10 +124,8 @@ main = do
         ]
         `additionalKeys`
         --
-        -- mod-ctrl-[1..9], Switch to workspace N
-        --
-        -- mod-ctrl-[1..9], Switch to workspace N
-        -- mod-ctrl-shift-[1..9], Move client to workspace N
+        -- mod-ctrl-[F1..F9], Switch to workspace N
+        -- mod-ctrl-shift-[F1..F9], Move client to workspace N
         --
         [((m .|. modMask baseConfig , k), windows $ f i)
             | (i, k) <- zip (workspaces baseConfig) [xK_F1 .. xK_F9]