diff --git a/.xinitrc b/.config/X11/xinitrc
similarity index 71%
rename from .xinitrc
rename to .config/X11/xinitrc
index 310d8c4..b2fc615 100755
--- a/.xinitrc
+++ b/.config/X11/xinitrc
@@ -4,12 +4,17 @@
 
 [ -f "$XDG_DATA_HOME/screenlayout" ] && . "$XDG_DATA_HOME/screenlayout"
 [ -f "$XDG_DATA_HOME/wallpaper" ] && xwallpaper --zoom "$XDG_DATA_HOME/wallpaper"
-xrdb "$HOME/.Xresources"
+xrdb "$XDG_CONFIG_HOME/X11/xinitrc"
 runsvdir "$SVDIR" &
 
 xinput set-prop "SOAI USB Gaming Mouse" "libinput Accel Profile Enabled" 0 1 0
-xinput set-prop "SOAI USB Gaming Mouse" "libinput Accel Speed" 0.2
+xinput set-prop "SOAI USB Gaming Mouse" "libinput Accel Speed" 0.1
 setxkbmap -option caps:escape
 xsetroot -cursor_name left_ptr
 
-exec dbus-launch --sh-syntax --exit-with-session xmonad
+modbot -x &
+while :; do
+    dbus-launch --exit-with-session dwm || exit 1
+done
+
+# exec dbus-launch --exit-with-session startxfce4
diff --git a/.Xresources b/.config/X11/xresources
similarity index 50%
rename from .Xresources
rename to .config/X11/xresources
index ffdca06..9e4f88d 100644
--- a/.Xresources
+++ b/.config/X11/xresources
@@ -1,5 +1,5 @@
 !! st
-st.font: DejaVu Sans Mono:size=9
+st.font: Fira Mono:size=9
 st.background: #121212
 st.foreground: #ebdbb2
 st.cursorColor: #ebdbb2
@@ -19,23 +19,33 @@ st.color12: #83a598
 st.color13: #d3869b
 st.color14: #8ec07c
 st.color15: #ebdbb2
-st.alpha: 0.97
+st.alpha: 0.95
+st.borderpx: 4
+
+!! dwm
+dwm.font: Terminus:size=10
+dwm.normbgcolor: #121212
+dwm.normbordercolor: #282828
+dwm.normfgcolor: #a89984
+dwm.selbgcolor: #458588
+dwm.selbordercolor: #83a598
+dwm.selfgcolor: #ebdbb2
 
 !! dmenu
-dmenu.font: Terminus:size=12
+dmenu.font: Terminus:size=10
 dmenu.normbgcolor: #121212
-dmenu.normfgcolor: #cccccc
-dmenu.selbgcolor: #83a598
-dmenu.selfgcolor: #282828
-dmenu.normhifgcolor: #fb4934
+dmenu.normfgcolor: #a89984
+dmenu.selbgcolor: #458588
+dmenu.selfgcolor: #ebdbb2
+dmenu.normhifgcolor: #cc241d
 dmenu.normhibgcolor: #121212
-dmenu.selhifgcolor: #282828
-dmenu.selhibgcolor: #fb4934
+dmenu.selhifgcolor: #ebdbb2
+dmenu.selhibgcolor: #cc241d
 
 !! nsxiv
 Nsxiv.bar.font: Terminus:size=8
 Nsxiv.window.background: #121212
-Nsxiv.window.foreground: #bbbbbb
-Nsxiv.mark.foreground: #aaaaaa
-Nsxiv.bar.background: #999999
-Nsxiv.bar.foreground: #000000
+Nsxiv.window.foreground: #a89984
+Nsxiv.mark.foreground: #a89984
+Nsxiv.bar.background: #a89984
+Nsxiv.bar.foreground: #1d2021