diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c2d5b921..a585edd4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -106,7 +106,6 @@ jobs:
 
               echo "aur_publish=true" >> $GITHUB_ENV
             elif [[ ${{ github.ref == 'refs/heads/nightly' }} ]]; then
-              aur_pkg=sunshine-git
               sub_version=".r${commit}"
 
               echo "aur_publish=true" >> $GITHUB_ENV
@@ -385,12 +384,6 @@ jobs:
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
           chmod +x linuxdeploy-x86_64.AppImage
 
-          # # https://github.com/linuxdeploy/linuxdeploy-plugin-gtk
-          # sudo apt-get install libgtk-3-dev librsvg2-dev -y
-          # wget https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh
-          # chmod +x linuxdeploy-plugin-gtk.sh
-          # export DEPLOY_GTK_VERSION=3
-
           ./linuxdeploy-x86_64.AppImage \
             --appdir ./AppDir \
             --executable ./sunshine \
@@ -400,8 +393,6 @@ jobs:
             --library /usr/lib/x86_64-linux-gnu/libpangocairo-1.0.so.0 \
             --library /usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0 \
             --output appimage
-          # # add this argument back if using gtk plugin
-          # --plugin gtk \
 
           # move
           mv Sunshine*.AppImage ../artifacts/sunshine.AppImage
@@ -419,14 +410,6 @@ jobs:
 
           ./appimagelint-x86_64.AppImage ./artifacts/sunshine.AppImage
 
-#      - name: Archive AppImage
-#        if: ${{ matrix.type == 'appimage' }}
-#        working-directory: artifacts
-#        run: |
-#          chmod +x ./sunshine.AppImage
-#
-#          zip --recurse-paths --move --test ./sunshine-appimage.zip ./*
-
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 117880ae..8055dc24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -548,41 +548,42 @@ if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.h
 	# Setting components groups and dependencies
 	# sunshine binary
 	set(CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "${CMAKE_PROJECT_NAME}")
-	set(CPACK_COMPONENT_APPLICATION_DESCRIPTION "The main application.")
-	set(CPACK_COMPONENT_APPLICATION_GROUP "${CMAKE_PROJECT_NAME}")
+	set(CPACK_COMPONENT_APPLICATION_DESCRIPTION "${CMAKE_PROJECT_NAME} main application.")
+	set(CPACK_COMPONENT_APPLICATION_GROUP "core")
 	set(CPACK_COMPONENT_APPLICATION_REQUIRED true)
 	set(CPACK_COMPONENT_APPLICATION_DEPENDS assets)
 
 	# assets
-	set(CPACK_COMPONENT_ASSETS_DISPLAY_NAME "Assets")
+	set(CPACK_COMPONENT_ASSETS_DISPLAY_NAME "assets")
 	set(CPACK_COMPONENT_ASSETS_DESCRIPTION "Shaders, default box art, and web ui.")
-	set(CPACK_COMPONENT_ASSETS_GROUP "${CMAKE_PROJECT_NAME}")
+	set(CPACK_COMPONENT_ASSETS_GROUP "core")
 	set(CPACK_COMPONENT_ASSETS_REQUIRED true)
 
 	# audio tool
 	set(CPACK_COMPONENT_AUDIO_DISPLAY_NAME "audio-info")
 	set(CPACK_COMPONENT_AUDIO_DESCRIPTION "CLI tool providing information about sound devices.")
-	set(CPACK_COMPONENT_AUDIO_GROUP "Tools")
+	set(CPACK_COMPONENT_AUDIO_GROUP "tools")
 
 	# display tool
 	set(CPACK_COMPONENT_DXGI_DISPLAY_NAME "dxgi-info")
 	set(CPACK_COMPONENT_DXGI_DESCRIPTION "CLI tool providing information about graphics cards and displays.")
-	set(CPACK_COMPONENT_DXGI_GROUP "Tools")
+	set(CPACK_COMPONENT_DXGI_GROUP "tools")
 
 	# service
-	set(CPACK_COMPONENT_SERVICESVC_DISPLAY_NAME "service-service")
-	set(CPACK_COMPONENT_SERVICESVC_DESCRIPTION "Enable the Sunshine service.")
-	set(CPACK_COMPONENT_SERVICESVC_GROUP "Tools")
+	set(CPACK_COMPONENT_SERVICESVC_DISPLAY_NAME "servicesvc")
+	set(CPACK_COMPONENT_SERVICESVC_DESCRIPTION "CLI tool providing ability to enable/disable the Sunshine service.")
+	set(CPACK_COMPONENT_SERVICESVC_GROUP "tools")
 
 	# service scripts
 	set(CPACK_COMPONENT_SERVICE_DISPLAY_NAME "service-scripts")
-	set(CPACK_COMPONENT_SERVICE_DESCRIPTION "Scripts to enable or disable the service.")
-	set(CPACK_COMPONENT_SERVICE_GROUP "Tools")
+	set(CPACK_COMPONENT_SERVICE_DESCRIPTION "Scripts to enable/disable the service.")
+	set(CPACK_COMPONENT_SERVICE_GROUP "scripts")
+	set(CPACK_COMPONENT_SERVICE_DEPENDS servicesvc)
 
 	# firewall scripts
 	# set(CPACK_COMPONENT_FIREWALL_DISPLAY_NAME "firewall-scripts")
 	# set(CPACK_COMPONENT_FIREWALL_DESCRIPTION "Scripts to enable or disable firewall rules.")
-	# set(CPACK_COMPONENT_FIREWALL_GROUP "Tools")
+	# set(CPACK_COMPONENT_FIREWALL_GROUP "scripts")
 endif()
 if(APPLE)
 	# TODO: bundle doesn't produce a valid .app use cpack -G DragNDrop