diff --git a/xinitrc b/xinitrc
index 54cb151..77dd7f8 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,8 +1,44 @@
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-tresorit --hidden &
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice 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
+fi
+
 redshift &
-start-pulseaudio-x11 &
-google-musicmanager &
 unclutter -noevents &
 setxkbmap -layout us -option ctrl:nocaps &
-exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start
+tresorit --hidden &
+google-musicmanager &
+exec $HOME/bin/dwm-start