diff --git a/bin/xsettingsd-setup b/bin/xsettingsd-setup
index 1ee785b..1a3ab32 100755
--- a/bin/xsettingsd-setup
+++ b/bin/xsettingsd-setup
@@ -16,7 +16,12 @@ esac
 
 # Build xsettingsd.local
 cp  ~/.config/awesome/xsettingsd ~/.config/awesome/xsettingsd.local
-echo Xft/DPI $(( $dpi * 1024 )) >> ~/.config/awesome/xsettingsd.local
+echo Xft/DPI $(( $dpi*1024 )) >> ~/.config/awesome/xsettingsd.local
+
+if [ $(( $dpi/96 )) -ge 2 ]; then
+    echo Gdk/WindowScalingFactor $(( $dpi/96 )) >> ~/.config/awesome/xsettingsd.local
+    echo Gdk/UnscaledDPI $(( 96*1024 )) >> ~/.config/awesome/xsettingsd.local
+fi
 
 # Signal xsettingsd
 pid=$(xprop -name xsettingsd _NET_WM_PID 2> /dev/null | awk '{print $NF}')
diff --git a/xsession b/xsession
index f7cfd12..ba29773 100644
--- a/xsession
+++ b/xsession
@@ -37,8 +37,6 @@ systemctl --user import-environment
 case "$(hostname)" in
     neo)
         xrandr --output HDMI-0 --auto --output DP-0 --auto --right-of HDMI-0 --dpi 192
-        export GDK_SCALE=2
-        export GDK_DPI_SCALE=0.5
         ;;
     zoro)
         xrandr --output eDP1 --auto --dpi 144