diff --git a/Xresources b/Xresources
deleted file mode 120000
index 1f98a4f..0000000
--- a/Xresources
+++ /dev/null
@@ -1 +0,0 @@
-.cache/wal/colors.Xresources
\ No newline at end of file
diff --git a/Xresources b/Xresources
new file mode 100644
index 0000000..099abbb
--- /dev/null
+++ b/Xresources
@@ -0,0 +1,2 @@
+#include ".cache/wal/colors.Xresources"
+#include ".Xresources.local"
diff --git a/_xinitrc/xinitrc.all b/_xinitrc/xinitrc.all
new file mode 100755
index 0000000..2c6b32d
--- /dev/null
+++ b/_xinitrc/xinitrc.all
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if_have() {
+	command -v $1 2>&1> /dev/null
+}
+
+if_have setxkbmap && { setxkbmap -option caps:swapescape & }
+if_have compton && { compton & }
+if_have wal && { wal -t -q -i ~/wallpaper & }
+if_have lxsession && { lxsession -s i3 & }
+if_have pnmixer && { pnmixer & }
+if_have dropbox && { dropbox & }
+if_have syncthing-gtk && { syncthing-gtk & }
diff --git a/_xinitrc/xinitrc.loki b/_xinitrc/xinitrc.loki
new file mode 100755
index 0000000..e866e1b
--- /dev/null
+++ b/_xinitrc/xinitrc.loki
@@ -0,0 +1,5 @@
+#!/bin/sh
+compton &
+wal -t -q -i ~/wallpaper &
+lxsession -s i3 &
+syncthing-gtk -m &
diff --git a/_xinitrc/xinitrc.vaettr b/_xinitrc/xinitrc.vaettr
new file mode 100755
index 0000000..b3f720c
--- /dev/null
+++ b/_xinitrc/xinitrc.vaettr
@@ -0,0 +1,5 @@
+#!/bin/sh
+# compton &
+# wal -t -q -i ~/wallpaper &
+# lxsession -s i3 &
+# syncthing-gtk -m &
diff --git a/xinitrc b/xinitrc
index dc00630..fbd393e 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,29 @@
-cd $
-setxkbmap -option caps:swapescape &
+#!/bin/sh
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for f in /etc/X11/xinit/xinitrc.d/*; do
+		[ -x "$f" ] && . "$f"
+	done
+	unset f
+fi
+
+# Merge .Xresources
+[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
+
+# export ssh-user-agent variables
+eval $(systemctl --user show-environment | grep SSH_AUTH_SOCK)
+export SSH_AUTH_SOCK
+
+# setxkbmap -option caps:swapescape &
+
+# Per-host init
+filepath=$(dirname $(readlink -f $0))
+for f in "all" "$(hostname)"; do
+	f="${filepath}/_xinitrc/xinitrc.$f"
+	echo $f
+	[ -e "$f" ] && . "$f"
+done
+unset filepath
+
+# Launch i3!
 exec i3