diff --git a/.includes/gui.sh b/.includes/gui.sh
index d951d6b..2037cdd 100755
--- a/.includes/gui.sh
+++ b/.includes/gui.sh
@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
+# be sure there is no Xorg interference
+yay -Runcds --noconfirm libx11
+
 packages="$1"
 packages="${packages//lxqt/lxqt lxterminal oxygen-icons ratpoison network-manager-applet}"
 packages="${packages//mate/mate mate-extra network-manager-applet}"
@@ -16,15 +19,8 @@ esac
 
 ./.includes/toggle-screen.sh -n
 
-# Install X11Libre
-if ! install_xlibre; then
-    msgbox "X11Libre installation failed. Installation aborted."
-    return 1
-fi
-
-# X11Libre installed successfully, install remaining packages
-# Note: nodm-dgw is now available from StormUX repository (added by install_xlibre)
-install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-xinit
+# Install X11Libre and GUI packages
+install_package ${packages} brave-bin nodm-dgw orca speech-dispatcher xclip xlibre-server xlibre-input-libinput xlibre-video-fbdev xlibre-video-dummy-with-vt
 
 # GUI bluetooth manager
 if [[ "${architecture}" == "aarch64" ]]; then
@@ -69,7 +65,7 @@ if [[ "$1" == "i3" ]]; then
 gitDir="$(mktemp -d)"
 echo "Loading I38, please wait..."
 git clone -q https://git.stormux.org/storm/I38 "$gitDir"
-cd "$gitDir"
+cd "$gitDir" || return
 # Play a sound to let the user know the next part is interactive.
 attention
 ./i38.sh -x
diff --git a/configure-stormux.sh b/configure-stormux.sh
index 3aa4b07..4e39313 100755
--- a/configure-stormux.sh
+++ b/configure-stormux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Configure Stormux
 # A script to configure the system for new users.
 #
@@ -73,7 +73,7 @@ fi
 while [[ "$choice" != "Exit" ]]; do
     case "$choice" in
         "Change username")
-            ./.includes/chuser.sh $(inputbox "Please enter the new username, letters, dashes, and underscores only.")
+            ./.includes/chuser.sh "$(inputbox "Please enter the new username, letters, dashes, and underscores only.")"
             restart
         ;;
         "Configure Fenrir")
@@ -121,6 +121,9 @@ while [[ "$choice" != "Exit" ]]; do
         "Convert to Server")
             source .includes/convert-to-server.sh
         ;;
+        "Configure StormUX Repository")
+            add_stormux_repo
+        ;;
     esac
     options=(
         "Change username"
@@ -145,6 +148,7 @@ while [[ "$choice" != "Exit" ]]; do
         "Get help on IRC"
         "Update configure-stormux"
         "Convert to Server"
+        "Configure StormUX Repository"
     )
     choice="$(menulist "${options[@]}")" || break
 done