diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
new file mode 100755
index 0000000..6ad5ec3
--- /dev/null
+++ b/.config/X11/xinitrc
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile"
+[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile"
+
+exec dbus-launch dwm
diff --git a/.xinitrc b/.config/X11/xprofile
similarity index 58%
rename from .xinitrc
rename to .config/X11/xprofile
index 707ccc9..f210eaf 100755
--- a/.xinitrc
+++ b/.config/X11/xprofile
@@ -1,21 +1,16 @@
 #!/bin/sh
 
 xrandr --dpi 96
+
 # shellcheck disable=SC1091
 . "$XDG_DATA_HOME/screenlayout"
 xwallpaper --zoom "$XDG_DATA_HOME/wallpaper"
-xrdb -merge "$HOME/.Xresources"
+xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
 
 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
 
-pipewire &
-wireplumber &
-pipewire-pulse &
-udiskie &
-dunst &
-picom &
-sxhkd &
-dwmblocks &
-
-exec dbus-launch dwm
+autostart="pipewire wireplumber pipewire-pulse udiskie dunst picom sxhkd dwmblocks"
+for program in $autostart; do
+    "$program" &
+done >/dev/null 2>&1
diff --git a/.Xresources b/.config/X11/xresources
similarity index 100%
rename from .Xresources
rename to .config/X11/xresources
diff --git a/.config/shell/environment b/.config/shell/environment
index 1e2542b..acda8f4 100644
--- a/.config/shell/environment
+++ b/.config/shell/environment
@@ -29,3 +29,4 @@ export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
 export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
+export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"