diff --git a/.xinitrc b/.xinitrc
index c64990e..5305d1b 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,14 +1,14 @@
 # -*- mode: shell-script -*-
 
-habak -mp 0,0 ~/pictures/wallpapers/1680x1050 \
-    -mp -0,0 ~/pictures/wallpapers/1280x1024
+# -----[ Set background ]---------------------------------------------
+xsetroot -solid black
+
+# -----[ Modify keys ]------------------------------------------------
 xmodmap ~/.Xmodmap
+
+# -----[ Start some programs ]----------------------------------------
 conky
 numlockx &
-while :; do
-    xsetroot -name "`~/.rootname.scm`"
-    sleep 1m
-done &
 
 # mpdscribble
 pidof mpdscribble >& /dev/null
@@ -17,4 +17,11 @@ then
     mpdscribble &
 fi
 
-exec ~/development/projects/dwm/dwm
+# -----[ Repeatedly set rootname ]------------------------------------
+while :; do
+    xsetroot -name "`~/.rootname.scm`"
+    sleep 1m
+done &
+
+# -----[ Start session ]----------------------------------------------
+exec ck-launch-session ~/development/projects/dwm/dwm