diff --git a/.config/x11/xresources b/.Xresources
similarity index 100%
rename from .config/x11/xresources
rename to .Xresources
diff --git a/.config/x11/xinitrc b/.xinitrc
similarity index 73%
rename from .config/x11/xinitrc
rename to .xinitrc
index be2cc06..0148bbc 100755
--- a/.config/x11/xinitrc
+++ b/.xinitrc
@@ -1,16 +1,18 @@
 #!/bin/sh
 
+# shellcheck disable=SC1091
+
+# Startup services and programs
 . "$XDG_DATA_HOME/screenlayout"
 xwallpaper --zoom "$XDG_DATA_HOME/wallpaper"
-xrdb "$XDG_CONFIG_HOME/x11/xresources"
+xrdb "$HOME/.Xresources"
 runsvdir "$SVDIR" &
 
+# Input mappings and options
 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
 setxkbmap -option caps:escape
 xsetroot -cursor_name left_ptr
 
-# export __NV_PRIME_RENDER_OFFLOAD=1
-# export __GLX_VENDOR_LIBRARY_NAME=nvidia
-
+# Desktop session
 exec dbus-launch --sh-syntax --exit-with-session xmonad