diff --git a/.config/X11/xprofile b/.config/X11/profile
similarity index 100%
rename from .config/X11/xprofile
rename to .config/X11/profile
diff --git a/.config/X11/Xresources b/.config/X11/resources
similarity index 100%
rename from .config/X11/Xresources
rename to .config/X11/resources
diff --git a/.config/X11/xserverrc b/.config/X11/serverrc
similarity index 100%
rename from .config/X11/xserverrc
rename to .config/X11/serverrc
diff --git a/.config/X11/session b/.config/X11/session
new file mode 100644
index 0000000..ed56ac5
--- /dev/null
+++ b/.config/X11/session
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+resources=${XDG_CONFIG_HOME}/X11/resources
+if [ -f "$resources" ]; then xrdb -merge "$resources"; fi
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+	for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+		[ -x "$f" ] && source "$f"
+	done; unset f
+fi
+
+source ${XDG_CONFIG_HOME}/X11/profile
+
+if [[ -n "$@" ]]; then
+	exec "$@"
+fi
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
deleted file mode 100644
index a8145a8..0000000
--- a/.config/X11/xinitrc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# ==== DO NOT edit this section ====
-userresources=${XDG_CONFIG_HOME}/X11/Xresources
-usermodmap=${XDG_CONFIG_HOME}/X11/Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-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
-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
-# ==================================
-
-source ${XDG_CONFIG_HOME}/X11/xprofile
-
-# alternative program
-if [[ -n "$@" ]]; then
-	exec "$@"
-fi
-
-exec qtile
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index d7de27c..42f2280 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,4 +1,4 @@
 # Autostart X
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	xinit
+	xinit qtile
 fi
diff --git a/.pam_environment b/.pam_environment
index c4d9faf..c64da03 100644
--- a/.pam_environment
+++ b/.pam_environment
@@ -33,8 +33,8 @@ ANTIBODY_HOME	DEFAULT=${XDG_DATA_HOME}/antibody
 XAUTHORITY	DEFAULT=${XDG_RUNTIME_DIR}/Xauthority
 
 # xinit
-XINITRC		DEFAULT=${XDG_CONFIG_HOME}/X11/xinitrc
-XSERVERRC	DEFAULT=${XDG_CONFIG_HOME}/X11/xserverrc
+XINITRC		DEFAULT=${XDG_CONFIG_HOME}/X11/session
+XSERVERRC	DEFAULT=${XDG_CONFIG_HOME}/X11/serverrc
 
 # less
 LESSKEY		DEFAULT=${XDG_CONFIG_HOME}/less/lesskey