diff --git a/src_assets/macos/misc/uninstall_pkg.sh b/src_assets/macos/misc/uninstall_pkg.sh
index 8cc7f62c..69f31df1 100644
--- a/src_assets/macos/misc/uninstall_pkg.sh
+++ b/src_assets/macos/misc/uninstall_pkg.sh
@@ -1,39 +1,58 @@
 #!/bin/bash -e
 set -e
 
-FILES=(pkgutil --files org.macports.Sunshine)
+package_name=org.macports.Sunshine
+
+echo "Removing files now..."
+FILES=$(pkgutil --files --only-files $package_name)
 
 remove_config=True
 remove_apps=True
 
-for n in {1..2}; do
-    echo "Loop: $n"
-    for file in "${FILES[@]}"; do
-        if [[ $file == *sunshine.conf ]]; then
-            if [ $remove_config == True ]; then
-                while true; do
-                    read -p -r "Do you wish to remove 'sunshine.conf'?" yn
-                    case $yn in
-                        [Yy]* ) rm --force "$file"; break;;
-                        [Nn]* ) remove_config=False; break;;
-                        * ) echo "Please answer yes or no.";;
-                    esac
-                done
-            fi
+for file in ${FILES}; do
+    file="/$file"
+    remove_current=True
+    if [[ $file == *sunshine.conf ]]; then
+        if [[ $remove_config == True ]]; then
+            while true; do
+                read -p -r "Do you wish to remove 'sunshine.conf'?" yn
+                case $yn in
+                    [Yy]* ) echo "removing: $file"; rm -f "$file"; break;;
+                    [Nn]* ) remove_config=False; remove_current=False; break;;
+                    * ) echo "Please answer yes or no.";;
+                esac
+            done
         fi
-        if [[ $file == *apps.json ]]; then
-            if [ $remove_apps == True ]; then
-                while true; do
-                    read -p -r "Do you wish to remove 'apps.conf'?" yn
-                    case $yn in
-                        [Yy]* ) rm --force "$file"; break;;
-                        [Nn]* ) remove_apps=False; break;;
-                        * ) echo "Please answer yes or no.";;
-                    esac
-                done
-            fi
+    fi
+    if [[ $file == *apps.json ]]; then
+        if [[ $remove_apps == True ]]; then
+            while true; do
+                read -p -r "Do you wish to remove 'apps.conf'?" yn
+                case $yn in
+                    [Yy]* ) echo "removing: $file"; rm -f "$file"; break;;
+                    [Nn]* ) remove_apps=False; remove_current=False; break;;
+                    * ) echo "Please answer yes or no.";;
+                esac
+            done
         fi
+    fi
 
-        rm --force --dir "$file"
-    done
+    if [[ $remove_current == True ]]; then
+        echo "removing: $file"
+        rm -f "$file"
+    fi
 done
+
+echo "Removing directories now..."
+DIRECTORIES=$(pkgutil --files --only-dirs org.macports.Sunshine)
+
+for dir in ${DIRECTORIES}; do
+    dir="/$dir"
+    echo "Checking if empty directory: $dir"
+    find "$dir" -type d -empty -exec rm -f -d {} \;
+done
+
+echo "Forgetting Sunshine..."
+pkgutil --forget $package_name
+
+echo "Sunshine has been uninstalled..."