diff --git a/applications/XCompose b/applications/xcompose
similarity index 100%
rename from applications/XCompose
rename to applications/xcompose
diff --git a/applications/Xresources b/applications/xresources
similarity index 60%
rename from applications/Xresources
rename to applications/xresources
index 5b94277..160f79c 100644
--- a/applications/Xresources
+++ b/applications/xresources
@@ -1,8 +1,7 @@
 *TkTheme: clam
 *Menu.background: Black
 *Menu.foreground: White
-Oneko.noshape: true
 Oneko.reverse: true
-Emacs.font: Source Code Pro-12
+Emacs.font: -*-Source Code Pro-semibold-r-normal-*-*-120-*-*-m-*-iso10646-1
 Emacs.width: 80
 Emacs.height: 30
diff --git a/system/autostart/00-pre.sh b/system/autostart/00-pre.sh
new file mode 100755
index 0000000..ef867bf
--- /dev/null
+++ b/system/autostart/00-pre.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+xset -dpms
+xrdb -merge ~/rc/applications/xresources
diff --git a/system/autostart/10-mpd.sh b/system/autostart/10-mpd.sh
new file mode 100755
index 0000000..a3b2dce
--- /dev/null
+++ b/system/autostart/10-mpd.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec mpd --no-daemon
diff --git a/system/autostart/20-ibus.sh b/system/autostart/20-ibus.sh
new file mode 100755
index 0000000..8c61879
--- /dev/null
+++ b/system/autostart/20-ibus.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ibus-daemon
diff --git a/system/autostart/90-oneko.sh b/system/autostart/90-oneko.sh
new file mode 100755
index 0000000..e0fc27f
--- /dev/null
+++ b/system/autostart/90-oneko.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec oneko -sakura -tofocus
diff --git a/applications/xprofile b/system/env/00-vars.sh
similarity index 76%
rename from applications/xprofile
rename to system/env/00-vars.sh
index d122a08..c9ebb45 100644
--- a/applications/xprofile
+++ b/system/env/00-vars.sh
@@ -15,10 +15,4 @@ export DOOMWADDIR=/media/store/games/doom/iwads
 export EDITOR=vim
 export WINEPREFIX=$HOME/progs/winepfx
 
-# run user startup jobs
-xrdb -merge ~/rc/applications/Xresources
-ibus-daemon &
-mpd &
-oneko -sakura -tofocus &
-
 ## EOF
diff --git a/system/shutdown/00-logout.sh b/system/shutdown/00-logout.sh
new file mode 100755
index 0000000..50ac5d7
--- /dev/null
+++ b/system/shutdown/00-logout.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+killall mpd
+killall mozc_server
+killall oneko