diff --git a/autostart/autostart/10_cleanup.sh b/autostart/autostart/10_cleanup.sh
new file mode 100755
index 0000000..8e9bd9a
--- /dev/null
+++ b/autostart/autostart/10_cleanup.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -o nounset
+
+find "$RUNDIR" -type f -name '*.pid' -delete
diff --git a/autostart/autostart/50_browser.sh b/autostart/autostart/50_browser.sh
new file mode 100755
index 0000000..cfe570c
--- /dev/null
+++ b/autostart/autostart/50_browser.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+qutebrowser &
diff --git a/autostart/autostart/50_irc.sh b/autostart/autostart/50_irc.sh
new file mode 100755
index 0000000..64cdcfb
--- /dev/null
+++ b/autostart/autostart/50_irc.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+quasselclient &
diff --git a/autostart/autostart/keyboard.sh b/autostart/autostart/50_keyboard.sh
similarity index 93%
rename from autostart/autostart/keyboard.sh
rename to autostart/autostart/50_keyboard.sh
index ba6289a..3409955 100755
--- a/autostart/autostart/keyboard.sh
+++ b/autostart/autostart/50_keyboard.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 keyboard_layout=de
 keyboard_variant=nodeadkeys
 keyboard_repeat_delay=150
diff --git a/autostart/autostart/50_mail.sh b/autostart/autostart/50_mail.sh
new file mode 100755
index 0000000..033a188
--- /dev/null
+++ b/autostart/autostart/50_mail.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+thunderbird &
diff --git a/autostart/autostart/50_music.sh b/autostart/autostart/50_music.sh
new file mode 100755
index 0000000..1283c84
--- /dev/null
+++ b/autostart/autostart/50_music.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+chromium --app=https://subsonic.app.lab.haktec.de/index.view &
diff --git a/autostart/autostart/network.sh b/autostart/autostart/50_network.sh
similarity index 75%
rename from autostart/autostart/network.sh
rename to autostart/autostart/50_network.sh
index 3e769dc..7b6483b 100755
--- a/autostart/autostart/network.sh
+++ b/autostart/autostart/50_network.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 log "starting network tray application"
 nm-applet & &>> $LOGFILE
diff --git a/autostart/autostart/owncloud.sh b/autostart/autostart/50_owncloud.sh
similarity index 72%
rename from autostart/autostart/owncloud.sh
rename to autostart/autostart/50_owncloud.sh
index c370b5e..4da9523 100755
--- a/autostart/autostart/owncloud.sh
+++ b/autostart/autostart/50_owncloud.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 log "starting owncloud client"
 owncloud & &>> $LOGFILE
diff --git a/autostart/autostart/pasystray.sh b/autostart/autostart/50_pasystray.sh
similarity index 70%
rename from autostart/autostart/pasystray.sh
rename to autostart/autostart/50_pasystray.sh
index 03a343e..29438ff 100755
--- a/autostart/autostart/pasystray.sh
+++ b/autostart/autostart/50_pasystray.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 log "starting pasystray"
 pasystray & &>> $LOGFILE
diff --git a/autostart/autostart/redshift.sh b/autostart/autostart/50_redshift.sh
similarity index 92%
rename from autostart/autostart/redshift.sh
rename to autostart/autostart/50_redshift.sh
index 47aa6f6..a29af55 100755
--- a/autostart/autostart/redshift.sh
+++ b/autostart/autostart/50_redshift.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # redshift settings
 redshift_lat_long="49.5:11"
 redshift_colortemp="6000:3300"
diff --git a/autostart/autostart/screen.sh b/autostart/autostart/50_screen.sh
similarity index 85%
rename from autostart/autostart/screen.sh
rename to autostart/autostart/50_screen.sh
index 0a7580a..b4bf8f1 100755
--- a/autostart/autostart/screen.sh
+++ b/autostart/autostart/50_screen.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 log "execute xautorandr"
 
 xautorandr
diff --git a/autostart/autostart/synclient.sh b/autostart/autostart/50_synclient.sh
similarity index 77%
rename from autostart/autostart/synclient.sh
rename to autostart/autostart/50_synclient.sh
index 61f2a2f..4eaab76 100755
--- a/autostart/autostart/synclient.sh
+++ b/autostart/autostart/50_synclient.sh
@@ -1,6 +1,9 @@
+#!/usr/bin/env bash
+
 log "configuring synclient"
 synclient VertEdgeScroll=0
 synclient VertTwoFingerScroll=1
 synclient MaxSpeed=2.2
 synclient AccelFactor=0.08
 synclient TapButton1=1
+synclient CoastingSpeed=0
diff --git a/autostart/autostart/voip.sh b/autostart/autostart/50_voip.sh
similarity index 51%
rename from autostart/autostart/voip.sh
rename to autostart/autostart/50_voip.sh
index 7bd91e6..6da2f0b 100755
--- a/autostart/autostart/voip.sh
+++ b/autostart/autostart/50_voip.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 mumble &
 teamspeak3 &
diff --git a/autostart/autostart/wallchanger.sh b/autostart/autostart/50_wallchanger.sh
similarity index 94%
rename from autostart/autostart/wallchanger.sh
rename to autostart/autostart/50_wallchanger.sh
index 22c474a..c83ecb1 100755
--- a/autostart/autostart/wallchanger.sh
+++ b/autostart/autostart/50_wallchanger.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 wallpaper_directory="$LIBDIR/wallpaper/current"
 wallchanger_pidfile="$RUNDIR/wallchanger.${XDG_SESSION_ID}.pid"
 wallpaper_logfile="$LOGDIR/wallpaper.log"
diff --git a/autostart/autostart/xbindkeys.sh b/autostart/autostart/50_xbindkeys.sh
similarity index 62%
rename from autostart/autostart/xbindkeys.sh
rename to autostart/autostart/50_xbindkeys.sh
index 663c326..42b4235 100755
--- a/autostart/autostart/xbindkeys.sh
+++ b/autostart/autostart/50_xbindkeys.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 log "starting xbindkeys"
 xbindkeys
diff --git a/autostart/autostart/xresources.sh b/autostart/autostart/50_xresources.sh
similarity index 75%
rename from autostart/autostart/xresources.sh
rename to autostart/autostart/50_xresources.sh
index a7010ed..cd9d844 100755
--- a/autostart/autostart/xresources.sh
+++ b/autostart/autostart/50_xresources.sh
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+
 log "parsing .Xresources"
 xrdb -merge ~/.Xresources &>> $LOGFILE
diff --git a/autostart/autostart/browser.sh b/autostart/autostart/browser.sh
deleted file mode 100755
index 9ef750c..0000000
--- a/autostart/autostart/browser.sh
+++ /dev/null
@@ -1 +0,0 @@
-qutebrowser &
diff --git a/autostart/autostart/irc.sh b/autostart/autostart/irc.sh
deleted file mode 100755
index 1bbdf69..0000000
--- a/autostart/autostart/irc.sh
+++ /dev/null
@@ -1 +0,0 @@
-quasselclient &
diff --git a/autostart/autostart/mail.sh b/autostart/autostart/mail.sh
deleted file mode 100755
index 853b4b4..0000000
--- a/autostart/autostart/mail.sh
+++ /dev/null
@@ -1 +0,0 @@
-evolution &
diff --git a/autostart/autostart/music.sh b/autostart/autostart/music.sh
deleted file mode 100755
index 0d8e062..0000000
--- a/autostart/autostart/music.sh
+++ /dev/null
@@ -1 +0,0 @@
-clementine &