diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index bdab695..f7a9c4c 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -43,7 +43,12 @@ function upgrade2ultimate
         --text-align=center \
         --center \
         --text "What about Snaps, Flatpak, Appimage and firmware update support?"; then
-            echo "sudo pacman --noconfirm -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
+        if pacman -Qs pamac-aur > /dev/null ; then
+            echo "sudo pacman --noconfirm -R pamac-aur" >> /tmp/setup-assistant/prepare.sh
+        fi
+        if pacman -Qs pamac-tray-appindicator > /dev/null ; then
+            echo "sudo pacman --noconfirm -R pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
+        fi
             echo "pamac-all 
             appimagelauncher 
             fwupd 
@@ -173,7 +178,7 @@ function upgrade2ultimate
         echo "abiword" >> /tmp/setup-assistant/pkgs.txt
     fi
     if grep -R "Joplin" /tmp/setup-assistant/office.txt; then
-        echo "joplin" >> /tmp/setup-assistant/pkgs.txt
+        echo "joplin-desktop-electron" >> /tmp/setup-assistant/pkgs.txt
     fi
 
     yad \
@@ -429,8 +434,8 @@ function upgrade2ultimate
     if grep -R "Shotcut" /tmp/setup-assistant/video.txt; then
         echo "shotcut" >> /tmp/setup-assistant/pkgs.txt
     fi
-    if grep -R "Piviti" /tmp/setup-assistant/video.txt; then
-        echo "piviti
+    if grep -R "Pitivi" /tmp/setup-assistant/video.txt; then
+        echo "pitivi
         frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt
     fi
 
@@ -527,8 +532,6 @@ function upgrade2ultimate
     fi
     if grep -R "K3B" /tmp/setup-assistant/multimedia.txt; then
         echo "k3b
-        kaudiocreator
-        cdpara
         cdparanoia
         cdrdao
         dvd+rw-tools
diff --git a/usr/lib/setup-assistant/video.txt b/usr/lib/setup-assistant/video.txt
index c90e84f..b3ce1a9 100644
--- a/usr/lib/setup-assistant/video.txt
+++ b/usr/lib/setup-assistant/video.txt
@@ -9,7 +9,7 @@ SMPlayer (Build-in codecs, high compatability video player)
 false
 Shotcut (Qt-based video editor)
 false
-Piviti
+Pitivi
 false
 Openshot
 false