diff --git a/x86_64/airootfs/usr/local/bin/install-stormux b/x86_64/airootfs/usr/local/bin/install-stormux
index 72696a0..2368492 100755
--- a/x86_64/airootfs/usr/local/bin/install-stormux
+++ b/x86_64/airootfs/usr/local/bin/install-stormux
@@ -857,12 +857,12 @@ install_base_system() {
             allPackages+=(python-gobject python-pillow python-pytesseract scrot tesseract)
             allPackages+=(tesseract-data-eng udiskie xorg-setxkbmap)
             # Add Stormux-specific i3 packages
-            stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw)
+            stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw brave-bin)
             ;;
         mate)
             allPackages+=(mate mate-extra orca)
             # Add Stormux-specific MATE packages
-            stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw)
+            stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw brave-bin)
             ;;
     esac
 
@@ -1075,16 +1075,19 @@ pacman -Sy --noconfirm --needed ${stormuxPackages[*]} 2>/dev/null || true
     local gameManagerPackagesCmd=""
     if [[ "$installAudiogameManager" == "yes" ]]; then
         gameManagerPackagesCmd+="
-# Install wine packages for audiogame-manager
-echo \"Installing wine packages for audiogame-manager...\"
-pacman -S --noconfirm --needed wine winetricks wine_gecko wine-mono cabextract dos2unix translate-shell gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav 2>/dev/null || true
+# Install packages for audiogame-manager
+echo \"Installing packages for audiogame-manager...\"
+# Critical packages: wine, p7zip, curl, dialog, sox, cabextract, unzip, xz
+# Optional packages: winetricks, wine_gecko, wine-mono, translate-shell, gawk, perl, xclip, xdotool
+# Audio packages: gst-plugins for multimedia support
+pacman -S --noconfirm --needed wine winetricks wine_gecko wine-mono p7zip curl dialog sox cabextract unzip xz translate-shell gawk perl xclip xdotool gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav 2>/dev/null || true
 "
     fi
     if [[ "$installLinuxGameManager" == "yes" ]]; then
         gameManagerPackagesCmd+="
 # Install packages for linux-game-manager
 echo \"Installing packages for linux-game-manager...\"
-pacman -S --noconfirm --needed linux-game-manager 2>/dev/null || true
+pacman -S --noconfirm --needed p7zip curl dialog yad unzip 2>/dev/null || true
 "
     fi
 
@@ -1392,7 +1395,9 @@ install_game_managers() {
 
         # Configure git repository for shared group access
         arch-chroot "$mountPoint" git -C /opt/linux-game-manager config core.sharedRepository group
+        # Add safe.directory configuration both locally and globally for all users
         arch-chroot "$mountPoint" git -C /opt/linux-game-manager config safe.directory /opt/linux-game-manager
+        arch-chroot "$mountPoint" git config --global --add safe.directory /opt/linux-game-manager
 
         # Set ownership to root:games with group-writable permissions
         chown -R root:games "$mountPoint/opt/linux-game-manager"
@@ -1408,10 +1413,14 @@ cd /opt/linux-game-manager || exit 1
 # Set umask for group-writable files
 umask 002
 
+# Configure safe.directory if not already set
+git config --global --get-all safe.directory | grep -q "^/opt/linux-game-manager$" || \
+    git config --global --add safe.directory /opt/linux-game-manager
+
 # Try to update - only members of games group can write
 git pull --quiet 2>/dev/null || true
 
-./linux-game-manager.sh "$@"
+exec ./linux-game-manager.sh "$@"
 EOF
         chmod 755 "$mountPoint/usr/local/bin/linux-game-manager"
 
@@ -1429,7 +1438,9 @@ EOF
 
         # Configure git repository for shared group access
         arch-chroot "$mountPoint" git -C /opt/audiogame-manager config core.sharedRepository group
+        # Add safe.directory configuration both locally and globally for all users
         arch-chroot "$mountPoint" git -C /opt/audiogame-manager config safe.directory /opt/audiogame-manager
+        arch-chroot "$mountPoint" git config --global --add safe.directory /opt/audiogame-manager
 
         # Set ownership to root:games with group-writable permissions
         chown -R root:games "$mountPoint/opt/audiogame-manager"
@@ -1445,10 +1456,14 @@ cd /opt/audiogame-manager || exit 1
 # Set umask for group-writable files
 umask 002
 
+# Configure safe.directory if not already set
+git config --global --get-all safe.directory | grep -q "^/opt/audiogame-manager$" || \
+    git config --global --add safe.directory /opt/audiogame-manager
+
 # Try to update - only members of games group can write
 git pull --quiet 2>/dev/null || true
 
-./audiogame-manager.sh "$@"
+exec ./audiogame-manager.sh "$@"
 EOF
         chmod 755 "$mountPoint/usr/local/bin/audiogame-manager"