diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index 5015f41..c355619 100644
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -11,9 +11,16 @@ if [ -d "$xinitdir" ]; then
     done
 fi
 
-source ~/.profile
-source $XDG_CONFIG_HOME/X11/xsession
+source $HOME/.profile
+
 xrdb -merge $XDG_CONFIG_HOME/X11/xresources
-~/.local/share/surfacetools/rotationd --once
+xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
+xrandr --output eDP1 --primary
+
+setxkbmap -option caps:none
+xset r rate 200 18
+
+~/.local/share/surface-scripts/pend &
+~/.local/share/surface-scripts/rotationd &
 
 exec i3
diff --git a/.config/X11/xsession b/.config/X11/xsession
deleted file mode 100755
index eab4b15..0000000
--- a/.config/X11/xsession
+++ /dev/null
@@ -1,7 +0,0 @@
-setxkbmap -option caps:none
-xset r rate 200 18
-xrandr --dpi 136
-xrandr --output eDP1 --primary
-
-~/.local/share/surface-scripts/pend &
-~/.local/share/surface-scripts/rotationd &
diff --git a/.profile b/.profile
index da3491c..27023e4 100644
--- a/.profile
+++ b/.profile
@@ -29,7 +29,6 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 # Configure X11 config file paths
 export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
 export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-export XSESSION="$XDG_CONFIG_HOME/X11/xsession"
 
 export MANPAGER="less -+N"
 export TERMINAL="termite"
diff --git a/aliases b/aliases
index 28a310e..e994393 100644
--- a/aliases
+++ b/aliases
@@ -258,8 +258,7 @@ alias vimrc="$EDITOR $VIMRC"
 alias zshrc="$EDITOR ${ZDOTDIR:-$HOME}/.zshrc ; exec zsh"
 alias gitrc="$EDITOR $XDG_CONFIG_HOME/git/config"
 alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
-alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/Xresources"
-alias xsession="$EDITOR $XDG_CONFIG_HOME/X11/xsession"
+alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
 alias sshc="$EDITOR ~/.ssh/config"
 alias dotfiles="cd $DOTFILES"
 alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart"