diff --git a/usr/bin/archboot-launcher.sh b/usr/bin/archboot-launcher.sh
index f29405230..e51927d89 100755
--- a/usr/bin/archboot-launcher.sh
+++ b/usr/bin/archboot-launcher.sh
@@ -95,21 +95,14 @@ _launcher() {
     _dialog  --default-item "${_DEFAULTITEM}" --cancel-label "${_LABEL}" --title " Launcher Menu " --menu "" 9 40 5 \
     "1" "Launch Archboot Setup" "${_MENU[@]}" 2>"${_ANSWER}"
     case $(cat "${_ANSWER}") in
-        "1")
-            [[ -e /.launcher-running ]] && rm /.launcher-running
-            setup
-            exit 0 ;;
-        "2")
-            _DEFAULTITEM=2
-            _desktop
-            ;;
-        "3")
-            _DEFAULTITEM=3
-            _manage
-            ;;
-        *)
-            _exit
-            ;;
+        "1") [[ -e /.launcher-running ]] && rm /.launcher-running
+             setup
+             exit 0 ;;
+        "2") _DEFAULTITEM=2
+             _desktop ;;
+        "3") _DEFAULTITEM=3
+             _manage ;;
+        *) _exit ;;
     esac
 }
 
diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh
index a35100b65..c6f3e2073 100755
--- a/usr/bin/archboot-update.sh
+++ b/usr/bin/archboot-update.sh
@@ -85,8 +85,19 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
     # only start vnc on xorg environment
     echo "Setting up VNC and browser..." >"${_LOG}"
     [[ -n "${_L_XFCE}" ]] && _autostart_vnc
-    command -v firefox &>"${_NO_LOG}"  && _firefox_flags
-    command -v chromium &>"${_NO_LOG}" && _chromium_flags
+    # install standard browser
+    _BROWSER="$(grep '_STANDARD_BROWSER' /etc/archboot/defaults | cut -d '=' -f2)"
+    if ! pacman -Q ${_BROWSER} &>"${_NO_LOG}"; then
+        if [[ "${_BROWSER}" == "firefox" ]]; then
+            pacman -Rss --noconfirm chromium &>"${_LOG}"
+        else
+            pacman -Rss --noconfirm firefox &>"${_LOG}"
+        fi
+        pacman --noconfirm -Sy ${_BROWSER} &>"${_LOG}"
+    fi
+
+
+    _${_BROWSER}_flags
     if [[ -n "${_L_XFCE}" ]]; then
         _start_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
         clear