diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 1a39303..82073e8 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -1,13 +1,4 @@
 #!/bin/bash
-function goto
-{
-    label=$1
-    cmd=$(sed -n "/^:[[:blank:]][[:blank:]]*${label}/{:a;n;p;ba};" $0 | 
-          grep -v ':$')
-    eval "$cmd"
-    exit
-}
-
 function upgrade2ultimate
 {
     rm -rf /tmp/setup-assistant
@@ -17,6 +8,7 @@ function upgrade2ultimate
     if ! yad \
         --image='font-manager' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --geometry=700x100 \
         --button=No:0 \
         --button=Yes:1 \
@@ -29,12 +21,13 @@ function upgrade2ultimate
     if ! yad \
         --image='AppImageLauncher' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --geometry=700x100 \
         --button=No:0 \
         --button=Yes:1 \
         --text-align=center \
         --center \
-        --text "What about Snaps, Flatpak and Appimage support?"; then
+        --text "What about Snaps, Flatpak, Appimage and firmware update support?"; then
             echo "sudo pacman -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
             echo "pamac-all 
             appimagelauncher 
@@ -52,6 +45,7 @@ function upgrade2ultimate
     if ! yad \
         --image='pattern-games' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --geometry=700x100 \
         --button=No:0 \
         --button=Yes:1 \
@@ -67,6 +61,7 @@ function upgrade2ultimate
     yad \
         --image='org.pulseaudio.pavucontrol' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --text "We have metapkgs for these audio systems:" \
         --geometry=600x400 \
         --list \
@@ -93,7 +88,8 @@ function upgrade2ultimate
     yad \
         --image='cupsprinter' \
         --title="Upgrade to ULTIMATE 👾" \
-        --text "We have metapkgs for these audio systems:" \
+        --window-icon='update' \
+        --text "We have metapkgs for these:" \
         --geometry=600x400 \
         --list \
         --checklist \
@@ -116,6 +112,7 @@ function upgrade2ultimate
     yad \
         --image='libreoffice-main' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --text "There are a lot of office suites to choose from!" \
         --geometry=600x400 \
         --list \
@@ -157,6 +154,7 @@ function upgrade2ultimate
     yad \
         --image='telegram-desktop' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --text "Here are some desktop apps that might be useful to you:" \
         --geometry=600x400 \
         --list \
@@ -201,6 +199,7 @@ function upgrade2ultimate
     yad \
         --image='gimp' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --text "What about multimedia software?" \
         --geometry=600x400 \
         --list \
@@ -246,6 +245,7 @@ function upgrade2ultimate
     yad \
         --image='virtualbox' \
         --title="Upgrade to ULTIMATE 👾" \
+        --window-icon='update' \
         --text "Are you rather a fan of Virtualbox or virt-manager?" \
         --geometry=600x400 \
         --list \
@@ -261,61 +261,59 @@ function upgrade2ultimate
     fi
 
 
-    clear 
     sh /tmp/setup-assistant/prepare.sh
     cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt
-    sudo pacman --needed -S - < /tmp/setup-assistant/pkgs-install.txt
+    alacritty -e sudo pacman "--needed -S - < /tmp/setup-assistant/pkgs-install.txt" 
     sh /tmp/setup-assistant/setup.sh
-
+    read -p "Press enter finish the setup!"   
     rm -rf /tmp/setup-assistant
 }
 
+
 systemctl --user enable psd >/dev/null 2>&1 &
 systemctl --user start psd >/dev/null 2>&1 &
 
 libinput-gestures-setup autostart >/dev/null 2>&1 &
 libinput-gestures-setup start >/dev/null 2>&1 &
 
-: start
-clear
-echo "What do you want to do?"
-echo ""
-echo "1) Get initial mirrorlist & download list of packages"
-echo "2) Update the system" 
-echo "3) Enable systemwide adblocking / HiDPI mode"
-echo "4) Disable CPU migitations / change boot options"
-echo "5) Install additional (Ultimate) packages by choosing which ones you need"
-echo ""
-echo "6) Exit"
 
-read selection
-
-if [ $selection = "1" ]; then
-    clear
-    echo "Select the right mirrors in Reflector Simple!"
-    echo "If no mirrors were found select german servers. ☝🏻"
-    reflector-simple >/dev/null 2>&1
-    sudo pacman -Syy
-    goto "start"
-elif [ $selection = "2" ]; then
-    clear
-    sudo pacman -Syu
-    goto "start"
-elif [ $selection = "3" ]; then
-    clear
-    echo "Find it in the settings tab. 🖥"
-    garuda-welcome >/dev/null 2>&1
-    goto "start"
-elif [ $selection = "4" ]; then
-    clear
-    echo "Disabling CPU mitiations increases performance but can possibly lead to security issues."
-    echo "Use it with caution! 🛑"
-    sudo garuda-boot-options >/dev/null 2>&1
-    goto "start"
-elif [ $selection = "5" ]; then
-    upgrade2ultimate
-elif [ $selection = "6" ]; then
-    exit
-else "Thats not a valid choice! ❌"
-    goto "start"
+if ! yad \
+    --image='update' \
+    --title="Setup Assistant" \
+    --window-icon='update' \
+    --geometry=700x100 \
+    --button=No:0 \
+    --button=Yes:1 \
+    --text-align=center \
+    --center \
+    --text "Do you want to get a recent mirrorlist and refresh mirrors?"; then
+        reflector-simple >/dev/null 2>&1
+        alacritty -e sudo pacman "-Syy"        
 fi
+
+if ! yad \
+    --image='update' \
+    --title="Setup Assistant" \
+    --window-icon='update' \
+    --geometry=700x100 \
+    --button=No:0 \
+    --button=Yes:1 \
+    --text-align=center \
+    --center \
+    --text "Update the system? (recommended!)"; then
+        alacritty -e sudo pacman "-Syu"
+fi
+
+if ! yad \
+    --image='pamac' \
+    --title="Setup Assistant" \
+    --window-icon='update' \
+    --geometry=700x100 \
+    --button=No:0 \
+    --button=Yes:1 \
+    --text-align=center \
+    --center \
+    --text "Upgrade to Ultimate? (You can select which apps you want!)"; then
+        upgrade2ultimate
+fi
+
diff --git a/usr/lib/setup-assistant/audio.txt b/usr/lib/setup-assistant/audio.txt
index 4be9a34..e7f974a 100644
--- a/usr/lib/setup-assistant/audio.txt
+++ b/usr/lib/setup-assistant/audio.txt
@@ -4,3 +4,5 @@ false
 Alsa
 false
 Pipewire
+false
+My audio works fine, I dont need any of these
diff --git a/usr/lib/setup-assistant/office.txt b/usr/lib/setup-assistant/office.txt
index 3e487a3..14b1823 100644
--- a/usr/lib/setup-assistant/office.txt
+++ b/usr/lib/setup-assistant/office.txt
@@ -15,4 +15,4 @@ Calligra Office
 false
 Abiword	(Simple wordprocessor, recommended for simple writing)
 false
-No office (Who needs office anyway?)
+No office suite
diff --git a/usr/share/applications/setup-assistant.desktop b/usr/share/applications/setup-assistant.desktop
new file mode 100755
index 0000000..1589bdb
--- /dev/null
+++ b/usr/share/applications/setup-assistant.desktop
@@ -0,0 +1,9 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Encoding=UTF-8
+Exec=setup-assistant
+Terminal=false
+Type=Application
+Icon=pamac-updater
+Categories=GTK;System;Garuda-Setup;
+NoDisplay=false