diff --git a/files/xorg/dbus-launch.sh b/files/xorg/dbus-launch.sh
index df5de97..4fb06f0 100644
--- a/files/xorg/dbus-launch.sh
+++ b/files/xorg/dbus-launch.sh
@@ -1,3 +1,6 @@
-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-	eval "$(dbus-launch --sh-syntax --exit-with-x11)"
-fi
\ No newline at end of file
+if [ "$DESKTOP_SESSION" = "i3" ]; then
+	if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+		eval "$(dbus-launch --sh-syntax --exit-with-x11)"
+	fi
+fi
+
diff --git a/step3/20-basesystem b/step3/20-basesystem
index 77293e1..1d966a5 100644
--- a/step3/20-basesystem
+++ b/step3/20-basesystem
@@ -12,9 +12,16 @@ vmkdir() {
 }
 
 vinstall() {
-	src=$1; tgt=$3; rights=$2
-	cp -fr "${src}" /"${tgt}"
-	chmod -R "${rights}" /"${tgt}"
+	src="$1"; tgt="$3"; rights="$2"
+	if [ "$4" ]; then
+		cp "${src}" "/${tgt}/${4}"
+		chmod="/${tgt}/${4}"
+	else
+		cp "${src}" "/${tgt}"
+		chmod="/${tgt}"
+
+	fi
+	chmod -R "${rights}" "${chmod}"
 }
 
 vbin() {
@@ -56,7 +63,7 @@ vinstall "${FILESDIR}/nm/unmanaged-tun.conf" 644 etc/NetworkManager/conf.d
 vinstall "${FILESDIR}/nm/30-wg0" 744 etc/NetworkManager/dispatcher.d
 
 vmkdir etc/profile.d
-vinstall "${FILESDIR}/profile/append-path.sh" 644 etc/profile.d
+vinstall "${FILESDIR}/profile/append-path.sh" 644 etc/profile.d zz-append-path.sh
 
 vmkdir usr/share/X11/xorg.conf.d
 vinstall "${FILESDIR}/xorg/10-keyboard.conf" 644 usr/share/X11/xorg.conf.d