diff --git a/.xinitrc b/.xinitrc
index 2218ecb..e6646c9 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -2,18 +2,18 @@
 
 xrdb -merge ~/.Xresources
 
-# start some programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
+# Run all system xinitrc shell scripts
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
 fi
 
-setxkbmap -option caps:none
-xset r rate 200 16
-xbindkeys &
-
-xrandr --dpi 96
+./.profile
+./.xsession
 
 exec i3
diff --git a/.xsession b/.xsession
new file mode 100755
index 0000000..bf828d9
--- /dev/null
+++ b/.xsession
@@ -0,0 +1,3 @@
+setxkbmap -option caps:none
+xset r rate 200 18
+xrandr --dpi 96