diff --git a/i38.sh b/i38.sh
index 2aed90f..4b65d47 100755
--- a/i38.sh
+++ b/i38.sh
@@ -355,18 +355,17 @@ cat << 'EOF' > ~/.xinitrc
 #
 # Executed by startx (run your window manager from here)
 
-[[ -f ~/.Xresources ]] && xrdb -merge -I\$HOME ~/.Xresources
+[ -f "$HOME/.Xresources" ] && xrdb -merge -I"$HOME" "$HOME/.Xresources"
 
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    # shellcheck disable=SC2154
-    [ -x "$f" ] && . "$f"
+  for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
+    [ -r "$f" ] && . "$f"
   done
   unset f
 fi
 
 [ -f /etc/xprofile ] && . /etc/xprofile
-[ -f ~/.xprofile ] && . ~/.xprofile
+[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile"
 EOF
 echo "$sessionCommand" >> ~/.xinitrc
 chmod +x ~/.xinitrc
@@ -379,6 +378,8 @@ exit 0
 fi
 fi
 cat << 'EOF' > ~/.xprofile
+export XDG_CURRENT_DESKTOP=i3
+export XDG_SESSION_DESKTOP=i3
 # Accessibility variables
 export ACCESSIBILITY_ENABLED=1
 export CHROME_FLAGS="--force-renderer-accessibility"