diff --git a/.xinitrc b/.xinitrc
index d7daee8..e125664 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -35,12 +35,14 @@ xautolock -time 30 -locker 'i3lock -b -d -c 000000 -e -f' &
 [ "$(hostname)" == "thurstybook" ] && srandrd ~/.config/srandrd.conf
 
 
-[ "$(hostname)" == "dtarch" ] && {
-	# Set VGA1 to be right of HDMI1
-	xrandr --output HDMI1 --primary --mode 1920x1080 --pos 0x0 --output VGA1 --mode 1680x1050 --pos 1920x0
+if [ "$(hostname)" == "dtarchaio" ]; then
+	# Set HDMI1 to be right of eDP1
+	xrandr --output eDP1 --primary --mode 1920x1080 --pos 0x0 --output HDMI1 --mode 1680x1050 --pos 1920x0
 	# Set the bell to be different from Matt's 
 	xset b 75 750 50
-}
+	# Set Touchscreen to only work on main display
+	xinput --map-to-output 10 eDP1
+fi
 
 # If numlockx is installed, activate it
 [ -s /usr/bin/numlockx ] && numlockx on