[vk] Fix query cache leak on missed sync (#131 )

Provided by community member, elementary-particle. Submitted as PR by MaranBR. Fixed issues: 1. The queue cache forgot to put the host query into unregister queue if they weren't synced. This will block all the banks from freeing causing a major leak. 2. SamplesQueryCounter is not aligned with renderpass begin/end. This creates invalid queries. 3. Conditional rendering is not turned on/off at the correct location making them invalid. Co-authored-by: Maufeat <sahyno1996@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/131 Co-authored-by: Shinmegumi <shinmegumi@eden-emu.dev> Co-committed-by: Shinmegumi <shinmegumi@eden-emu.dev>
2025-07-26 12:26:29 -04:00
5837 changed files with 1233527 additions and 191811 deletions
--- a/.ci/android/build.sh
+++ b/.ci/android/build.sh
@@ -1,121 +1,21 @@
-#!/bin/sh -e
+#!/bin/bash -e

-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

-NUM_JOBS=$(nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 2)
-export CMAKE_BUILD_PARALLEL_LEVEL="${NUM_JOBS}"
-ARTIFACTS_DIR="$PWD/artifacts"
+export NDK_CCACHE=$(which ccache)

-: "${CCACHE:=false}"
-RETURN=0
-
-usage() {
-    cat <<EOF
-Usage: $0 [-t|--target FLAVOR] [-b|--build-type BUILD_TYPE]
-       [-h|--help] [-r|--release] [extra options]
-
-Build script for Android.
-Associated variables can be set outside the script,
-and will apply both to this script and the packaging script.
-bool values are "true" or "false"
-
-Options:
-    -r, --release        	Enable update checker. If set, sets the DEVEL bool variable to false.
-                         	By default, DEVEL is true.
-    -t, --target <FLAVOR> 	Build flavor (variable: TARGET)
-                          	Valid values are: legacy, optimized, standard, chromeos
-                          	Default: standard
-    -b, --build-type <TYPE>	Build type (variable: TYPE)
-                          	Valid values are: Release, RelWithDebInfo, Debug
-                          	Default: Debug
-
-Extra arguments are passed to CMake (e.g. -DCMAKE_OPTION_NAME=VALUE)
-Set the CCACHE variable to "true" to enable build caching.
-The APK and AAB will be output into "artifacts".
-
-EOF
-
-    exit "$RETURN"
-}
-
-die() {
-	echo "-- ! $*" >&2
-	RETURN=1 usage
-}
-
-target() {
-    [ -z "$1" ] && die "You must specify a valid target."
-
-    TARGET="$1"
-}
-
-type() {
-    [ -z "$1" ] && die "You must specify a valid type."
-
-    TYPE="$1"
-}
-
-while true; do
-	case "$1" in
-		-r|--release) DEVEL=false ;;
-		-t|--target) target "$2"; shift ;;
-		-b|--build-type) type "$2"; shift ;;
-		-h|--help) usage ;;
-		*) break ;;
-	esac
-
-	shift
-done
-
-: "${TARGET:=standard}"
-: "${TYPE:=Release}"
-: "${DEVEL:=true}"
-
-TARGET_LOWER=$(echo "$TARGET" | tr '[:upper:]' '[:lower:]')
-
-case "$TARGET_LOWER" in
-	legacy) FLAVOR=Legacy ;;
-	optimized) FLAVOR=GenshinSpoof ;;
-	standard) FLAVOR=Mainline ;;
-    chromeos) FLAVOR=ChromeOS ;;
-	*) die "Invalid build flavor $TARGET."
-esac
-
-case "$TYPE" in
-	RelWithDebInfo|Release|Debug) ;;
-	*) die "Invalid build type $TYPE."
-esac
-
-LOWER_FLAVOR=$(echo "$FLAVOR" | sed 's/./\L&/')
-LOWER_TYPE=$(echo "$TYPE" | sed 's/./\L&/')
-
-if [ -n "${ANDROID_KEYSTORE_B64}" ]; then
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    echo "${ANDROID_KEYSTORE_B64}" | base64 --decode > "${ANDROID_KEYSTORE_FILE}"
-	SHA1SUM=$(keytool -list -v -storepass "${ANDROID_KEYSTORE_PASS}" -keystore "${ANDROID_KEYSTORE_FILE}" | grep SHA1 | cut -d " " -f3)
-	echo "-- Keystore SHA1 is ${SHA1SUM}"
+    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
 fi

 cd src/android
 chmod +x ./gradlew

-set -- "$@" -DUSE_CCACHE="${CCACHE}"
-[ "$DEVEL" != "true" ] && set -- "$@" -DENABLE_UPDATE_CHECKER=ON
+./gradlew assembleRelease
+./gradlew bundleRelease

-echo "-- building..."
-
-./gradlew "copy${FLAVOR}${TYPE}Outputs" \
-    -Dorg.gradle.caching="${CCACHE}" \
-    -Dorg.gradle.parallel="${CCACHE}" \
-    -Dorg.gradle.workers.max="${NUM_JOBS}" \
-    -PYUZU_ANDROID_ARGS="$*" \
-    --info
-
-if [ -n "${ANDROID_KEYSTORE_B64}" ]; then
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
    rm "${ANDROID_KEYSTORE_FILE}"
 fi
-
-echo "-- Done! APK and AAB artifacts are in ${ARTIFACTS_DIR}"
-
-ls -l "${ARTIFACTS_DIR}/"
--- a/.ci/android/package.sh
+++ b/.ci/android/package.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+GITDATE="$(git show -s --date=short --format='%ad' | sed 's/-//g')"
+GITREV="$(git show -s --format='%h')"
+ARTIFACTS_DIR="$PWD/artifacts"
+mkdir -p "${ARTIFACTS_DIR}/"
+
+REV_NAME="eden-android-${GITDATE}-${GITREV}"
+BUILD_FLAVOR="mainline"
+BUILD_TYPE_LOWER="release"
+BUILD_TYPE_UPPER="Release"
+
+cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
+	"${ARTIFACTS_DIR}/${REV_NAME}.apk" || echo "APK not found"
+
+cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
+	"${ARTIFACTS_DIR}/${REV_NAME}.aab" || echo "AAB not found"
+
+ls -la "${ARTIFACTS_DIR}/"
--- a/.ci/license-header.rb
+++ b/.ci/license-header.rb
@@ -0,0 +1,47 @@
+#!/usr/bin/ruby
+# frozen_string_literal: true
+
+license_header = <<~EOF
+      // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+      // SPDX-License-Identifier: GPL-3.0-or-later
+      EOF
+
+print 'Getting branch changes...'
+branch_name = `git rev-parse --abbrev-ref HEAD`.chomp
+branch_commits = `git log #{branch_name} --not master --pretty=format:"%h"`.split("\n")
+branch_commit_range = "#{branch_commits[-1]}^..#{branch_commits[0]}"
+branch_changed_files = `git diff-tree --no-commit-id --name-only #{branch_commit_range} -r`.split("\n")
+puts 'done'
+
+print 'Checking files...'
+issue_files = []
+branch_changed_files.each do |file_name|
+   if file_name.end_with?('.cpp', '.h', '.kt', '.kts') and File.file?(file_name)
+      file_content = File.read(file_name)
+      if not file_content.start_with?(license_header)
+         issue_files.push(file_name)
+      end
+   end
+end
+puts 'done'
+
+if issue_files.empty?
+   puts "\nAll changed files have correct headers"
+   exit 0
+end
+
+puts <<-EOF
+
+The following #{issue_files.length} files have incorrect license headers:
+#{issue_files.join("\n")}
+
+The following license header should be added to the start of all offending files:
+=== BEGIN ===
+#{license_header}
+===  END  ===
+
+If some of the code in this PR is not being contributed by the original author, the files which have been exclusively changed by that code can be ignored.
+If this happens, this PR requirement can be bypassed once all other files are addressed.
+EOF
+
+exit 1
--- a/.ci/license-header.sh
+++ b/.ci/license-header.sh
@@ -1,249 +1,84 @@
 #!/bin/sh -e

-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
+HEADER="$(cat "$PWD/.ci/license/header.txt")"

-# specify full path if dupes may exist
-EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh tools/windows/vcvarsall.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder externals/cmake-modules"
+echo "Getting branch changes"

-# license header constants, please change when needed :))))
-YEAR=2025
-HOLDER="Eden Emulator Project"
-LICENSE="GPL-3.0-or-later"
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+COMMITS=`git log ${BRANCH} --not master --pretty=format:"%h"`
+RANGE="${COMMITS[${#COMMITS[@]}-1]}^..${COMMITS[0]}"
+FILES=`git diff-tree --no-commit-id --name-only ${RANGE} -r`

-usage() {
-	cat << EOF
-Usage: $0 [uc]
-Compares the current HEAD to the master branch to check for license
-header discrepancies. Each file changed in a branch MUST have a
-license header, and this script attempts to enforce that.
+#FILES=$(git diff --name-only master)

-Options:
-    -u, --update	Fix license headers, if applicable;
-                	if the license header exists but has the incorrect
-                	year or is otherwise malformed, it will be fixed.
-
-    -c, --commit	Commit changes to Git (requires --update)
-
-Copyright $YEAR $HOLDER
-Licensed under $LICENSE
-
-The following files/directories are marked as external
-and thus will not have license headers asserted:
-EOF
-
-	for file in $EXCLUDE_FILES; do
-		echo "- $file"
-	done
-
-	exit 0
-}
-
-while true; do
-	case "$1" in
-		(-uc) UPDATE=true; COMMIT=true ;;
-		(-u|--update) UPDATE=true ;;
-		(-c|--commit) COMMIT=true ;;
-		("$0") break ;;
-		("") break ;;
-		(*) usage ;;
-	esac
-
-	shift
-done
-
-# human-readable header string
-header() {
-	header_line1 "$1"
-	header_line2 "$1"
-}
-
-header_line1() {
-	echo "$1 SPDX-FileCopyrightText: Copyright $YEAR $HOLDER"
-}
-
-header_line2() {
-	echo "$1 SPDX-License-Identifier: $LICENSE"
-}
-
-check_header() {
-	begin="$1"
-	file="$2"
-
-	# separate things out as spaces to make our lives 100000000x easier
-    content="$(head -n5 < "$2" | tr '\n' ' ')"
-
-	line1="$(header_line1 "$begin")"
-	line2="$(header_line2 "$begin")"
-
-	# perl and awk are actually awful, so to avoid this problem we avoid it by avoiding it
-	if ! echo "$content" | grep -o "$line1 $line2" >/dev/null; then
-		# SRC_FILES is Kotlin/C++
-		# OTHER_FILES is sh, CMake
-		case "$begin" in
-			"//")
-				SRC_FILES="$SRC_FILES $file"
-				;;
-			"#")
-				OTHER_FILES="$OTHER_FILES $file"
-				;;
-		esac
-	fi
-}
-
-BASE=$(git merge-base master HEAD)
-FILES=$(git diff --name-only "$BASE")
+echo "Done"

 for file in $FILES; do
-    [ -f "$file" ] || continue
-
-	# skip files that are third party (crueter's CMake modules, sse2neon, etc)
-	for pattern in $EXCLUDE_FILES; do
-		case "$file" in
-			*"$pattern"*)
-				excluded=true
-				break
-				;;
-			*)
-				excluded=false
-				;;
-		esac
-	done
-
-	[ "$excluded" = "true" ] && continue
-
-	case "$file" in
-		*.cmake|*.sh|CMakeLists.txt)
-			begin="#"
-			;;
-		*.kt*|*.cpp|*.h)
-			begin="//"
-			;;
-		*)
-			continue
-			;;
+    EXTENSION="${file##*.}"
+    case "$EXTENSION" in
+        kts|kt|cpp|h)
+            CONTENT="`cat $file`"
+            case "$CONTENT" in
+                "$HEADER"*) ;;
+                *) BAD_FILES="$BAD_FILES $file" ;;
+            esac
+            ;;
    esac
-
-	check_header "$begin" "$file"
 done

-if [ -z "$SRC_FILES" ] && [ -z "$OTHER_FILES" ]; then
-    echo "-- All good."
+if [ "$BAD_FILES" = "" ]; then
+    echo
+    echo "All good."

    exit
 fi

+echo "The following files have incorrect license headers:"
 echo

-if [ "$SRC_FILES" != "" ]; then
-    echo "-- The following source files have incorrect license headers:"
-
-	HEADER=$(header "//")
-
-    for file in $SRC_FILES; do echo "-- * $file"; done
-
-    cat << EOF
-
-- The following license header should be added to the start of these offending files:
-
-=== BEGIN ===
-$HEADER
-===  END  ===
-
-EOF
-
-fi
-
-if [ "$OTHER_FILES" != "" ]; then
-    echo "-- The following CMake and shell scripts have incorrect license headers:"
-
-	HEADER=$(header "#")
-
-    for file in $OTHER_FILES; do echo "-- * $file"; done
-
-    cat << EOF
-
-- The following license header should be added to the start of these offending files:
-
-=== BEGIN ===
-$HEADER
-===  END  ===
-
-EOF
-
-fi
+for file in $BAD_FILES; do echo $file; done

 cat << EOF
-    If some of the code in this PR is not being contributed by the original author,
-    the files which have been exclusively changed by that code can be ignored.
-    If this happens, this PR requirement can be bypassed once all other files are addressed.

+The following license header should be added to the start of all offending files:
+
+=== BEGIN ===
+$HEADER
+===  END  ===
+
+If some of the code in this PR is not being contributed by the original author,
+the files which have been exclusively changed by that code can be ignored.
+If this happens, this PR requirement can be bypassed once all other files are addressed.
 EOF

-if [ "$UPDATE" = "true" ]; then
-	TMP_DIR=$(mktemp -d)
-	echo "-- Fixing headers..."
+if [ "$FIX" = "true" ]; then
+    echo
+    echo "FIX set to true. Fixing headers."
+    echo

-	for file in $SRC_FILES $OTHER_FILES; do
-		case $(basename -- "$file") in
-			*.cmake|CMakeLists.txt)
-				begin="#"
-				shell="false"
-				;;
-			*.sh)
-				begin="#"
-				shell=true
-				;;
-			*.kt*|*.cpp|*.h)
-				begin="//"
-				shell="false"
-				;;
-		esac
+    for file in $BAD_FILES; do
+        cat $file > $file.bak

-		# This is fun
-		match="$begin SPDX-FileCopyrightText.*$HOLDER"
+        cat .ci/license/header.txt > $file
+        echo >> $file
+        cat $file.bak >> $file

-		# basically if the copyright holder is already defined we can just replace the year
-		if head -n5 < "$file" | grep -e "$match" >/dev/null; then
-			replace=$(header_line1 "$begin")
-			sed "s|$match|$replace|" "$file" > "$file".bak
-			mv "$file".bak "$file"
-		else
-			header "$begin" > "$TMP_DIR"/header
+        rm $file.bak

-			if [ "$shell" = "true" ]; then
-				# grab shebang
-				head -n1 "$file" > "$TMP_DIR/shebang"
-				echo >> "$TMP_DIR/shebang"
+        git add $file
+    done

-				# remove shebang
-				sed '1d' "$file" > "$file".bak
-				mv "$file".bak "$file"
+    echo "License headers fixed."

-				# add to header
-				cat "$TMP_DIR"/shebang "$TMP_DIR"/header > "$TMP_DIR"/new-header
-				mv "$TMP_DIR"/new-header "$TMP_DIR"/header
-			else
-				echo >> "$TMP_DIR/header"
-			fi
+    if [ "$COMMIT" = "true" ]; then
+        echo
+        echo "COMMIT set to true. Committing changes."
+        echo

-			cat "$TMP_DIR"/header "$file" > "$file".bak
-			mv "$file".bak "$file"
-		fi
+        git commit -m "Fix license headers"

-		[ "$shell" = "true" ] && chmod a+x "$file"
-		[ "$COMMIT" = "true" ] && git add "$file"
-	done
-
-	echo "-- Done"
+        echo "Changes committed. You may now push."
+    fi
+else
+    exit 1
 fi
-
-if [ "$COMMIT" = "true" ]; then
-	echo "-- Committing changes"
-
-	git commit -m "Fix license headers"
-
-	echo "-- Changes committed. You may now push."
-fi
-
-[ -d "$TMP_DIR" ] && rm -rf "$TMP_DIR"
--- a/.ci/license/header.txt
+++ b/.ci/license/header.txt
@@ -0,0 +1,2 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
--- a/.ci/linux/build.sh
+++ b/.ci/linux/build.sh
@@ -1,55 +1,49 @@
 #!/bin/bash -e

-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

+
 case "$1" in
-amd64 | "")
-    echo "Making amd64-v3 optimized build of Eden"
-    ARCH="amd64_v3"
-    ARCH_FLAGS="-march=x86-64-v3"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=v3)
-    ;;
-steamdeck | zen2)
-    echo "Making Steam Deck (Zen 2) optimized build of Eden"
-    ARCH="steamdeck"
-    ARCH_FLAGS="-march=znver2 -mtune=znver2"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=zen2 -DYUZU_SYSTEM_PROFILE=steamdeck)
-    ;;
-rog-ally | allyx | zen4)
-    echo "Making ROG Ally X (Zen 4) optimized build of Eden"
-    ARCH="rog-ally-x"
-    ARCH_FLAGS="-march=znver4 -mtune=znver4"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=zen2 -DYUZU_SYSTEM_PROFILE=steamdeck)
-    ;;
-legacy)
-    echo "Making amd64 generic build of Eden"
-    ARCH=amd64
-    ARCH_FLAGS="-march=x86-64 -mtune=generic"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=generic)
-    ;;
-aarch64)
-    echo "Making armv8-a build of Eden"
-    ARCH=aarch64
-    ARCH_FLAGS="-march=armv8-a -mtune=generic -w"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=generic)
-    ;;
-armv9)
-    echo "Making armv9-a build of Eden"
-    ARCH=armv9
-    ARCH_FLAGS="-march=armv9-a -mtune=generic -w"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=armv9)
-    ;;
-native)
-    echo "Making native build of Eden"
-    ARCH="$(uname -m)"
-    ARCH_FLAGS="-march=native -mtune=native"
-    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=native)
-    ;;
-*)
-    echo "Invalid target $1 specified, must be one of native, amd64, steamdeck, zen2, allyx, rog-ally, zen4, legacy, aarch64, armv9"
-    exit 1
-    ;;
+    amd64|"")
+        echo "Making amd64-v3 optimized build of Eden"
+        ARCH="amd64_v3"
+        ARCH_FLAGS="-march=x86-64-v3"
+        ;;
+    steamdeck|zen2)
+        echo "Making Steam Deck (Zen 2) optimized build of Eden"
+        ARCH="steamdeck"
+        ARCH_FLAGS="-march=znver2 -mtune=znver2"
+        ;;
+    rog-ally|allyx|zen4)
+        echo "Making ROG Ally X (Zen 4) optimized build of Eden"
+        ARCH="rog-ally-x"
+        ARCH_FLAGS="-march=znver4 -mtune=znver4"
+        ;;
+    legacy)
+        echo "Making amd64 generic build of Eden"
+        ARCH=amd64
+        ARCH_FLAGS="-march=x86-64 -mtune=generic"
+        ;;
+    aarch64)
+        echo "Making armv8-a build of Eden"
+        ARCH=aarch64
+        ARCH_FLAGS="-march=armv8-a -mtune=generic -w"
+        ;;
+    armv9)
+        echo "Making armv9-a build of Eden"
+        ARCH=armv9
+        ARCH_FLAGS="-march=armv9-a -mtune=generic -w"
+        ;;
+    native)
+        echo "Making native build of Eden"
+        ARCH="$(uname -m)"
+        ARCH_FLAGS="-march=native -mtune=native"
+        ;;
+    *)
+        echo "Invalid target $1 specified, must be one of native, amd64, steamdeck, zen2, allyx, rog-ally, zen4, legacy, aarch64, armv9"
+        exit 1
+        ;;
 esac

 export ARCH_FLAGS="$ARCH_FLAGS -O3"
@@ -61,15 +55,14 @@ fi
 if [ "$1" != "" ]; then shift; fi

 if [ "$TARGET" = "appimage" ]; then
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DCMAKE_INSTALL_PREFIX=/usr -DYUZU_ROOM=ON -DYUZU_ROOM_STANDALONE=OFF -DYUZU_CMD=OFF)
+    export EXTRA_CMAKE_FLAGS=(-DCMAKE_INSTALL_PREFIX=/usr -DYUZU_ROOM=ON -DYUZU_ROOM_STANDALONE=OFF -DYUZU_CMD=OFF)
 else
    # For the linux-fresh verification target, verify compilation without PCH as well.
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_PRECOMPILED_HEADERS=OFF)
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_USE_PRECOMPILED_HEADERS=OFF)
 fi

-
 if [ "$DEVEL" != "true" ]; then
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_UPDATE_CHECKER=ON)
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_QT_UPDATE_CHECKER=ON)
 fi

 if [ "$USE_WEBENGINE" = "true" ]; then
@@ -93,10 +86,11 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 mkdir -p build && cd build
 cmake .. -G Ninja \
    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-    -DENABLE_QT_TRANSLATION=ON \
+	-DENABLE_QT_TRANSLATION=ON \
    -DUSE_DISCORD_PRESENCE=ON \
    -DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \
    -DCMAKE_C_FLAGS="$ARCH_FLAGS" \
+    -DYUZU_USE_BUNDLED_VCPKG=OFF \
    -DYUZU_USE_BUNDLED_QT=OFF \
    -DYUZU_USE_BUNDLED_SDL2=OFF \
    -DYUZU_USE_EXTERNAL_SDL2=ON \
@@ -105,13 +99,12 @@ cmake .. -G Ninja \
    -DYUZU_USE_QT_WEB_ENGINE=$WEBENGINE \
    -DYUZU_USE_FASTER_LD=ON \
    -DYUZU_ENABLE_LTO=ON \
-    -DDYNARMIC_ENABLE_LTO=ON \
-    "${EXTRA_CMAKE_FLAGS[@]}"
+	"${EXTRA_CMAKE_FLAGS[@]}"

 ninja -j${NPROC}

 if [ -d "bin/Release" ]; then
-    strip -s bin/Release/*
+  strip -s bin/Release/*
 else
-    strip -s bin/*
+  strip -s bin/*
 fi
--- a/.ci/linux/eden.dwfsprof
+++ b/.ci/linux/eden.dwfsprof
@@ -1,6 +1,6 @@
 AppRun
 eden.desktop
-dev.eden_emu.eden.desktop
+org.eden_emu.eden.desktop
 shared/bin/eden
 shared/lib/lib.path
 shared/lib/ld-linux-x86-64.so.2
--- a/.ci/linux/package.sh
+++ b/.ci/linux/package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e

-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # This script assumes you're in the source directory
@@ -59,15 +59,15 @@ VERSION="$(echo "$EDEN_TAG")"
 mkdir -p ./AppDir
 cd ./AppDir

-cp ../dist/dev.eden_emu.eden.desktop .
-cp ../dist/dev.eden_emu.eden.svg .
+cp ../dist/org.eden_emu.eden.desktop .
+cp ../dist/org.eden_emu.eden.svg .

-ln -sf ./dev.eden_emu.eden.svg ./.DirIcon
+ln -sf ./org.eden_emu.eden.svg ./.DirIcon

 UPINFO='gh-releases-zsync|eden-emulator|Releases|latest|*.AppImage.zsync'

 if [ "$DEVEL" = 'true' ]; then
-	sed -i 's|Name=Eden|Name=Eden Nightly|' ./dev.eden_emu.eden.desktop
+	sed -i 's|Name=Eden|Name=Eden Nightly|' ./org.eden_emu.eden.desktop
 	UPINFO="$(echo "$UPINFO" | sed 's|Releases|nightly|')"
 fi

@@ -92,6 +92,7 @@ chmod +x ./sharun-aio
 xvfb-run -a ./sharun-aio l -p -v -e -s -k \
 	../$BUILDDIR/bin/eden* \
 	$LIBDIR/lib*GL*.so* \
+  $LIBDIR/libSDL2*.so* \
 	$LIBDIR/dri/* \
 	$LIBDIR/vdpau/* \
 	$LIBDIR/libvulkan* \
--- a/.ci/translate.sh
+++ b/.ci/translate.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for i in dist/languages/*.ts; do
+    SRC=en_US
+    TARGET=`head -n1 $i | awk -F 'language="' '{split($2, a, "\""); print a[1]}'`
+
+    # requires fd
+    SOURCES=`fd . src/yuzu -tf -e ui -e cpp -e h -e plist`
+
+    lupdate -source-language $SRC -target-language $TARGET $SOURCES -ts /data/code/eden/$i
+done
--- a/.ci/windows/build.sh
+++ b/.ci/windows/build.sh
@@ -1,45 +1,59 @@
-#!/bin/bash -ex
+#!/bin/bash -e

-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

-if [ "$COMPILER" == "clang" ]
-then
-    EXTRA_CMAKE_FLAGS+=(
-        -DCMAKE_CXX_COMPILER=clang-cl
-        -DCMAKE_C_COMPILER=clang-cl
-        -DCMAKE_CXX_FLAGS="-O3"
-        -DCMAKE_C_FLAGS="-O3"
-    )
-
-    BUILD_TYPE="RelWithDebInfo"
+if [ "$DEVEL" != "true" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_QT_UPDATE_CHECKER=ON)
 fi

-[ -z "$WINDEPLOYQT" ] && { echo "WINDEPLOYQT environment variable required."; exit 1; }
+if [ "$CCACHE" = "true" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DUSE_CCACHE=ON)
+fi

-echo $EXTRA_CMAKE_FLAGS
+if [ "$BUNDLE_QT" = "true" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=ON)
+else
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=OFF)
+fi
+
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
+fi
+
+if [ "$WINDEPLOYQT" == "" ]; then
+    echo "You must supply the WINDEPLOYQT environment variable."
+    exit 1
+fi
+
+if [ "$USE_WEBENGINE" = "true" ]; then
+    WEBENGINE=ON
+else
+    WEBENGINE=OFF
+fi
+
+if [ "$USE_MULTIMEDIA" = "false" ]; then
+    MULTIMEDIA=OFF
+else
+    MULTIMEDIA=ON
+fi
+
+export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)

 mkdir -p build && cd build
 cmake .. -G Ninja \
-    -DCMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}" \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DENABLE_QT_TRANSLATION=ON \
    -DUSE_DISCORD_PRESENCE=ON \
-    -DYUZU_USE_BUNDLED_SDL2=ON \
-    -DBUILD_TESTING=OFF \
+    -DYUZU_USE_BUNDLED_SDL2=OFF \
+    -DYUZU_USE_EXTERNAL_SDL2=ON \
    -DYUZU_TESTS=OFF \
-    -DDYNARMIC_TESTS=OFF \
    -DYUZU_CMD=OFF \
    -DYUZU_ROOM_STANDALONE=OFF \
-    -DYUZU_USE_QT_MULTIMEDIA=${USE_MULTIMEDIA:-false} \
-    -DYUZU_USE_QT_WEB_ENGINE=${USE_WEBENGINE:-false} \
+    -DYUZU_USE_QT_MULTIMEDIA=$MULTIMEDIA \
+    -DYUZU_USE_QT_WEB_ENGINE=$WEBENGINE \
    -DYUZU_ENABLE_LTO=ON \
-	-DCMAKE_EXE_LINKER_FLAGS=" /LTCG" \
-    -DDYNARMIC_ENABLE_LTO=ON \
-    -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \
-    -DUSE_CCACHE=${CCACHE:-false}  \
-    -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \
-    "${EXTRA_CMAKE_FLAGS[@]}" \
-    "$@"
+	  "${EXTRA_CMAKE_FLAGS[@]}"

 ninja

@@ -48,5 +62,4 @@ rm -f bin/*.pdb
 set -e

 $WINDEPLOYQT --release --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler --no-system-d3d-compiler --dir pkg bin/eden.exe
-
 cp bin/* pkg
--- a/.ci/windows/install-vulkan-sdk.ps1
+++ b/.ci/windows/install-vulkan-sdk.ps1
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+$ErrorActionPreference = "Stop"
+
+$VulkanSDKVer = "1.4.321.1"
+$ExeFile = "VulkanSDK-$VulkanSDKVer-Installer.exe"
+$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile"
+$Destination = "./$ExeFile"
+
+echo "Downloading Vulkan SDK $VulkanSDKVer from $Uri"
+$WebClient = New-Object System.Net.WebClient
+$WebClient.DownloadFile($Uri, $Destination)
+echo "Finished downloading $ExeFile"
+
+$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
+$Arguments = "--root `"$VULKAN_SDK`" --accept-licenses --default-answer --confirm-command install"
+
+echo "Installing Vulkan SDK $VulkanSDKVer"
+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments
+$ExitCode = $InstallProcess.ExitCode
+
+if ($ExitCode -ne 0) {
+    echo "Error installing Vulkan SDK $VulkanSDKVer (Error: $ExitCode)"
+    Exit $ExitCode
+}
+
+echo "Finished installing Vulkan SDK $VulkanSDKVer"
+
+if ("$env:GITHUB_ACTIONS" -eq "true") {
+    echo "VULKAN_SDK=$VULKAN_SDK" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    echo "$VULKAN_SDK/Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+}
--- a/.ci/windows/package.sh
+++ b/.ci/windows/package.sh
@@ -3,16 +3,11 @@ GITREV=$(git show -s --format='%h')

 ZIP_NAME="Eden-Windows-${ARCH}-${GITDATE}-${GITREV}.zip"

-ARTIFACTS_DIR="artifacts"
-PKG_DIR="build/pkg"
+mkdir -p artifacts
+mkdir -p pack

-mkdir -p "$ARTIFACTS_DIR"
+cp -r build/pkg/* pack

-TMP_DIR=$(mktemp -d)
+cp LICENSE* README* pack/

-cp -r "$PKG_DIR"/* "$TMP_DIR"/
-cp LICENSE* README* "$TMP_DIR"/
-
-7z a -tzip "$ARTIFACTS_DIR/$ZIP_NAME" "$TMP_DIR"/*
-
-rm -rf "$TMP_DIR"
+7z a -tzip artifacts/$ZIP_NAME pack/*
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Eden Discord
-    url: https://discord.gg/HstXbPch7X
+  - name: yuzu Discord
+    url: https://discord.com/invite/u77vRWY
+    about: If you are experiencing an issue with yuzu, and you need tech support, or if you have a general question, try asking in the official yuzu Discord linked here. Piracy is not allowed.
+  - name: Community forums
+    url: https://community.citra-emu.org
+    about: This is an alternative place for tech support, however helpers there are not as active.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,152 @@
+# TODO: This document needs to be formatted,
+# some stuff needs cleaned up etc
+name: eden-build
+
+#on:
+#  push:
+#    branches: [ "master" ]
+
+# TODO: combine build.yml into trigger_release.yml
+jobs:
+  source:
+    if: ${{ !github.head_ref }}
+    runs-on: source
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Pack
+        run: ./.ci/source.sh
+
+      - name: Upload
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: source.zip
+          path: artifacts/
+
+  windows:
+    runs-on: windows
+    strategy:
+      matrix:
+        target: ["msvc"] # TODO: Add msys2
+    defaults:
+      run:
+        shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
+    env:
+      CCACHE_DIR: ${{ runner.workspace }}/.cache/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: windows
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set up vcpkg cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/build/vcpkg_installed
+            ${{ github.workspace }}/build/externals
+            ${{ github.workspace }}/.vcpkg
+          key: ${{ runner.os }}-${{ matrix.target }}-vcpkg-${{ hashFiles('**/CMakeLists.txt', '**/vcpkg.json') }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-vcpkg-
+
+      - name: Set up MSVC
+        uses: https://github.com/ilammy/msvc-dev-cmd@v1
+        if: ${{ matrix.target == 'msvc' }}
+
+      - name: Cygwin with autoconf # NEEDED FOR LIBUSB
+        shell: cmd
+        run: ./.ci/windows/cygwin.bat
+
+      - name: Configure & Build
+        shell: bash
+        run: |
+          ./.ci/windows/qt-envvars.sh
+          DEVEL=true WINDEPLOYQT="/c/Qt/6.9.0/msvc2022_64/bin/windeployqt6.exe" .ci/windows/build.sh -DCMAKE_PREFIX_PATH=C:/Qt/6.9.0/msvc2022_64/lib/cmake/Qt6
+
+      - name: Package artifacts
+        shell: bash
+        run: |
+          ./.ci/windows/qt-envvars.sh
+          ./.ci/windows/package.sh
+
+      - name: Upload Windows artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: ${{ matrix.target }}.zip
+          path: artifacts/*
+
+  linux:
+    runs-on: linux
+    env:
+      CCACHE_DIR: /home/runner/.cache/ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: linux
+      TARGET: fresh
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Build
+        run: TARGET=appimage DEVEL=true ./.ci/linux/build.sh
+
+      - name: Package AppImage
+        run: DEVEL=true ./.ci/linux/package.sh &> /dev/null
+
+      - name: Upload Linux artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 3
+          name: linux.zip
+          path: ./*.AppImage
+
+  android:
+    runs-on: android
+
+    env:
+      OS: android
+      TARGET: universal
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set tag name
+        run: |
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+              echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          fi
+          echo $GIT_TAG_NAME
+
+      - name: Build
+        run: ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
+        env:
+          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+
+      - name: Package Android artifacts
+        run: ./.ci/android/package.sh
+
+      - name: Upload Android artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: android.zip
+          path: artifacts/*
--- a/.github/workflows/sources.yml
+++ b/.github/workflows/sources.yml
@@ -1,19 +0,0 @@
-name: tx-src
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  sources:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Push New Sources
-        run: |
-          export PATH=/usr/lib/qt6/bin:$PATH
-          ./tools/translations/qt-source.sh
-          tx-cli push -s
--- a/.github/workflows/strings.yml
+++ b/.github/workflows/strings.yml
@@ -1,22 +0,0 @@
-name: Check Strings
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  check-strings:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Find Unused Strings
-        run: ./tools/find-unused-strings.sh
-
-      - name: Find Stale Translations
-        run: ./tools/stale-translations.sh
-
-      - name: Diff
-        run: git --no-pager diff --exit-code HEAD
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -1,62 +0,0 @@
-name: tx-pull
-
-on:
-  # monday, wednesday, saturday at 2pm
-  schedule:
-    cron:
-      - '0 14 * * 1,3,6'
-  workflow_dispatch:
-
-jobs:
-  tx-update:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get New Translations
-        run: tx-cli pull -t -f
-
-      - name: Push branch
-        run: |
-          git config --local user.name "Eden CI"
-          git config --local user.email "ci@eden-emu.dev"
-          git config --local user.signingkey "D57652791BB25D2A"
-          git config --local push.autoSetupRemote true
-
-          git remote set-url origin ci:eden-emu/eden.git
-
-          TIMESTAMP=$(date +"%s")
-          echo "TIMESTAMP=$TIMESTAMP" >> "$GITHUB_ENV"
-
-          git switch -c update-translations-$TIMESTAMP
-          git add dist src/android/app/src/main/res
-
-          git commit -sS -m "[dist, android] Update translations from Transifex"
-          git push
-
-      - name: Create PR
-        run: |
-          DATE=$(date +"%b %d")
-          TITLE="[dist, android] Update translations from Transifex for $DATE"
-          BODY="Automatic translation update for $DATE"
-          BASE=master
-          HEAD=update-translations-$TIMESTAMP
-
-          cat << EOF > data.json
-          {
-            "base": "$BASE",
-            "body": "$BODY",
-            "head": "$HEAD",
-            "title": "$TITLE"
-          }
-          EOF
-
-          curl -X 'POST' \
-            'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
-            -H 'accept: application/json' \
-            -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \
-            -H 'Content-Type: application/json' \
-            -d "@data.json" --fail
-
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -0,0 +1,203 @@
+name: Build Application and Make Release
+
+#on:
+#  push:
+#    tags: [ "*" ]
+
+permissions:
+  contents: write
+
+jobs:
+  source:
+    runs-on: source
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Pack
+        run: ./.ci/source.sh
+      - name: Upload
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: source.zip
+          path: artifacts/
+
+  windows:
+    runs-on: windows
+    strategy:
+      matrix:
+        target: ["msvc"] # TODO: Add msys2
+    defaults:
+      run:
+        shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
+    env:
+      CCACHE_DIR: ${{ runner.workspace }}/.cache/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: windows
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set up vcpkg cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/build/vcpkg_installed
+            ${{ github.workspace }}/build/externals
+            ${{ github.workspace }}/.vcpkg
+          key: ${{ runner.os }}-${{ matrix.target }}-vcpkg-${{ hashFiles('**/CMakeLists.txt', '**/vcpkg.json') }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-vcpkg-
+
+      - name: Set up MSVC
+        uses: https://github.com/ilammy/msvc-dev-cmd@v1
+        if: ${{ matrix.target == 'msvc' }}
+
+      - name: Cygwin with autoconf # NEEDED FOR LIBUSB
+        shell: cmd
+        run: ./.ci/windows/cygwin.bat
+
+      - name: Configure & Build
+        shell: bash
+        run: DEVEL=false ./.ci/windows/build.sh
+
+      - name: Package artifacts
+        shell: bash
+        run: |
+          export PATH="${PATH}:/c/Qt/6.9.0/msvc2022_64/bin"
+          ./.ci/windows/package.sh
+
+      - name: Upload Windows artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: ${{ matrix.target }}.zip
+          path: artifacts/*
+
+  linux:
+    runs-on: linux
+    env:
+      CCACHE_DIR: /home/runner/.cache/ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: linux
+      TARGET: fresh
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Build
+        run: TARGET=appimage RELEASE=1 ./.ci/linux/build.sh v3 8
+
+      - name: Package AppImage
+        run: ./.ci/linux/package.sh v3 &> /dev/null
+
+      - name: Upload Linux artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: linux.zip
+          path: ./*.AppImage*
+
+  android:
+    runs-on: android
+
+    env:
+      CCACHE_DIR: /home/runner/.cache/ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: android
+      TARGET: universal
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set tag name
+        run: |
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+              echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          fi
+          echo $GIT_TAG_NAME
+
+      - name: Build
+        run: ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
+        env:
+          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+
+      - name: Package Android artifacts
+        run: ./.ci/android/package.sh
+
+      - name: Upload Android artifacts
+        uses: forgejo/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: android.zip
+          path: artifacts/*
+
+  create_release:
+    needs: [linux, windows, android]
+    runs-on: linux
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: 'recursive'
+          path: 'eden-source'
+
+      - name: Download artifacts
+        uses: forgejo/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Grab and store version
+        run: |
+          cd eden-source
+          tag_name=$(git describe --tags --abbrev=0)
+          echo "VERSION=$tag_name" >> $GITHUB_ENV
+          echo $tag_name
+
+      - name: Package artifacts properly
+        shell: bash
+        run: |
+          set -ex
+          mv ${{ github.workspace }}/eden-source eden-${{ env.VERSION }}
+          cd artifacts
+          ls *.zip
+
+          mkdir -p dist
+
+          cp linux.zip/Eden-*.AppImage dist/Eden-Linux-${{ env.VERSION }}-amd64.AppImage
+          cp linux.zip/Eden-*.AppImage.zsync dist/Eden-Linux-${{ env.VERSION }}-amd64.AppImage.zsync
+          cp msvc.zip/eden-windows-msvc*.zip dist/Eden-Windows-MSVC-${{ env.VERSION }}-amd64.zip
+          cp android.zip/eden-android*.apk dist/Eden-Android-${{ env.VERSION }}.apk
+          cp android.zip/eden-android*.aab dist/Eden-Android-${{ env.VERSION }}.aab
+          cp source.zip/eden-unified-source*.tar.xz dist/Eden-Source-${{ env.VERSION }}.tar.xz
+          cp source.zip/eden-unified-source*.tar.xz.sha256sum dist/Eden-Source-${{ env.VERSION }}.tar.xz.sha256sum
+
+      - name: Create release
+        id: create_release
+        uses: actions/forgejo-release@v2.6.0
+        with:
+          direction: upload
+          tag: ${{ env.VERSION }}
+          title: Eden ${{ env.VERSION }}
+          release-dir: artifacts/dist/
--- a/.gitignore
+++ b/.gitignore
@@ -7,16 +7,9 @@
 # Build directory
 /[Bb]uild*/
 doc-build/
-out/
 AppDir/
 uruntime

-# dtrace and ktrace stuffs
-[dk]trace-out/
-[dk]trace.out
-*.core
-log.txt
-
 # Generated source files
 src/common/scm_rev.cpp
 dist/english_plurals/generated_en.ts
@@ -37,8 +30,6 @@ CMakeLists.txt.user*
 # *nix related
 # Common convention for backup or temporary files
 *~
-*.core
-dtrace-out/

 # Visual Studio CMake settings
 CMakeSettings.json
@@ -61,5 +52,3 @@ Thumbs.db
 eden-windows-msvc
 artifacts
 *.AppImage*
-/install*
-vulkansdk*.exe
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,69 @@
+# SPDX-FileCopyrightText: 2014 Citra Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+[submodule "cubeb"]
+	path = externals/cubeb
+	url = https://github.com/mozilla/cubeb.git
+[submodule "libusb"]
+	path = externals/libusb/libusb
+	url = https://github.com/libusb/libusb.git
+[submodule "Vulkan-Headers"]
+	path = externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+[submodule "xbyak"]
+	path = externals/xbyak
+	url = https://github.com/Lizzie841/xbyak.git
+[submodule "opus"]
+	path = externals/opus
+	url = https://github.com/xiph/opus.git
+[submodule "SDL"]
+	path = externals/SDL
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "cpp-httplib"]
+	path = externals/cpp-httplib
+	url = https://github.com/yhirose/cpp-httplib.git
+[submodule "ffmpeg"]
+	path = externals/ffmpeg/ffmpeg
+	url = https://github.com/FFmpeg/FFmpeg.git
+[submodule "vcpkg"]
+	path = externals/vcpkg
+	url = https://github.com/microsoft/vcpkg.git
+[submodule "cpp-jwt"]
+	path = externals/cpp-jwt
+	url = https://github.com/arun11299/cpp-jwt.git
+[submodule "VulkanMemoryAllocator"]
+	path = externals/VulkanMemoryAllocator
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+[submodule "Vulkan-Utility-Libraries"]
+	path = externals/Vulkan-Utility-Libraries
+	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
+[submodule "externals/boost-headers"]
+	path = externals/boost-headers
+	url = https://github.com/boostorg/headers.git
+[submodule "externals/dynarmic/externals/catch"]
+	path = externals/dynarmic/externals/catch
+	url = https://github.com/catchorg/Catch2.git
+[submodule "externals/dynarmic/externals/fmt"]
+	path = externals/dynarmic/externals/fmt
+	url = https://github.com/fmtlib/fmt.git
+[submodule "externals/dynarmic/externals/unordered_dense"]
+	path = externals/dynarmic/externals/unordered_dense
+	url = https://github.com/Lizzie841/unordered_dense.git
+[submodule "externals/dynarmic/externals/xbyak"]
+	path = externals/dynarmic/externals/xbyak
+	url = https://github.com/Lizzie841/xbyak.git
+[submodule "externals/dynarmic/externals/zycore-c"]
+	path = externals/dynarmic/externals/zycore-c
+	url = https://github.com/zyantific/zycore-c.git
+[submodule "externals/dynarmic/externals/zydis"]
+	path = externals/dynarmic/externals/zydis
+	url = https://github.com/zyantific/zydis.git
+[submodule "externals/nx_tzdb/tzdb_to_nx/externals/tz/tz"]
+	path = externals/nx_tzdb/tzdb_to_nx/externals/tz/tz
+	url = https://github.com/eggert/tz.git
+[submodule "externals/sirit/externals/SPIRV-Headers"]
+	path = externals/sirit/externals/SPIRV-Headers
+	url = https://github.com/KhronosGroup/SPIRV-Headers.git
+[submodule "externals/SPIRV-Tools"]
+	path = externals/SPIRV-Tools
+	url = https://github.com/KhronosGroup/SPIRV-Tools.git
--- a/.patch/boost/0001-clang-cl.patch
+++ b/.patch/boost/0001-clang-cl.patch
@@ -1,13 +0,0 @@
-diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp
-index d49f2ec..a9bdb80 100644
--- a/libs/cobalt/include/boost/cobalt/concepts.hpp
-+++ b/libs/cobalt/include/boost/cobalt/concepts.hpp
-@@ -62,7 +62,7 @@ struct enable_awaitables
- template <typename T>
- concept with_get_executor = requires (T& t)
- {
-  {t.get_executor()} -> asio::execution::executor;
-+  t.get_executor();
- };
- 
- 
--- a/.patch/boost/0002-use-marmasm.patch
+++ b/.patch/boost/0002-use-marmasm.patch
@@ -1,11 +0,0 @@
--- a/libs/context/CMakeLists.txt	2025-09-08 00:42:31.303651800 -0400
-+++ b/libs/context/CMakeLists.txt	2025-09-08 00:42:40.592184300 -0400
-@@ -146,7 +146,7 @@
-       set(ASM_LANGUAGE ASM)
-     endif()
-   elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
-    set(ASM_LANGUAGE ASM_ARMASM)
-+    set(ASM_LANGUAGE ASM_MARMASM)
-   else()
-     set(ASM_LANGUAGE ASM_MASM)
-   endif()
--- a/.patch/boost/0003-armasm-options.patch
+++ b/.patch/boost/0003-armasm-options.patch
@@ -1,14 +0,0 @@
-diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
-index 8210f65..0e59dd7 100644
--- a/libs/context/CMakeLists.txt
-+++ b/libs/context/CMakeLists.txt
-@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
-       set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
-     endif()
- 
-  else() # masm
-+  # armasm doesn't support most of these options
-+  elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
-     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-       set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
-     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
--- a/.patch/catch2/0001-solaris-isnan-fix.patch
+++ b/.patch/catch2/0001-solaris-isnan-fix.patch
@@ -1,12 +0,0 @@
-diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp
-index fc7b444..0e1a3c2 100644
--- a/src/catch2/matchers/catch_matchers_floating_point.cpp
-+++ b/src/catch2/matchers/catch_matchers_floating_point.cpp
-@@ -5,6 +5,7 @@
- //        https://www.boost.org/LICENSE_1_0.txt)
- 
- // SPDX-License-Identifier: BSL-1.0
-+#include <catch2/internal/catch_polyfills.hpp>
- #include <catch2/matchers/catch_matchers_floating_point.hpp>
- #include <catch2/internal/catch_enforce.hpp>
- #include <catch2/internal/catch_polyfills.hpp>
--- a/.patch/glslang/0001-haikuos-fix.patch
+++ b/.patch/glslang/0001-haikuos-fix.patch
@@ -1,49 +0,0 @@
-diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
-index be7f442..5fd0438 100644
--- a/StandAlone/StandAlone.cpp
-+++ b/StandAlone/StandAlone.cpp
-@@ -1766,9 +1766,10 @@ int singleMain()
-         glslang::FinalizeProcess();
-     } else {
-         ShInitialize();
-+#ifndef __HAIKU__
-         ShInitialize();  // also test reference counting of users
-         ShFinalize();    // also test reference counting of users
-
-+#endif
-         bool printShaderNames = workList.size() > 1;
- 
-         if (Options & EOptionMultiThreaded) {
-@@ -1793,8 +1794,9 @@ int singleMain()
-                 PutsIfNonEmpty(WorkItems[w]->results.c_str());
-             }
-         }
-
-+#ifndef __HAIKU__
-         ShFinalize();
-+#endif
-     }
- 
-     if (CompileFailed.load())
-@@ -1809,8 +1811,10 @@ int C_DECL main(int argc, char* argv[])
- {
-     ProcessArguments(WorkItems, argc, argv);
- 
-+#ifdef __HAIKU__
-+    return singleMain();
-+#else
-     int ret = 0;
-
-     // Loop over the entire init/finalize cycle to watch memory changes
-     const int iterations = 1;
-     if (iterations > 1)
-@@ -1820,8 +1824,8 @@ int C_DECL main(int argc, char* argv[])
-         if (iterations > 1)
-             glslang::OS_DumpMemoryCounters();
-     }
-
-     return ret;
-+#endif
- }
- 
- //
--- a/.patch/httplib/0001-mingw.patch
+++ b/.patch/httplib/0001-mingw.patch
@@ -1,52 +0,0 @@
-From e1a946ffb79022d38351a0623f819a5419965c3e Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Fri, 24 Oct 2025 23:41:09 -0700
-Subject: [PATCH] [build] Fix MinGW missing GetAddrInfoExCancel definition
-
-MinGW does not define GetAddrInfoExCancel in its wstcpi whatever header,
-so to get around this we can just load it with GetProcAddress et al.
-
-Signed-off-by: crueter <crueter@eden-emu.dev>
---
- httplib.h | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/httplib.h b/httplib.h
-index e15ba44..90a76dc 100644
--- a/httplib.h
-+++ b/httplib.h
-@@ -203,11 +203,13 @@
- #error Sorry, Visual Studio versions prior to 2015 are not supported
- #endif
- 
-#pragma comment(lib, "ws2_32.lib")
-
- using ssize_t = __int64;
- #endif // _MSC_VER
- 
-+#if defined(_MSC_VER) || defined(__MINGW32__)
-+#pragma comment(lib, "ws2_32.lib")
-+#endif
-+
- #ifndef S_ISREG
- #define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
- #endif // S_ISREG
-@@ -3557,7 +3559,15 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service,
-     auto wait_result =
-         ::WaitForSingleObject(event, static_cast<DWORD>(timeout_sec * 1000));
-     if (wait_result == WAIT_TIMEOUT) {
-+#ifdef __MINGW32__
-+      typedef INT (WSAAPI *PFN_GETADDRINFOEXCANCEL)(HANDLE *CancelHandle);
-+      auto wsdll = LoadLibraryW((wchar_t*) "ws2_32.lib");
-+      PFN_GETADDRINFOEXCANCEL GetAddrInfoExCancel = (PFN_GETADDRINFOEXCANCEL) GetProcAddress(wsdll, "GetAddrInfoExCancel");
-+
-+      if (cancel_handle) { GetAddrInfoExCancel(&cancel_handle); }
-+#else
-       if (cancel_handle) { ::GetAddrInfoExCancel(&cancel_handle); }
-+#endif
-       ::CloseHandle(event);
-       return EAI_AGAIN;
-     }
-- 
-2.51.0
-
--- a/.patch/libadrenotools/0001-linkerns-cpm.patch
+++ b/.patch/libadrenotools/0001-linkerns-cpm.patch
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 16c6092..9e75548 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,14 @@ project(adrenotools LANGUAGES CXX C)
- 
- set(GEN_INSTALL_TARGET OFF CACHE BOOL "")
- 
-add_subdirectory(lib/linkernsbypass)
-+include(CPM)
-+set(CPM_USE_LOCAL_PACKAGES OFF)
-+
-+CPMAddPackage(
-+    NAME linkernsbypass
-+    URL "https://github.com/bylaws/liblinkernsbypass/archive/aa3975893d.zip"
-+    URL_HASH SHA512=43d3d146facb7ec99d066a9b8990369ab7b9eec0d5f9a67131b0a0744fde0af27d884ca1f2a272cd113718a23356530ed97703c8c0659c4c25948d50c106119e
-+)
- 
- set(LIB_SOURCES src/bcenabler.cpp
-                 src/driver.cpp
--- a/.patch/libusb/0001-netbsd-gettime.patch
+++ b/.patch/libusb/0001-netbsd-gettime.patch
@@ -1,25 +0,0 @@
-diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
-index a9a50b2..56e681b 100644
--- a/libusb/os/netbsd_usb.c
-+++ b/libusb/os/netbsd_usb.c
-@@ -580,6 +580,20 @@ _access_endpoint(struct libusb_transfer *transfer)
- 	return hpriv->endpoints[endpt];
- }
- 
-+void usbi_get_monotonic_time(struct timespec *tp) {
-+        struct timeval tv;
-+        gettimeofday(&tv, NULL);
-+        tp->tv_sec = tv.tv_sec;
-+        tp->tv_nsec = tv.tv_usec * 1000ull;
-+}
-+
-+void usbi_get_real_time(struct timespec *tp) {
-+	struct timeval tv;
-+	gettimeofday(&tv, NULL);
-+	tp->tv_sec = tv.tv_sec;
-+	tp->tv_nsec = tv.tv_usec * 1000ull;
-+}
-+
- int
- _sync_gen_transfer(struct usbi_transfer *itransfer)
- {
--- a/.patch/mbedtls/0001-aesni-fix.patch
+++ b/.patch/mbedtls/0001-aesni-fix.patch
@@ -1,35 +0,0 @@
-diff --git a/library/aesni.h b/library/aesni.h
-index 754c984c79..59e27afd3e 100644
--- a/library/aesni.h
-+++ b/library/aesni.h
-@@ -35,7 +35,7 @@
- /* GCC-like compilers: currently, we only support intrinsics if the requisite
-  * target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
-  * or `clang -maes -mpclmul`). */
-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
-+#if defined(__GNUC__) || defined(__clang__)
- #define MBEDTLS_AESNI_HAVE_INTRINSICS
- #endif
- /* For 32-bit, we only support intrinsics */
-diff --git a/library/aesni.c b/library/aesni.c
-index 2857068..3e104ab 100644
--- a/library/aesni.c
-+++ b/library/aesni.c
-@@ -31,16 +31,14 @@
- #include <immintrin.h>
- #endif
- 
-#if defined(MBEDTLS_ARCH_IS_X86)
- #if defined(MBEDTLS_COMPILER_IS_GCC)
- #pragma GCC push_options
- #pragma GCC target ("pclmul,sse2,aes")
- #define MBEDTLS_POP_TARGET_PRAGMA
-#elif defined(__clang__) && (__clang_major__ >= 5)
-+#elif defined(__clang__)
- #pragma clang attribute push (__attribute__((target("pclmul,sse2,aes"))), apply_to=function)
- #define MBEDTLS_POP_TARGET_PRAGMA
- #endif
-#endif
- 
- #if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
- /*
--- a/.patch/mbedtls/0002-arm64-aes-fix.patch
+++ b/.patch/mbedtls/0002-arm64-aes-fix.patch
@@ -1,20 +0,0 @@
-diff --git a/library/common.h b/library/common.h
-index 50f2a29..c60d9dc 100644
--- a/library/common.h
-+++ b/library/common.h
-@@ -19,11 +19,11 @@
- #include <stdint.h>
- #include <stddef.h>
- 
-#if defined(__ARM_NEON)
-#include <arm_neon.h>
-+#if defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
-+#include <arm64_neon.h.h>
- #define MBEDTLS_HAVE_NEON_INTRINSICS
-#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
-#include <arm64_neon.h>
-+#elif defined(__ANDROID__) || defined(__ARM_NEON)
-+#include <arm_neon.h>
- #define MBEDTLS_HAVE_NEON_INTRINSICS
- #endif
- 
--- a/.patch/mcl/0001-assert-macro.patch
+++ b/.patch/mcl/0001-assert-macro.patch
@@ -1,55 +0,0 @@
-diff --git a/include/mcl/assert.hpp b/include/mcl/assert.hpp
-index f77dbe7..9ec0b9c 100644
--- a/include/mcl/assert.hpp
-+++ b/include/mcl/assert.hpp
-@@ -23,8 +23,11 @@ template<typename... Ts>
-
- }  // namespace mcl::detail
-
-+#ifndef UNREACHABLE
- #define UNREACHABLE() ASSERT_FALSE("Unreachable code!")
-+#endif
-
-+#ifndef ASSERT
- #define ASSERT(expr)                                                     \
-     [&] {                                                                \
-         if (std::is_constant_evaluated()) {                              \
-@@ -37,7 +40,9 @@ template<typename... Ts>
-             }                                                            \
-         }                                                                \
-     }()
-+#endif
-
-+#ifndef ASSERT_MSG
- #define ASSERT_MSG(expr, ...)                                                \
-     [&] {                                                                    \
-         if (std::is_constant_evaluated()) {                                  \
-@@ -50,13 +55,24 @@ template<typename... Ts>
-             }                                                                \
-         }                                                                    \
-     }()
-+#endif
-
-+#ifndef ASSERT_FALSE
- #define ASSERT_FALSE(...) ::mcl::detail::assert_terminate("false", __VA_ARGS__)
-+#endif
-
- #if defined(NDEBUG) || defined(MCL_IGNORE_ASSERTS)
-#    define DEBUG_ASSERT(expr) ASSUME(expr)
-#    define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
-+#    ifndef DEBUG_ASSERT
-+#        define DEBUG_ASSERT(expr) ASSUME(expr)
-+#    endif
-+#    ifndef DEBUG_ASSERT_MSG
-+#        define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
-+#    endif
- #else
-#    define DEBUG_ASSERT(expr) ASSERT(expr)
-#    define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
-+#    ifndef DEBUG_ASSERT
-+#        define DEBUG_ASSERT(expr) ASSERT(expr)
-+#    endif
-+#    ifndef DEBUG_ASSERT_MSG
-+#        define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
-+#    endif
- #endif
--- a/.patch/quazip/0001-strict.patch
+++ b/.patch/quazip/0001-strict.patch
@@ -0,0 +1,80 @@
+diff --git a/quazip/quazipdir.cpp b/quazip/quazipdir.cpp
+index d43f1c1..eb24bf1 100644
+--- a/quazip/quazipdir.cpp
+++ b/quazip/quazipdir.cpp
+@@ -293,8 +293,8 @@ bool QuaZipDirComparator::operator()(const QuaZipFileInfo64 &info1,
+ }
+ 
+ template<typename TFileInfoList>
+-bool QuaZipDirPrivate::entryInfoList(QStringList nameFilters,
+-    QDir::Filters filter, QDir::SortFlags sort, TFileInfoList &result) const
+bool QuaZipDirPrivate::entryInfoList(QStringList _nameFilters,
+    QDir::Filters _filter, QDir::SortFlags sort, TFileInfoList &result) const
+ {
+     QString basePath = simplePath();
+     if (!basePath.isEmpty())
+@@ -305,12 +305,12 @@ bool QuaZipDirPrivate::entryInfoList(QStringList nameFilters,
+     if (!zip->goToFirstFile()) {
+         return zip->getZipError() == UNZ_OK;
+     }
+-    QDir::Filters fltr = filter;
+    QDir::Filters fltr = _filter;
+     if (fltr == QDir::NoFilter)
+         fltr = this->filter;
+     if (fltr == QDir::NoFilter)
+         fltr = QDir::AllEntries;
+-    QStringList nmfltr = nameFilters;
+    QStringList nmfltr = _nameFilters;
+     if (nmfltr.isEmpty())
+         nmfltr = this->nameFilters;
+     QSet<QString> dirsFound;
+diff --git a/quazip/quazipfile.cpp b/quazip/quazipfile.cpp
+index 4a5f2f9..f7865f5 100644
+--- a/quazip/quazipfile.cpp
+++ b/quazip/quazipfile.cpp
+@@ -241,14 +241,14 @@ void QuaZipFile::setFileName(const QString& fileName, QuaZip::CaseSensitivity cs
+   p->caseSensitivity=cs;
+ }
+ 
+-void QuaZipFilePrivate::setZipError(int zipError) const
+void QuaZipFilePrivate::setZipError(int _zipError) const
+ {
+   QuaZipFilePrivate *fakeThis = const_cast<QuaZipFilePrivate*>(this); // non-const
+-  fakeThis->zipError=zipError;
+-  if(zipError==UNZ_OK)
+  fakeThis->zipError = _zipError;
+  if(_zipError == UNZ_OK)
+     q->setErrorString(QString());
+   else
+-    q->setErrorString(QuaZipFile::tr("ZIP/UNZIP API error %1").arg(zipError));
+    q->setErrorString(QuaZipFile::tr("ZIP/UNZIP API error %1").arg(_zipError));
+ }
+ 
+ bool QuaZipFile::open(OpenMode mode)
+diff --git a/quazip/unzip.c b/quazip/unzip.c
+index a39365d..ee7b487 100644
+--- a/quazip/unzip.c
+++ b/quazip/unzip.c
+@@ -1054,7 +1054,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+             /* ZIP64 extra fields */
+             if (headerId == 0x0001)
+             {
+-                uLong uL;
+                uLong _uL;
+ 
+                 if(file_info.uncompressed_size == (ZPOS64_T)0xFFFFFFFFu)
+                 {
+@@ -1078,7 +1078,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                 if(file_info.disk_num_start == 0xFFFFFFFFu)
+                 {
+                     /* Disk Start Number */
+-                    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream, &_uL) != UNZ_OK)
+                         err=UNZ_ERRNO;
+                 }
+ 
+@@ -2151,3 +2151,4 @@ int ZEXPORT unzClearFlags(unzFile file, unsigned flags)
+     s->flags &= ~flags;
+     return UNZ_OK;
+ }
+
--- a/.patch/quazip/0002-oldstyle.patch
+++ b/.patch/quazip/0002-oldstyle.patch
@@ -0,0 +1,26 @@
+diff --git a/quazip/minizip_crypt.h b/quazip/minizip_crypt.h
+index 2e833f7..ea9d277 100644
+--- a/quazip/minizip_crypt.h
+++ b/quazip/minizip_crypt.h
+@@ -90,13 +90,14 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t FAR
+ #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+ #  endif
+ 
+-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
+-    const char *passwd;         /* password string */
+-    unsigned char *buf;         /* where to write header */
+-    int bufSize;
+-    unsigned long* pkeys;
+-    const z_crc_t FAR * pcrc_32_tab;
+-    unsigned long crcForCrypting;
+static int crypthead(
+    const char *passwd,         /* password string */
+    unsigned char *buf,         /* where to write header */
+    int bufSize,
+    unsigned long* pkeys,
+    const z_crc_t FAR * pcrc_32_tab,
+    unsigned long crcForCrypting
+)
+ {
+     int n;                       /* index in random header */
+     int t;                       /* temporary */
--- a/.patch/quazip/0003-predecls.patch
+++ b/.patch/quazip/0003-predecls.patch
@@ -0,0 +1,19 @@
+diff --git a/quazip/zip.c b/quazip/zip.c
+index 7788b88..f4e21aa 100644
+--- a/quazip/zip.c
+++ b/quazip/zip.c
+@@ -645,6 +645,14 @@ local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
+   return relativeOffset;
+ }
+ 
+// compilers hate this ONE SIMPLE TRICK!
+static int LoadCentralDirectoryRecord(zip64_internal* pziinit);
+static int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local, uLong version_to_extract);
+static int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip);
+static int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip);
+static int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip);
+static int Write_GlobalComment(zip64_internal* zi, const char* global_comment);
+
+ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+ {
+   int err=ZIP_OK;
--- a/.patch/quazip/0004-qt6-only.patch
+++ b/.patch/quazip/0004-qt6-only.patch
@@ -0,0 +1,400 @@
+"Debloats" QuaZip by removing some unneeded stuff (Qt <6, bzip2, emscripten...)
+
+This is completely optional.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b376fb2..4aac4ec 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -3,64 +3,16 @@ cmake_minimum_required(VERSION 3.15...3.18)
+
+ project(QuaZip VERSION 1.5)
+
+-include(cmake/clone-repo.cmake)
+-
+ set(QUAZIP_LIB_VERSION ${QuaZip_VERSION})
+ set(QUAZIP_LIB_SOVERSION 1.5.0)
+
+-if(EMSCRIPTEN)
+-  #option(ZLIB_INCLUDE "Path to include dir" "")
+-  #option(ZLIB_LIBRARY "Path to library dir" "")
+-  option(BUILD_SHARED_LIBS "" OFF)
+-  option(QUAZIP_INSTALL "" OFF)
+-  option(QUAZIP_USE_QT_ZLIB "" OFF)
+-  option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+-else()
+-  option(BUILD_SHARED_LIBS "" ON)
+-  option(QUAZIP_INSTALL "" ON)
+-  option(QUAZIP_USE_QT_ZLIB "" OFF)
+-  option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+-endif()
+option(BUILD_SHARED_LIBS "" ON)
+option(QUAZIP_INSTALL "" ON)
+option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+
+ OPTION(ZLIB_CONST "Sets ZLIB_CONST preprocessor definition" OFF)
+
+-# Make BZIP2 optional
+-option(QUAZIP_BZIP2 "Enables BZIP2 compression" ON)
+-option(QUAZIP_BZIP2_STDIO "Output BZIP2 errors to stdio" ON)
+-
+-option(QUAZIP_FETCH_LIBS "Enables fetching third-party libraries if not found" ${WIN32})
+-option(QUAZIP_FORCE_FETCH_LIBS "Enables fetching third-party libraries always" OFF)
+-
+-if (QUAZIP_USE_QT_ZLIB AND BUILD_SHARED_LIBS)
+-    message(FATAL_ERROR "Using BUILD_SHARED_LIBS=ON together with QUAZIP_USE_QT_ZLIB=ON is not supported." )
+-endif()
+-
+-# Set the default value of `${QUAZIP_QT_MAJOR_VERSION}`.
+-# We search quietly for Qt6, Qt5 and Qt4 in that order.
+-# Qt6 and Qt5 provide config files for CMake.
+-# Qt4 relies on `FindQt4.cmake`.
+-find_package(
+-  QT NAMES Qt6 Qt5
+-  QUIET COMPONENTS Core
+-)
+-if (NOT QT_FOUND)
+-  find_package(Qt4 QUIET COMPONENTS QtCore)
+-  if (Qt4_FOUND)
+-    set(QT_VERSION_MAJOR 4)
+-  else()
+-    # If neither 6, 5 nor 4 are found, we default to 5.
+-    # The setup will fail further down.
+-    set(QT_VERSION_MAJOR 5)
+-  endif()
+-endif()
+-
+-set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}")
+-
+-if (QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-    set(CMAKE_CXX_STANDARD 17)
+-else()
+-    set(CMAKE_CXX_STANDARD 14)
+-endif()
+set(CMAKE_CXX_STANDARD 17)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE RELEASE)
+@@ -77,92 +29,17 @@ set(QUAZIP_LIB_TARGET_NAME QuaZip)
+ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+
+-message(STATUS "QUAZIP_QT_MAJOR_VERSION set to ${QUAZIP_QT_MAJOR_VERSION}")
+-message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+-
+-if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-    find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+-            OPTIONAL_COMPONENTS Network Test)
+-    message(STATUS "Found Qt version ${Qt6_VERSION} at ${Qt6_DIR}")
+-    set(QUAZIP_QT_ZLIB_COMPONENT BundledZLIB)
+-    set(QUAZIP_QT_ZLIB_HEADER_COMPONENT ZlibPrivate)
+-    set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+-    set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+-    set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
+-elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+-    find_package(Qt5 REQUIRED COMPONENTS Core
+-            OPTIONAL_COMPONENTS Network Test)
+-    message(STATUS "Found Qt version ${Qt5_VERSION} at ${Qt5_DIR}")
+-    set(QUAZIP_QT_ZLIB_COMPONENT Zlib)
+-    set(QUAZIP_LIB_LIBRARIES Qt5::Core)
+-    set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+-    set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
+-elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+-    find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+-            OPTIONAL_COMPONENTS QtNetwork QtTest)
+-    set(QUAZIP_QT_ZLIB_COMPONENT Zlib)
+-    set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
+-    set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+-    set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
+-else()
+-	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+-endif()
+-
+-message(STATUS "Using Qt version ${QUAZIP_QT_MAJOR_VERSION}")
+-
+-set(QUAZIP_QT_ZLIB_USED OFF)
+-if(QUAZIP_USE_QT_ZLIB)
+-    find_package(Qt${QUAZIP_QT_MAJOR_VERSION} OPTIONAL_COMPONENTS ${QUAZIP_QT_ZLIB_COMPONENT})
+-    set(QUAZIP_QT_ZLIB_COMPONENT_FOUND Qt${QUAZIP_QT_MAJOR_VERSION}${QUAZIP_QT_ZLIB_COMPONENT}_FOUND)
+-    if (DEFINED QUAZIP_QT_ZLIB_HEADER_COMPONENT)
+-        find_package(Qt${QUAZIP_QT_MAJOR_VERSION} OPTIONAL_COMPONENTS ${QUAZIP_QT_ZLIB_HEADER_COMPONENT})
+-        set(QUAZIP_QT_ZLIB_HEADER_COMPONENT_FOUND Qt${QUAZIP_QT_MAJOR_VERSION}${QUAZIP_QT_ZLIB_HEADER_COMPONENT}_FOUND)
+-    else()
+-        set(QUAZIP_QT_ZLIB_HEADER_COMPONENT_FOUND ON)
+-    endif()
+-    if(QUAZIP_QT_ZLIB_COMPONENT_FOUND AND QUAZIP_QT_ZLIB_HEADER_COMPONENT_FOUND)
+-        message(STATUS "Qt component ${QUAZIP_QT_ZLIB_COMPONENT} found")
+-        set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} Qt${QUAZIP_QT_MAJOR_VERSION}::${QUAZIP_QT_ZLIB_COMPONENT})
+-        if(DEFINED QUAZIP_QT_ZLIB_HEADER_COMPONENT)
+-            message(STATUS "Qt component ${QUAZIP_QT_ZLIB_HEADER_COMPONENT} found")
+-            set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} Qt${QUAZIP_QT_MAJOR_VERSION}::${QUAZIP_QT_ZLIB_HEADER_COMPONENT})
+-        endif()
+-        set(QUAZIP_QT_ZLIB_USED ON)
+-    else()
+-        message(FATAL_ERROR "QUAZIP_USE_QT_ZLIB was set but bundled zlib was not found. Terminating to prevent accidental linking to system libraries.")
+-    endif()
+-endif()
+-
+-if(QUAZIP_QT_ZLIB_USED AND QUAZIP_QT_ZLIB_COMPONENT STREQUAL BundledZLIB)
+-  # Qt's new BundledZLIB uses z-prefix in zlib
+-  add_compile_definitions(Z_PREFIX)
+-endif()
+-
+-if(NOT QUAZIP_QT_ZLIB_USED)
+-
+-    if(EMSCRIPTEN)
+-      if(NOT DEFINED ZLIB_LIBRARY)
+-        message(WARNING "ZLIB_LIBRARY is not set")
+-      endif()
+find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+        OPTIONAL_COMPONENTS Network Test)
+message(STATUS "Found Qt version ${Qt6_VERSION} at ${Qt6_DIR}")
+set(QUAZIP_QT_ZLIB_COMPONENT BundledZLIB)
+set(QUAZIP_QT_ZLIB_HEADER_COMPONENT ZlibPrivate)
+set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
+
+-      if(NOT DEFINED ZLIB_INCLUDE)
+-        message(WARNING "ZLIB_INCLUDE is not set")
+-      else()
+-        include_directories(${ZLIB_INCLUDE})
+-      endif()
+-
+-      if(NOT DEFINED ZCONF_INCLUDE)
+-        message(WARNING "ZCONF_INCLUDE is not set")
+-      else()
+-        include_directories(${ZCONF_INCLUDE})
+-      endif()
+-
+-      set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ${ZLIB_LIBRARY})
+-    else()
+-      find_package(ZLIB REQUIRED)
+-      set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+-    endif()
+-endif()
+find_package(ZLIB REQUIRED)
+set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+
+ if (ZLIB_CONST)
+     add_compile_definitions(ZLIB_CONST)
+@@ -173,65 +50,4 @@ set(QUAZIP_INC)
+ set(QUAZIP_LIB)
+ set(QUAZIP_LBD)
+
+-if(QUAZIP_BZIP2)
+-    # Check if bzip2 is present
+-    set(QUAZIP_BZIP2 ON)
+-
+-    if(NOT QUAZIP_FORCE_FETCH_LIBS)
+-        find_package(BZip2 QUIET)
+-    endif()
+-
+-    if(BZIP2_FOUND AND NOT QUAZIP_FORCE_FETCH_LIBS)
+-        message(STATUS "Using BZIP2 ${BZIP2_VERSION_STRING}")
+-
+-        list(APPEND QUAZIP_INC ${BZIP2_INCLUDE_DIRS})
+-        list(APPEND QUAZIP_LIB ${BZIP2_LIBRARIES})
+-        list(APPEND QUAZIP_LBD ${BZIP2_LIBRARY_DIRS})
+-
+-        set(PC_PRIVATE_LIBS "${PC_PRIVATE_LIBS} -lbzip2")
+-    elseif(QUAZIP_FETCH_LIBS)
+-        clone_repo(bzip2 https://sourceware.org/git/bzip2.git)
+-
+-        # BZip2 repository does not support cmake so we have to create
+-        # the bzip2 library ourselves
+-        set(BZIP2_SRC
+-            ${BZIP2_SOURCE_DIR}/blocksort.c
+-            ${BZIP2_SOURCE_DIR}/bzlib.c
+-            ${BZIP2_SOURCE_DIR}/compress.c
+-            ${BZIP2_SOURCE_DIR}/crctable.c
+-            ${BZIP2_SOURCE_DIR}/decompress.c
+-            ${BZIP2_SOURCE_DIR}/huffman.c
+-            ${BZIP2_SOURCE_DIR}/randtable.c)
+-
+-        set(BZIP2_HDR
+-            ${BZIP2_SOURCE_DIR}/bzlib.h
+-            ${BZIP2_SOURCE_DIR}/bzlib_private.h)
+-
+-        add_library(bzip2 STATIC ${BZIP2_SRC} ${BZIP2_HDR})
+-
+-        if(NOT QUAZIP_BZIP2_STDIO)
+-            target_compile_definitions(bzip2 PRIVATE -DBZ_NO_STDIO)
+-        endif()
+-
+-        list(APPEND QUAZIP_DEP bzip2)
+-        list(APPEND QUAZIP_LIB bzip2)
+-        list(APPEND QUAZIP_INC ${BZIP2_SOURCE_DIR})
+-    else()
+-        message(STATUS "BZip2 library not found")
+-
+-        set(QUAZIP_BZIP2 OFF)
+-    endif()
+-
+-    if(QUAZIP_BZIP2)
+-        find_package(BZip2)
+-        add_compile_definitions(HAVE_BZIP2)
+-    endif()
+-endif()
+-
+ add_subdirectory(quazip)
+-
+-if(QUAZIP_ENABLE_TESTS)
+-    message(STATUS "Building QuaZip tests")
+-    enable_testing()
+-    add_subdirectory(qztest)
+-endif()
+diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
+index 6cfdf4e..66bc4cb 100644
+--- a/quazip/CMakeLists.txt
+++ b/quazip/CMakeLists.txt
+@@ -46,10 +46,6 @@ set(QUAZIP_INCLUDE_PATH ${QUAZIP_DIR_NAME}/quazip)
+ set(QUAZIP_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
+ set(QUAZIP_PKGCONFIG_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSION})
+
+-if(EMSCRIPTEN)
+-    set(BUILD_SHARED_LIBS OFF)
+-endif()
+-
+ add_library(${QUAZIP_LIB_TARGET_NAME} ${QUAZIP_SOURCES})
+ add_library(QuaZip::QuaZip ALIAS ${QUAZIP_LIB_TARGET_NAME})
+
+diff --git a/quazip/quazip_qt_compat.h b/quazip/quazip_qt_compat.h
+index 0dde011..41f9dd1 100644
+--- a/quazip/quazip_qt_compat.h
+++ b/quazip/quazip_qt_compat.h
+@@ -14,16 +14,11 @@
+
+ // Legacy encodings are still everywhere, but the Qt team decided we
+ // don't need them anymore and moved them out of Core in Qt 6.
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+-#  include <QtCore5Compat/QTextCodec>
+-#else
+-#  include <QtCore/QTextCodec>
+-#endif
+#include <QtCore5Compat/QTextCodec>
+
+ // QSaveFile terribly breaks the is-a idiom (Liskov substitution principle):
+ // QSaveFile is-a QIODevice, but it makes close() private and aborts
+ // if you call it through the base class. Hence this ugly hack:
+-#if (QT_VERSION >= 0x050100)
+ #include <QtCore/QSaveFile>
+ inline bool quazip_close(QIODevice *device) {
+     QSaveFile *file = qobject_cast<QSaveFile*>(device);
+@@ -34,74 +29,35 @@ inline bool quazip_close(QIODevice *device) {
+     device->close();
+     return true;
+ }
+-#else
+-inline bool quazip_close(QIODevice *device) {
+-    device->close();
+-    return true;
+-}
+-#endif
+
+-// this is yet another stupid move and deprecation
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+ using Qt::SkipEmptyParts;
+-#else
+-#include <QtCore/QString>
+-const auto SkipEmptyParts = QString::SplitBehavior::SkipEmptyParts;
+-#endif
+
+ // and yet another... (why didn't they just make qSort delegate to std::sort?)
+ #include <QtCore/QList>
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+ #include <algorithm>
+ template<typename T, typename C>
+ inline void quazip_sort(T begin, T end, C comparator) {
+     std::sort(begin, end, comparator);
+ }
+-#else
+-#include <QtCore/QtAlgorithms>
+-template<typename T, typename C>
+-inline void quazip_sort(T begin, T end, C comparator) {
+-    qSort(begin, end, comparator);
+-}
+-#endif
+
+ // this is a stupid rename...
+ #include <QtCore/QDateTime>
+ #include <QtCore/QFileInfo>
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+ inline QDateTime quazip_ctime(const QFileInfo &fi) {
+     return fi.birthTime();
+ }
+-#else
+-inline QDateTime quazip_ctime(const QFileInfo &fi) {
+-    return fi.created();
+-}
+-#endif
+
+ // this is just a slightly better alternative
+ #include <QtCore/QFileInfo>
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+ inline bool quazip_is_symlink(const QFileInfo &fi) {
+     return fi.isSymbolicLink();
+ }
+-#else
+-inline bool quazip_is_symlink(const QFileInfo &fi) {
+-    // also detects *.lnk on Windows, but better than nothing
+-    return fi.isSymLink();
+-}
+-#endif
+
+ // I'm not even sure what this one is, but nevertheless
+ #include <QtCore/QFileInfo>
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+ inline QString quazip_symlink_target(const QFileInfo &fi) {
+     return fi.symLinkTarget();
+ }
+-#else
+-inline QString quazip_symlink_target(const QFileInfo &fi) {
+-    return fi.readLink(); // What's the difference? I've no idea.
+-}
+-#endif
+
+ // deprecation
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+@@ -125,40 +81,19 @@ inline QDateTime quazip_since_epoch_ntfs() {
+
+ // this is not a deprecation but an improvement, for a change
+ #include <QtCore/QDateTime>
+-#if (QT_VERSION >= 0x040700)
+ inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
+     QDateTime base = quazip_since_epoch_ntfs();
+     return base.msecsTo(time) * 10000 + fineTicks;
+ }
+-#else
+-inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
+-    QDateTime base = quazip_since_epoch_ntfs();
+-    QDateTime utc = time.toUTC();
+-    return (static_cast<qint64>(base.date().daysTo(utc.date()))
+-            * Q_INT64_C(86400000)
+-            + static_cast<qint64>(base.time().msecsTo(utc.time())))
+-        * Q_INT64_C(10000) + fineTicks;
+-}
+-#endif
+
+ // yet another improvement...
+ #include <QtCore/QDateTime>
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) // Yay! Finally a way to get time as qint64!
+ inline qint64 quazip_to_time64_t(const QDateTime &time) {
+     return time.toSecsSinceEpoch();
+ }
+-#else
+-inline qint64 quazip_to_time64_t(const QDateTime &time) {
+-    return static_cast<qint64>(time.toTime_t()); // 32 bits only, but better than nothing
+-}
+-#endif
+
+ #include <QtCore/QTextStream>
+-// and another stupid move
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+ const auto quazip_endl = Qt::endl;
+-#else
+-const auto quazip_endl = endl;
+-#endif
+
+ #endif // QUAZIP_QT_COMPAT_H
+
--- a/.patch/spirv-tools/0001-netbsd-fix.patch
+++ b/.patch/spirv-tools/0001-netbsd-fix.patch
@@ -1,14 +0,0 @@
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index eb4e69e..3155805 100644
--- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -72,7 +72,8 @@ if (SPIRV_TOOLS_USE_MIMALLOC)
-   pop_variable(MI_BUILD_TESTS)
- endif()
- 
-if (DEFINED SPIRV-Headers_SOURCE_DIR)
-+# NetBSD doesn't have SPIRV-Headers readily available on system
-+if (DEFINED SPIRV-Headers_SOURCE_DIR AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
-   # This allows flexible position of the SPIRV-Headers repo.
-   set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR})
- else()
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -14,11 +14,11 @@ License: GPL-2.0-or-later

 Files: dist/qt_themes/default/icons/256x256/eden.png
       dist/yuzu.bmp
-       dist/eden.icns
+       dist/yuzu.icns
       dist/eden.ico
-       dist/dev.eden_emu.eden.svg
-Copyright: 2025 Eden Emulator Project
-License: GPL-3.0-or-later
+       dist/eden.svg
+Copyright: yuzu Emulator Project
+License: GPL-2.0-or-later

 Files: dist/qt_themes/qdarkstyle*/LICENSE.*
       dist/qt_themes/qdarkstyle*/style.qrc
@@ -128,6 +128,10 @@ Copyright: 2020-2021 Its-Rei <kupfel@gmail.com>
           2020-2021 yuzu Emulator Project
 License: GPL-2.0-or-later

+Files: vcpkg.json
+Copyright: 2022 yuzu Emulator Project
+License: GPL-3.0-or-later
+
 Files: .github/ISSUE_TEMPLATE/*
 Copyright: 2022 yuzu Emulator Project
 License: GPL-2.0-or-later
@@ -155,39 +159,3 @@ License: BSD-3-Clause
 Files: src/android/app/debug.keystore
 Copyright: 2023 yuzu Emulator Project
 License: GPL-3.0-or-later
-
-Files: dist/qt_themes/colorful/icons/48x48/user-trash.png
-       dist/qt_themes/colorful/icons/48x48/upload.png
-       dist/qt_themes/colorful/icons/48x48/download.png
-Copyright: 2014 Uri Herrera
-           1996-2025 KDE Software Foundation
-License: LGPL-2.0-or-later
-
-Files: dist/qt_themes/default/icons/48x48/user-trash.png
-       dist/qt_themes/default/icons/48x48/upload.png
-       dist/qt_themes/default/icons/48x48/download.png
-       dist/qt_themes/default_dark/icons/48x48/user-trash.png
-       dist/qt_themes/default_dark/icons/48x48/upload.png
-       dist/qt_themes/default_dark/icons/48x48/download.png
-Copyright: 2025 Fonticons, Inc.
-License: CC-BY-4.0
-Comment: All of these icons have been modified by crueter <crueter@crueter.xyz>
-
-Files: CMakeModules/CPM.cmake
-Copyright: 2019-2023 Lars Melchior
-License: MIT
-
-Files: CMakeModules/CPMUtil.cmake
-       CMakeModules/CPM.cmake
-       CMakeModules/GetSCMRev.cmake
-       CMakeModules/DetectArchitecture.cmake
-       tools/cpm/*
-       tools/update-cpm.sh
-       tools/shellcheck.sh
-       docs/CPMUtil.md
-       **cpmfile.json
-Copyright: 2025 crueter <crueter@crueter.xyz>
-License: GPL-3.0-or-later
-Comment: CPM.cmake has had additional modifications from crueter to better work with CPMUtil
-         https://git.crueter.xyz/CMake/CPMUtil
-         https://git.crueter.xyz/CMake/Modules
--- a/.shellcheckrc
+++ b/.shellcheckrc
@@ -1 +0,0 @@
-shell=sh
--- a/.tx/config
+++ b/.tx/config
@@ -1,21 +0,0 @@
-[main]
-host = https://app.transifex.com
-
-[o:edenemu:p:eden-emulator:r:android-translations]
-file_filter            = src/android/app/src/main/res/values-<lang>/strings.xml
-source_file            = src/android/app/src/main/res/values/strings.xml
-type                   = ANDROID
-minimum_perc           = 0
-resource_name          = Android Translations
-replace_edited_strings = false
-keep_translations      = false
-lang_map = zh_CN: zh-rCN, zh_TW: zh-rTW, pt_BR: pt-rBR, pt_PT: pt-rPT, vi_VN: vi, ku: ckb, ja_JP: ja, ko_KR: ko, ru_RU: ru
-
-[o:edenemu:p:eden-emulator:r:qt-translations]
-file_filter            = dist/languages/<lang>.ts
-source_file            = dist/languages/en.ts
-type                   = QT
-minimum_perc           = 0
-resource_name          = Qt Translations
-replace_edited_strings = false
-keep_translations      = false
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CMakeModules/CPM.cmake
+++ b/CMakeModules/CPM.cmake
--- a/CMakeModules/CPMUtil.cmake
+++ b/CMakeModules/CPMUtil.cmake
@@ -1,641 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-if (MSVC OR ANDROID)
-    set(BUNDLED_DEFAULT ON)
-else()
-    set(BUNDLED_DEFAULT OFF)
-endif()
-
-option(CPMUTIL_FORCE_BUNDLED
-    "Force bundled packages for all CPM depdendencies" ${BUNDLED_DEFAULT})
-
-option(CPMUTIL_FORCE_SYSTEM
-    "Force system packages for all CPM dependencies (NOT RECOMMENDED)" OFF)
-
-cmake_minimum_required(VERSION 3.22)
-include(CPM)
-
-# cpmfile parsing
-set(CPMUTIL_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json")
-
-if (EXISTS ${CPMUTIL_JSON_FILE})
-    file(READ ${CPMUTIL_JSON_FILE} CPMFILE_CONTENT)
-else()
-    message(WARNING "[CPMUtil] cpmfile ${CPMUTIL_JSON_FILE} does not exist, AddJsonPackage will be a no-op")
-endif()
-
-# Utility stuff
-function(cpm_utils_message level name message)
-    message(${level} "[CPMUtil] ${name}: ${message}")
-endfunction()
-
-function(array_to_list array length out)
-    math(EXPR range "${length} - 1")
-
-    foreach(IDX RANGE ${range})
-        string(JSON _element GET "${array}" "${IDX}")
-
-        list(APPEND NEW_LIST ${_element})
-    endforeach()
-
-    set("${out}" "${NEW_LIST}" PARENT_SCOPE)
-endfunction()
-
-function(get_json_element object out member default)
-    string(JSON out_type ERROR_VARIABLE err TYPE "${object}" ${member})
-
-    if (err)
-        set("${out}" "${default}" PARENT_SCOPE)
-        return()
-    endif()
-
-    string(JSON outvar GET "${object}" ${member})
-
-    if (out_type STREQUAL "ARRAY")
-        string(JSON _len LENGTH "${object}" ${member})
-        # array_to_list("${outvar}" ${_len} outvar)
-        set("${out}_LENGTH" "${_len}" PARENT_SCOPE)
-    endif()
-
-    set("${out}" "${outvar}" PARENT_SCOPE)
-endfunction()
-
-# The preferred usage
-function(AddJsonPackage)
-    set(oneValueArgs
-        NAME
-
-        # these are overrides that can be generated at runtime, so can be defined separately from the json
-        DOWNLOAD_ONLY
-        BUNDLED_PACKAGE
-    )
-
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(JSON "" "${oneValueArgs}" "${multiValueArgs}"
-                          "${ARGN}")
-
-    list(LENGTH ARGN argnLength)
-
-    # single name argument
-    if(argnLength EQUAL 1)
-        set(JSON_NAME "${ARGV0}")
-    endif()
-
-    if (NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(WARNING ${name} "No cpmfile, AddJsonPackage is a no-op")
-        return()
-    endif()
-
-    if (NOT DEFINED JSON_NAME)
-        cpm_utils_message(FATAL_ERROR "json package" "No name specified")
-    endif()
-
-    string(JSON object ERROR_VARIABLE err GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
-
-    if (err)
-        cpm_utils_message(FATAL_ERROR ${JSON_NAME} "Not found in cpmfile")
-    endif()
-
-    get_json_element("${object}" package package ${JSON_NAME})
-    get_json_element("${object}" repo repo "")
-    get_json_element("${object}" ci ci OFF)
-    get_json_element("${object}" version version "")
-
-    if (ci)
-        get_json_element("${object}" name name "${JSON_NAME}")
-        get_json_element("${object}" extension extension "tar.zst")
-        get_json_element("${object}" min_version min_version "")
-        get_json_element("${object}" raw_disabled disabled_platforms "")
-
-        if (raw_disabled)
-            array_to_list("${raw_disabled}" ${raw_disabled_LENGTH} disabled_platforms)
-        else()
-            set(disabled_platforms "")
-        endif()
-
-        AddCIPackage(
-            VERSION ${version}
-            NAME ${name}
-            REPO ${repo}
-            PACKAGE ${package}
-            EXTENSION ${extension}
-            MIN_VERSION ${min_version}
-            DISABLED_PLATFORMS ${disabled_platforms}
-        )
-
-        # pass stuff to parent scope
-        set(${package}_ADDED "${${package}_ADDED}"
-            PARENT_SCOPE)
-        set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}"
-            PARENT_SCOPE)
-        set(${package}_BINARY_DIR "${${package}_BINARY_DIR}"
-            PARENT_SCOPE)
-
-        return()
-    endif()
-
-    get_json_element("${object}" hash hash "")
-    get_json_element("${object}" hash_suffix hash_suffix "")
-    get_json_element("${object}" sha sha "")
-    get_json_element("${object}" url url "")
-    get_json_element("${object}" key key "")
-    get_json_element("${object}" tag tag "")
-    get_json_element("${object}" artifact artifact "")
-    get_json_element("${object}" git_version git_version "")
-    get_json_element("${object}" git_host git_host "")
-    get_json_element("${object}" source_subdir source_subdir "")
-    get_json_element("${object}" bundled bundled "unset")
-    get_json_element("${object}" find_args find_args "")
-    get_json_element("${object}" raw_patches patches "")
-
-    # okay here comes the fun part: REPLACEMENTS!
-    # first: tag gets %VERSION% replaced if applicable, with either git_version (preferred) or version
-    # second: artifact gets %VERSION% and %TAG% replaced accordingly (same rules for VERSION)
-
-    if (git_version)
-        set(version_replace ${git_version})
-    else()
-        set(version_replace ${version})
-    endif()
-
-    # TODO(crueter): fmt module for cmake
-    if (tag)
-        string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
-    endif()
-
-    if (artifact)
-        string(REPLACE "%VERSION%" "${version_replace}" artifact ${artifact})
-        string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
-    endif()
-
-    # format patchdir
-    if (raw_patches)
-        math(EXPR range "${raw_patches_LENGTH} - 1")
-
-        foreach(IDX RANGE ${range})
-            string(JSON _patch GET "${raw_patches}" "${IDX}")
-
-            set(full_patch "${CMAKE_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
-            if (NOT EXISTS ${full_patch})
-                cpm_utils_message(FATAL_ERROR ${JSON_NAME} "specifies patch ${full_patch} which does not exist")
-            endif()
-
-            list(APPEND patches "${full_patch}")
-        endforeach()
-    endif()
-    # end format patchdir
-
-    # options
-    get_json_element("${object}" raw_options options "")
-
-    if (raw_options)
-        array_to_list("${raw_options}" ${raw_options_LENGTH} options)
-    endif()
-
-    set(options ${options} ${JSON_OPTIONS})
-    # end options
-
-    # system/bundled
-    if (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
-        set(bundled ${JSON_BUNDLED_PACKAGE})
-    endif()
-
-    AddPackage(
-        NAME "${package}"
-        VERSION "${version}"
-        URL "${url}"
-        HASH "${hash}"
-        HASH_SUFFIX "${hash_suffix}"
-        SHA "${sha}"
-        REPO "${repo}"
-        KEY "${key}"
-        PATCHES "${patches}"
-        OPTIONS "${options}"
-        FIND_PACKAGE_ARGUMENTS "${find_args}"
-        BUNDLED_PACKAGE "${bundled}"
-        SOURCE_SUBDIR "${source_subdir}"
-
-        GIT_VERSION ${git_version}
-        GIT_HOST ${git_host}
-
-        ARTIFACT ${artifact}
-        TAG ${tag}
-    )
-
-    # pass stuff to parent scope
-    set(${package}_ADDED "${${package}_ADDED}"
-        PARENT_SCOPE)
-    set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}"
-        PARENT_SCOPE)
-    set(${package}_BINARY_DIR "${${package}_BINARY_DIR}"
-        PARENT_SCOPE)
-
-endfunction()
-
-function(AddPackage)
-    cpm_set_policies()
-
-    # TODO(crueter): git clone?
-
-    #[[
-        URL configurations, descending order of precedence:
-        - URL [+ GIT_URL] -> bare URL fetch
-        - REPO + TAG + ARTIFACT -> github release artifact
-        - REPO + TAG -> github release archive
-        - REPO + SHA -> github commit archive
-        - REPO + BRANCH -> github branch
-
-        Hash configurations, descending order of precedence:
-        - HASH -> bare sha512sum
-        - HASH_SUFFIX -> hash grabbed from the URL + this suffix
-        - HASH_URL -> hash grabbed from a URL
-          * technically this is unsafe since a hacker can attack that url
-
-        NOTE: hash algo defaults to sha512
-    #]]
-    set(oneValueArgs
-        NAME
-        VERSION
-        GIT_VERSION
-        GIT_HOST
-
-        REPO
-        TAG
-        ARTIFACT
-        SHA
-        BRANCH
-
-        HASH
-        HASH_SUFFIX
-        HASH_URL
-        HASH_ALGO
-
-        URL
-        GIT_URL
-
-        KEY
-        BUNDLED_PACKAGE
-        FORCE_BUNDLED_PACKAGE
-        FIND_PACKAGE_ARGUMENTS
-    )
-
-    set(multiValueArgs OPTIONS PATCHES)
-
-    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}"
-                          "${ARGN}")
-
-    if (NOT DEFINED PKG_ARGS_NAME)
-        cpm_utils_message(FATAL_ERROR "package" "No package name defined")
-    endif()
-
-    option(${PKG_ARGS_NAME}_FORCE_SYSTEM "Force the system package for ${PKG_ARGS_NAME}")
-    option(${PKG_ARGS_NAME}_FORCE_BUNDLED "Force the bundled package for ${PKG_ARGS_NAME}")
-
-    if (NOT DEFINED PKG_ARGS_GIT_HOST)
-        set(git_host github.com)
-    else()
-        set(git_host ${PKG_ARGS_GIT_HOST})
-    endif()
-
-    if (DEFINED PKG_ARGS_URL)
-        set(pkg_url ${PKG_ARGS_URL})
-
-        if (DEFINED PKG_ARGS_REPO)
-            set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
-        else()
-            if (DEFINED PKG_ARGS_GIT_URL)
-                set(pkg_git_url ${PKG_ARGS_GIT_URL})
-            else()
-                set(pkg_git_url ${pkg_url})
-            endif()
-        endif()
-    elseif (DEFINED PKG_ARGS_REPO)
-        set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
-
-        if (DEFINED PKG_ARGS_TAG)
-            set(pkg_key ${PKG_ARGS_TAG})
-
-            if(DEFINED PKG_ARGS_ARTIFACT)
-                set(pkg_url
-                    ${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT})
-            else()
-                set(pkg_url
-                    ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
-            endif()
-        elseif (DEFINED PKG_ARGS_SHA)
-            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
-        else()
-            if (DEFINED PKG_ARGS_BRANCH)
-                set(PKG_BRANCH ${PKG_ARGS_BRANCH})
-            else()
-                cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                            "REPO defined but no TAG, SHA, BRANCH, or URL specified, defaulting to master")
-                set(PKG_BRANCH master)
-            endif()
-
-            set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
-        endif()
-    else()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME} "No URL or repository defined")
-    endif()
-
-    cpm_utils_message(STATUS ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
-
-    if (NOT DEFINED PKG_ARGS_KEY)
-        if (DEFINED PKG_ARGS_SHA)
-            string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                        "No custom key defined, using ${pkg_key} from sha")
-        elseif(DEFINED PKG_ARGS_GIT_VERSION)
-            set(pkg_key ${PKG_ARGS_GIT_VERSION})
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                        "No custom key defined, using ${pkg_key}")
-        elseif (DEFINED PKG_ARGS_TAG)
-            set(pkg_key ${PKG_ARGS_TAG})
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                        "No custom key defined, using ${pkg_key}")
-        elseif (DEFINED PKG_ARGS_VERSION)
-            set(pkg_key ${PKG_ARGS_VERSION})
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                        "No custom key defined, using ${pkg_key}")
-        else()
-            cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                        "Could not determine cache key, using CPM defaults")
-        endif()
-    else()
-        set(pkg_key ${PKG_ARGS_KEY})
-    endif()
-
-    if (DEFINED PKG_ARGS_HASH_ALGO)
-        set(hash_algo ${PKG_ARGS_HASH_ALGO})
-    else()
-        set(hash_algo SHA512)
-    endif()
-
-    if (DEFINED PKG_ARGS_HASH)
-        set(pkg_hash "${hash_algo}=${PKG_ARGS_HASH}")
-    elseif (DEFINED PKG_ARGS_HASH_SUFFIX)
-        # funny sanity check
-        string(TOLOWER ${hash_algo} hash_algo_lower)
-        string(TOLOWER ${PKG_ARGS_HASH_SUFFIX} suffix_lower)
-        if (NOT ${suffix_lower} MATCHES ${hash_algo_lower})
-            cpm_utils_message(WARNING
-                        "Hash algorithm and hash suffix do not match, errors may occur")
-        endif()
-
-        set(hash_url ${pkg_url}.${PKG_ARGS_HASH_SUFFIX})
-    elseif (DEFINED PKG_ARGS_HASH_URL)
-        set(hash_url ${PKG_ARGS_HASH_URL})
-    else()
-        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                    "No hash or hash URL found")
-    endif()
-
-    if (DEFINED hash_url)
-        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${PKG_ARGS_NAME}.hash)
-
-        # TODO(crueter): This is kind of a bad solution
-        # because "technically" the hash is invalidated each week
-        # but it works for now kjsdnfkjdnfjksdn
-        string(TOLOWER ${PKG_ARGS_NAME} lowername)
-        if (NOT EXISTS ${outfile} AND NOT EXISTS ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
-            file(DOWNLOAD ${hash_url} ${outfile})
-        endif()
-
-        if (EXISTS ${outfile})
-            file(READ ${outfile} pkg_hash_tmp)
-        endif()
-
-        if (DEFINED ${pkg_hash_tmp})
-            set(pkg_hash "${hash_algo}=${pkg_hash_tmp}")
-        endif()
-    endif()
-
-    macro(set_precedence local force)
-        set(CPM_USE_LOCAL_PACKAGES ${local})
-        set(CPM_LOCAL_PACKAGES_ONLY ${force})
-    endmacro()
-
-    #[[
-        Precedence:
-        - package_FORCE_SYSTEM
-        - package_FORCE_BUNDLED
-        - CPMUTIL_FORCE_SYSTEM
-        - CPMUTIL_FORCE_BUNDLED
-        - BUNDLED_PACKAGE
-        - default to allow local
-    ]]#
-    if (PKG_ARGS_FORCE_BUNDLED_PACKAGE)
-        set_precedence(OFF OFF)
-    elseif (${PKG_ARGS_NAME}_FORCE_SYSTEM)
-        set_precedence(ON ON)
-    elseif (${PKG_ARGS_NAME}_FORCE_BUNDLED)
-        set_precedence(OFF OFF)
-    elseif (CPMUTIL_FORCE_SYSTEM)
-        set_precedence(ON ON)
-    elseif(CPMUTIL_FORCE_BUNDLED)
-        set_precedence(OFF OFF)
-    elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE AND NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
-        if (PKG_ARGS_BUNDLED_PACKAGE)
-            set(local OFF)
-        else()
-            set(local ON)
-        endif()
-
-        set_precedence(${local} OFF)
-    else()
-        set_precedence(ON OFF)
-    endif()
-
-    if (DEFINED PKG_ARGS_VERSION)
-        list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_VERSION}
-        )
-    endif()
-
-    CPMAddPackage(
-        NAME ${PKG_ARGS_NAME}
-        URL ${pkg_url}
-        URL_HASH ${pkg_hash}
-        CUSTOM_CACHE_KEY ${pkg_key}
-        DOWNLOAD_ONLY ${PKG_ARGS_DOWNLOAD_ONLY}
-        FIND_PACKAGE_ARGUMENTS ${PKG_ARGS_FIND_PACKAGE_ARGUMENTS}
-
-        OPTIONS ${PKG_ARGS_OPTIONS}
-        PATCHES ${PKG_ARGS_PATCHES}
-        EXCLUDE_FROM_ALL ON
-
-        ${EXTRA_ARGS}
-
-        ${PKG_ARGS_UNPARSED_ARGUMENTS}
-    )
-
-    set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES ${PKG_ARGS_NAME})
-    set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS ${pkg_git_url})
-
-    if (${PKG_ARGS_NAME}_ADDED)
-        if (DEFINED PKG_ARGS_SHA)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                         ${PKG_ARGS_SHA})
-         elseif (DEFINED PKG_ARGS_GIT_VERSION)
-             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                          ${PKG_ARGS_GIT_VERSION})
-        elseif (DEFINED PKG_ARGS_TAG)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                         ${PKG_ARGS_TAG})
-         elseif(DEFINED PKG_ARGS_VERSION)
-             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                          ${PKG_ARGS_VERSION})
-        else()
-            cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                        "Package has no specified sha, tag, or version")
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown")
-        endif()
-    else()
-        if (DEFINED CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION AND NOT
-            "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION}" STREQUAL "")
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                         "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION} (system)")
-        else()
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                         "unknown (system)")
-        endif()
-    endif()
-
-    # pass stuff to parent scope
-    set(${PKG_ARGS_NAME}_ADDED "${${PKG_ARGS_NAME}_ADDED}"
-        PARENT_SCOPE)
-    set(${PKG_ARGS_NAME}_SOURCE_DIR "${${PKG_ARGS_NAME}_SOURCE_DIR}"
-        PARENT_SCOPE)
-    set(${PKG_ARGS_NAME}_BINARY_DIR "${${PKG_ARGS_NAME}_BINARY_DIR}"
-        PARENT_SCOPE)
-
-endfunction()
-
-function(add_ci_package key)
-    set(ARTIFACT ${ARTIFACT_NAME}-${key}-${ARTIFACT_VERSION}.${ARTIFACT_EXT})
-
-    AddPackage(
-        NAME ${ARTIFACT_PACKAGE}
-        REPO ${ARTIFACT_REPO}
-        TAG v${ARTIFACT_VERSION}
-        GIT_VERSION ${ARTIFACT_VERSION}
-        ARTIFACT ${ARTIFACT}
-
-        KEY ${key}-${ARTIFACT_VERSION}
-        HASH_SUFFIX sha512sum
-        FORCE_BUNDLED_PACKAGE ON
-    )
-
-    set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}_SOURCE_DIR} PARENT_SCOPE)
-endfunction()
-
-# TODO(crueter): we could do an AddMultiArchPackage, multiplatformpackage?
-# name is the artifact name, package is for find_package override
-function(AddCIPackage)
-    set(oneValueArgs
-        VERSION
-        NAME
-        REPO
-        PACKAGE
-        EXTENSION
-        MIN_VERSION
-    )
-
-    set(multiValueArgs DISABLED_PLATFORMS)
-
-    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT DEFINED PKG_ARGS_VERSION)
-        message(FATAL_ERROR "[CPMUtil] VERSION is required")
-    endif()
-    if(NOT DEFINED PKG_ARGS_NAME)
-        message(FATAL_ERROR "[CPMUtil] NAME is required")
-    endif()
-    if(NOT DEFINED PKG_ARGS_REPO)
-        message(FATAL_ERROR "[CPMUtil] REPO is required")
-    endif()
-    if(NOT DEFINED PKG_ARGS_PACKAGE)
-        message(FATAL_ERROR "[CPMUtil] PACKAGE is required")
-    endif()
-
-    if (NOT DEFINED PKG_ARGS_CMAKE_FILENAME)
-        set(ARTIFACT_CMAKE ${PKG_ARGS_NAME})
-    else()
-        set(ARTIFACT_CMAKE ${PKG_ARGS_CMAKE_FILENAME})
-    endif()
-
-    if(NOT DEFINED PKG_ARGS_EXTENSION)
-        set(ARTIFACT_EXT "tar.zst")
-    else()
-        set(ARTIFACT_EXT ${PKG_ARGS_EXTENSION})
-    endif()
-
-    if (DEFINED PKG_ARGS_MIN_VERSION)
-        set(ARTIFACT_MIN_VERSION ${PKG_ARGS_MIN_VERSION})
-    endif()
-
-    if (DEFINED PKG_ARGS_DISABLED_PLATFORMS)
-        set(DISABLED_PLATFORMS ${PKG_ARGS_DISABLED_PLATFORMS})
-    endif()
-
-    # this is mildly annoying
-    set(ARTIFACT_VERSION ${PKG_ARGS_VERSION})
-    set(ARTIFACT_NAME ${PKG_ARGS_NAME})
-    set(ARTIFACT_REPO ${PKG_ARGS_REPO})
-    set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})
-
-    if ((MSVC AND ARCHITECTURE_x86_64) AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(windows-amd64)
-    endif()
-
-    if ((MSVC AND ARCHITECTURE_arm64) AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(windows-arm64)
-    endif()
-
-    if ((MINGW AND ARCHITECTURE_x86_64) AND NOT "mingw-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(mingw-amd64)
-    endif()
-
-    if ((MINGW AND ARCHITECTURE_arm64) AND NOT "mingw-arm64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(mingw-arm64)
-    endif()
-
-    if((ANDROID AND ARCHITECTURE_x86_64) AND NOT "android-x86_64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(android-x86_64)
-    endif()
-
-    if((ANDROID AND ARCHITECTURE_arm64) AND NOT "android-aarch64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(android-aarch64)
-    endif()
-
-    if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(solaris-amd64)
-    endif()
-
-    if(PLATFORM_FREEBSD AND NOT "freebsd-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(freebsd-amd64)
-    endif()
-
-    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(linux-amd64)
-    endif()
-
-    if((PLATFORM_LINUX AND ARCHITECTURE_arm64) AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(linux-aarch64)
-    endif()
-
-    # TODO(crueter): macOS amd64/aarch64 split mayhaps
-    if (APPLE AND NOT "macos-universal" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(macos-universal)
-    endif()
-
-    if (DEFINED ARTIFACT_DIR)
-        set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE)
-    else()
-        find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
-    endif()
-endfunction()
--- a/CMakeModules/CopyYuzuFFmpegDeps.cmake
+++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+function(copy_yuzu_FFmpeg_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
+    string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
+    windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
+endfunction(copy_yuzu_FFmpeg_deps)
--- a/CMakeModules/CopyYuzuQt6Deps.cmake
+++ b/CMakeModules/CopyYuzuQt6Deps.cmake
@@ -63,4 +63,6 @@ function(copy_yuzu_Qt6_deps target_dir)
    else()
        # Update for non-MSVC platforms if needed
    endif()
+    # Fixes dark mode being forced automatically even when light theme is set in app settings.
+	file(WRITE "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/qt.conf" "[Platforms]\nWindowsArguments = darkmode=0")
 endfunction(copy_yuzu_Qt6_deps)
--- a/CMakeModules/CopyYuzuSDLDeps.cmake
+++ b/CMakeModules/CopyYuzuSDLDeps.cmake
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2016 Citra Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+function(copy_yuzu_SDL_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
+endfunction(copy_yuzu_SDL_deps)
--- a/CMakeModules/DownloadExternals.cmake
+++ b/CMakeModules/DownloadExternals.cmake
@@ -6,55 +6,54 @@
 #   remote_path: path to the file to download, relative to the remote repository root
 #   prefix_var: name of a variable which will be set with the path to the extracted contents
 set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
-function(download_bundled_external remote_path lib_name cpm_key prefix_var version)
-    set(package_base_url "https://github.com/eden-emulator/")
-    set(package_repo "no_platform")
-    set(package_extension "no_platform")
-    set(CACHE_KEY "")
+function(download_bundled_external remote_path lib_name prefix_var)

-    # TODO(crueter): Need to convert ffmpeg to a CI.
-    if (WIN32 OR FORCE_WIN_ARCHIVES)
-        if (ARCHITECTURE_arm64)
-            set(CACHE_KEY "windows")
-            set(package_repo "ext-windows-arm64-bin/raw/master/")
-            set(package_extension ".zip")
-        elseif(ARCHITECTURE_x86_64)
-            set(CACHE_KEY "windows")
-            set(package_repo "ext-windows-bin/raw/master/")
-            set(package_extension ".7z")
+set(package_base_url "https://github.com/eden-emulator/")
+set(package_repo "no_platform")
+set(package_extension "no_platform")
+if (WIN32)
+    set(package_repo "ext-windows-bin/raw/master/")
+    set(package_extension ".7z")
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set(package_repo "ext-linux-bin/raw/master/")
+    set(package_extension ".tar.xz")
+elseif (ANDROID)
+    set(package_repo "ext-android-bin/raw/master/")
+    set(package_extension ".tar.xz")
+else()
+    message(FATAL_ERROR "No package available for this platform")
+endif()
+set(package_url "${package_base_url}${package_repo}")
+
+set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
+if (NOT EXISTS "${prefix}")
+    message(STATUS "Downloading binaries for ${lib_name}...")
+    file(DOWNLOAD
+        ${package_url}${remote_path}${lib_name}${package_extension}
+        "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}"
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+endif()
+message(STATUS "Using bundled binaries at ${prefix}")
+set(${prefix_var} "${prefix}" PARENT_SCOPE)
+endfunction()
+
+function(download_moltenvk_external platform version)
+    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
+    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
+    if (NOT EXISTS ${MOLTENVK_DIR})
+        if (NOT EXISTS ${MOLTENVK_TAR})
+            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar
+                ${MOLTENVK_TAR} SHOW_PROGRESS)
        endif()
-    elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-        set(CACHE_KEY "linux")
-        set(package_repo "ext-linux-bin/raw/master/")
-        set(package_extension ".tar.xz")
-    elseif (ANDROID)
-        set(CACHE_KEY "android")
-        set(package_repo "ext-android-bin/raw/master/")
-        set(package_extension ".tar.xz")
-    else()
-        message(FATAL_ERROR "No package available for this platform")
-    endif()
-    string(CONCAT package_url "${package_base_url}" "${package_repo}")
-    string(CONCAT full_url "${package_url}" "${remote_path}" "${lib_name}" "${package_extension}")
-    message(STATUS "Resolved bundled URL: ${full_url}")

-    # TODO(crueter): DELETE THIS ENTIRELY, GLORY BE TO THE CI!
-    AddPackage(
-        NAME ${cpm_key}
-        VERSION ${version}
-        URL ${full_url}
-        DOWNLOAD_ONLY YES
-        KEY ${CACHE_KEY}
-        BUNDLED_PACKAGE ON
-        # TODO(crueter): hash
-    )
-
-    if (DEFINED ${cpm_key}_SOURCE_DIR)
-        set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
-        message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
-    else()
-        message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
+            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
    endif()
+
+    # Add the MoltenVK library path to the prefix so find_library can locate it.
+    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()

 # Determine installation parameters for OS, architecture, and compiler
@@ -96,7 +95,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
        set(host "linux")
        set(type "desktop")
        set(arch "linux_gcc_64")
-        set(arch_path "gcc_64")
+        set(arch_path "linux")
    endif()

    set(${host_out} "${host}" PARENT_SCOPE)
@@ -131,79 +130,56 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
    set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
    if (tool)
        set(prefix "${base_path}/Tools")
-        list(APPEND install_args install-tool --outputdir "${base_path}" "${host}" desktop "${target}")
+        set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})
    else()
        set(prefix "${base_path}/${target}/${arch_path}")
-        list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)
+        set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt_base)

        if (YUZU_USE_QT_MULTIMEDIA)
-            list(APPEND install_args qtmultimedia)
+            set(install_args ${install_args} qtmultimedia)
        endif()

        if (YUZU_USE_QT_WEB_ENGINE)
-            list(APPEND install_args qtpositioning qtwebchannel qtwebengine)
+            set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)
        endif()

-        if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")
+        if (NOT ${YUZU_QT_MIRROR} STREQUAL "")
            message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")
-            list(APPEND install_args -b "${YUZU_QT_MIRROR}")
+            set(install_args ${install_args} -b ${YUZU_QT_MIRROR})
        endif()
    endif()

-    message(STATUS "Install Args: ${install_args}")
-
+    message(STATUS "Install Args ${install_args}")
    if (NOT EXISTS "${prefix}")
        message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
        if (WIN32)
            set(aqt_path "${base_path}/aqt.exe")
            if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)
-            endif()
-            execute_process(COMMAND "${aqt_path}" ${install_args}
-                WORKING_DIRECTORY "${base_path}"
-                RESULT_VARIABLE aqt_res
-                OUTPUT_VARIABLE aqt_out
-                ERROR_VARIABLE aqt_err)
-            if (NOT aqt_res EQUAL 0)
-                message(FATAL_ERROR "aqt.exe failed: ${aqt_err}")
+                file(DOWNLOAD
+                        ${AQT_PREBUILD_BASE_URL}/aqt.exe
+                        ${aqt_path} SHOW_PROGRESS)
            endif()
+            execute_process(COMMAND ${aqt_path} ${install_args}
+                    WORKING_DIRECTORY ${base_path})
        elseif (APPLE)
            set(aqt_path "${base_path}/aqt-macos")
            if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)
-            endif()
-            execute_process(COMMAND chmod +x "${aqt_path}")
-            execute_process(COMMAND "${aqt_path}" ${install_args}
-                WORKING_DIRECTORY "${base_path}"
-                RESULT_VARIABLE aqt_res
-                ERROR_VARIABLE aqt_err)
-            if (NOT aqt_res EQUAL 0)
-                message(FATAL_ERROR "aqt-macos failed: ${aqt_err}")
+                file(DOWNLOAD
+                        ${AQT_PREBUILD_BASE_URL}/aqt-macos
+                        ${aqt_path} SHOW_PROGRESS)
            endif()
+            execute_process(COMMAND chmod +x ${aqt_path})
+            execute_process(COMMAND ${aqt_path} ${install_args}
+                    WORKING_DIRECTORY ${base_path})
        else()
-            find_program(PYTHON3_EXECUTABLE python3)
-            if (NOT PYTHON3_EXECUTABLE)
-                message(FATAL_ERROR "python3 is required to install Qt using aqt (pip mode).")
-            endif()
            set(aqt_install_path "${base_path}/aqt")
            file(MAKE_DIRECTORY "${aqt_install_path}")

-            execute_process(COMMAND "${PYTHON3_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall
-                WORKING_DIRECTORY "${base_path}"
-                RESULT_VARIABLE pip_res
-                ERROR_VARIABLE pip_err)
-            if (NOT pip_res EQUAL 0)
-                message(FATAL_ERROR "pip install aqtinstall failed: ${pip_err}")
-            endif()
-
-            execute_process(COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${aqt_install_path}" "${PYTHON3_EXECUTABLE}" -m aqt ${install_args}
-                WORKING_DIRECTORY "${base_path}"
-                RESULT_VARIABLE aqt_res
-                ERROR_VARIABLE aqt_err)
-            if (NOT aqt_res EQUAL 0)
-                message(FATAL_ERROR "aqt (python) failed: ${aqt_err}")
-            endif()
+            execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall
+                    WORKING_DIRECTORY ${base_path})
+            execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}
+                    WORKING_DIRECTORY ${base_path})
        endif()

        message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")
@@ -221,7 +197,7 @@ endfunction()
 function(download_qt target)
    determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)

-    set(base_path "${CMAKE_BINARY_DIR}/externals/qt")
+    get_external_prefix(qt base_path)
    file(MAKE_DIRECTORY "${base_path}")

    download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")
@@ -238,34 +214,26 @@ function(download_qt target)
    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()

-function(download_moltenvk version platform)
-    if(NOT version)
-        message(FATAL_ERROR "download_moltenvk: version argument is required")
-    endif()
-    if(NOT platform)
-        message(FATAL_ERROR "download_moltenvk: platform argument is required")
-    endif()
+function(download_moltenvk)
+set(MOLTENVK_PLATFORM "macOS")

-    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
+set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
+set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
+if (NOT EXISTS ${MOLTENVK_DIR})
+if (NOT EXISTS ${MOLTENVK_TAR})
+    file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10-rc2/MoltenVK-all.tar
+    ${MOLTENVK_TAR} SHOW_PROGRESS)
+endif()

-    if(NOT EXISTS "${MOLTENVK_DIR}")
-        if(NOT EXISTS "${MOLTENVK_TAR}")
-            file(DOWNLOAD "https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar"
-                          "${MOLTENVK_TAR}" SHOW_PROGRESS)
-        endif()
+execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
+    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+endif()

-        execute_process(
-            COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals"
-            RESULT_VARIABLE tar_res
-            ERROR_VARIABLE tar_err
-        )
-        if(NOT tar_res EQUAL 0)
-            message(FATAL_ERROR "Extracting MoltenVK failed: ${tar_err}")
-        endif()
-    endif()
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+# Add the MoltenVK library path to the prefix so find_library can locate it.
+list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${MOLTENVK_PLATFORM}")
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()

+function(get_external_prefix lib_name prefix_var)
+    set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE)
+endfunction()
--- a/CMakeModules/FindDiscordRPC.cmake
+++ b/CMakeModules/FindDiscordRPC.cmake
@@ -1,33 +1,27 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

-find_package(DiscordRPC CONFIG QUIET)
+find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h)

-if (NOT DiscordRPC_FOUND)
-    find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h)
-    find_library(DiscordRPC_LIBRARY discord-rpc)
+find_library(DiscordRPC_LIBRARY discord-rpc)

-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(DiscordRPC
-        REQUIRED_VARS
-            DiscordRPC_LIBRARY
-            DiscordRPC_INCLUDE_DIR
-    )
-
-    if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc)
-        add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED)
-        set_target_properties(DiscordRPC::discord-rpc PROPERTIES
-            IMPORTED_LOCATION "${DiscordRPC_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}"
-        )
-    endif()
-
-    mark_as_advanced(
-        DiscordRPC_INCLUDE_DIR
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DiscordRPC
+    REQUIRED_VARS
        DiscordRPC_LIBRARY
+        DiscordRPC_INCLUDE_DIR
+)
+
+if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc)
+    add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED)
+    set_target_properties(DiscordRPC::discord-rpc PROPERTIES
+        IMPORTED_LOCATION "${DiscordRPC_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}"
    )
 endif()
+
+mark_as_advanced(
+    DiscordRPC_INCLUDE_DIR
+    DiscordRPC_LIBRARY
+)
--- a/CMakeModules/FindFFmpeg.cmake
+++ b/CMakeModules/FindFFmpeg.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2019 Citra Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

@@ -78,16 +75,16 @@ function(find_ffmpeg LIBNAME)
    )
  else()
    list(APPEND INCLUDE_PATHS
-      ${CMAKE_SYSROOT}/usr/local/include/ffmpeg
-      ${CMAKE_SYSROOT}/usr/local/include/lib${LIBNAME}
-      ${CMAKE_SYSROOT}/usr/include/ffmpeg
-      ${CMAKE_SYSROOT}/usr/include/lib${LIBNAME}
-      ${CMAKE_SYSROOT}/usr/include/ffmpeg/lib${LIBNAME}
+      /usr/local/include/ffmpeg
+      /usr/local/include/lib${LIBNAME}
+      /usr/include/ffmpeg
+      /usr/include/lib${LIBNAME}
+      /usr/include/ffmpeg/lib${LIBNAME}
    )

    list(APPEND LIB_PATHS
-      ${CMAKE_SYSROOT}/usr/local/lib
-      ${CMAKE_SYSROOT}/usr/lib
+      /usr/local/lib
+      /usr/lib
    )
  endif()

--- a/CMakeModules/FindOpus.cmake
+++ b/CMakeModules/FindOpus.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

@@ -13,10 +10,6 @@ find_package_handle_standard_args(Opus
    VERSION_VAR OPUS_VERSION
 )

-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::OPUS)
-endif()
-
 if (Opus_FOUND AND NOT TARGET Opus::opus)
    add_library(Opus::opus ALIAS PkgConfig::OPUS)
 endif()
--- a/CMakeModules/FindSPIRV-Tools.cmake
+++ b/CMakeModules/FindSPIRV-Tools.cmake
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_search_module(SPIRV-Tools QUIET IMPORTED_TARGET SPIRV-Tools)
-find_package_handle_standard_args(SPIRV-Tools
-    REQUIRED_VARS SPIRV-Tools_LINK_LIBRARIES
-    VERSION_VAR SPIRV-Tools_VERSION
-)
-
-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::SPIRV-Tools)
-endif()
-
-if (SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools::SPIRV-Tools)
-    if (TARGET SPIRV-Tools)
-        add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools)
-    else()
-        add_library(SPIRV-Tools::SPIRV-Tools ALIAS PkgConfig::SPIRV-Tools)
-    endif()
-endif()
--- a/CMakeModules/Findenet.cmake
+++ b/CMakeModules/Findenet.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,10 +11,6 @@ find_package_handle_standard_args(enet
    VERSION_VAR ENET_VERSION
 )

-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::ENET)
-endif()
-
 if (enet_FOUND AND NOT TARGET enet::enet)
    add_library(enet::enet ALIAS PkgConfig::ENET)
 endif()
--- a/CMakeModules/Findlibusb.cmake
+++ b/CMakeModules/Findlibusb.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,10 +11,6 @@ find_package_handle_standard_args(libusb
    VERSION_VAR LIBUSB_VERSION
 )

-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::LIBUSB)
-endif()
-
 if (libusb_FOUND AND NOT TARGET libusb::usb)
    add_library(libusb::usb ALIAS PkgConfig::LIBUSB)
 endif()
--- a/CMakeModules/Findlz4.cmake
+++ b/CMakeModules/Findlz4.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

@@ -12,11 +9,6 @@ if (lz4_CONSIDERED_CONFIGS)
 else()
    find_package(PkgConfig QUIET)
    pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4)
-
-    if (PLATFORM_MSYS)
-        FixMsysPath(PkgConfig::LZ4)
-    endif()
-
    find_package_handle_standard_args(lz4
        REQUIRED_VARS LZ4_LINK_LIBRARIES
        VERSION_VAR LZ4_VERSION
--- a/CMakeModules/Findzstd.cmake
+++ b/CMakeModules/Findzstd.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

@@ -19,7 +16,7 @@ else()
 endif()

 if (zstd_FOUND AND NOT TARGET zstd::zstd)
-    if (TARGET zstd::libzstd_shared AND NOT YUZU_STATIC_BUILD)
+    if (TARGET zstd::libzstd_shared)
        add_library(zstd::zstd ALIAS zstd::libzstd_shared)
    elseif (TARGET zstd::libzstd_static)
        add_library(zstd::zstd ALIAS zstd::libzstd_static)
@@ -27,13 +24,3 @@ if (zstd_FOUND AND NOT TARGET zstd::zstd)
        add_library(zstd::zstd ALIAS PkgConfig::ZSTD)
    endif()
 endif()
-
-get_target_property(ZSTD_TARGET zstd::zstd ALIASED_TARGET)
-
-if (NOT TARGET zstd::libzstd)
-    if (ZSTD_TARGET)
-        add_library(zstd::libzstd ALIAS ${ZSTD_TARGET})
-    else()
-        add_library(zstd::libzstd ALIAS zstd::zstd)
-    endif()
-endif()
--- a/CMakeModules/FixMsysPaths.cmake
+++ b/CMakeModules/FixMsysPaths.cmake
@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-function(FixMsysPath target)
-    get_target_property(include_dir ${target} INTERFACE_INCLUDE_DIRECTORIES)
-
-    if (NOT (include_dir MATCHES "^/"))
-        return()
-    endif()
-
-    set(root_default $ENV{MSYS2_LOCATION})
-    if (root_default STREQUAL "")
-        set(root_default "C:/msys64")
-    endif()
-
-    set(MSYS_ROOT_PATH ${root_default} CACHE STRING "Location of the MSYS2 root")
-
-    set(include_dir "C:/msys64${include_dir}")
-    set_target_properties(${target} PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES ${include_dir})
-endfunction()
--- a/CMakeModules/GenerateDepHashes.cmake
+++ b/CMakeModules/GenerateDepHashes.cmake
@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-get_property(NAMES GLOBAL PROPERTY CPM_PACKAGE_NAMES)
-get_property(SHAS GLOBAL PROPERTY CPM_PACKAGE_SHAS)
-get_property(URLS GLOBAL PROPERTY CPM_PACKAGE_URLS)
-
-list(LENGTH NAMES DEPS_LENGTH)
-
-list(JOIN NAMES "\",\n\t\"" DEP_NAME_DIRTY)
-set(DEP_NAMES "\t\"${DEP_NAME_DIRTY}\"")
-
-list(JOIN SHAS "\",\n\t\"" DEP_SHAS_DIRTY)
-set(DEP_SHAS "\t\"${DEP_SHAS_DIRTY}\"")
-
-list(JOIN URLS "\",\n\t\"" DEP_URLS_DIRTY)
-set(DEP_URLS "\t\"${DEP_URLS_DIRTY}\"")
-
-configure_file(dep_hashes.h.in dep_hashes.h @ONLY)
-target_sources(common PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/dep_hashes.h)
-target_include_directories(common PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
--- a/CMakeModules/GenerateSCMRev.cmake
+++ b/CMakeModules/GenerateSCMRev.cmake
@@ -1,41 +1,38 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

-# generate git/build information
-include(GetSCMRev)
-
+# Gets a UTC timestamp and sets the provided variable to it
 function(get_timestamp _var)
    string(TIMESTAMP timestamp UTC)
    set(${_var} "${timestamp}" PARENT_SCOPE)
 endfunction()

+# generate git/build information
+include(GetGitRevisionDescription)
+if(NOT GIT_REF_SPEC)
+    get_git_head_revision(GIT_REF_SPEC GIT_REV)
+endif()
+if(NOT GIT_DESC)
+    git_describe(GIT_DESC --always --long --dirty)
+endif()
+if (NOT GIT_BRANCH)
+  git_branch_name(GIT_BRANCH)
+endif()
 get_timestamp(BUILD_DATE)

-if (DEFINED GIT_RELEASE)
-  set(BUILD_VERSION "${GIT_TAG}")
-  set(GIT_REFSPEC "${GIT_RELEASE}")
-  set(IS_DEV_BUILD false)
-else()
-  string(SUBSTRING ${GIT_COMMIT} 0 10 BUILD_VERSION)
-  set(BUILD_VERSION "${BUILD_VERSION}-${GIT_REFSPEC}")
+git_get_exact_tag(GIT_TAG --tags)
+if (GIT_TAG MATCHES "NOTFOUND")
+  set(BUILD_VERSION "${GIT_DESC}")
  set(IS_DEV_BUILD true)
+else()
+  set(BUILD_VERSION ${GIT_TAG})
+  set(IS_DEV_BUILD false)
 endif()

-set(GIT_DESC ${BUILD_VERSION})
-
 # Generate cpp with Git revision from template
 # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
 set(REPO_NAME "Eden")
-set(BUILD_ID ${GIT_REFSPEC})
+set(BUILD_ID ${GIT_BRANCH})
 set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
-set(CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
-
-# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
-set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
-set(BUILD_AUTO_UPDATE_API "http://api.github.com")
-set(BUILD_AUTO_UPDATE_REPO "eden-emulator/Releases")

 configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)
--- a/CMakeModules/MSVCCache.cmake
+++ b/CMakeModules/MSVCCache.cmake
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# buildcache wrapper
+OPTION(USE_CCACHE "Use buildcache for compilation" OFF)
+IF(USE_CCACHE)
+    FIND_PROGRAM(CCACHE buildcache)
+    IF (CCACHE)
+        MESSAGE(STATUS "Using buildcache found in PATH")
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    ELSE(CCACHE)
+        MESSAGE(WARNING "USE_CCACHE enabled, but no buildcache executable found")
+    ENDIF(CCACHE)
+ENDIF(USE_CCACHE)
--- a/CMakeModules/MinGWClangCross.cmake
+++ b/CMakeModules/MinGWClangCross.cmake
@@ -0,0 +1,58 @@
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set(MINGW_PREFIX                /usr/x86_64-w64-mingw32/)
+set(CMAKE_SYSTEM_NAME           Windows)
+set(CMAKE_SYSTEM_PROCESSOR      x86_64)
+
+set(CMAKE_FIND_ROOT_PATH        ${MINGW_PREFIX})
+set(SDL2_PATH                   ${MINGW_PREFIX})
+set(MINGW_TOOL_PREFIX           ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+
+# Specify the cross compiler
+set(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}clang)
+set(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}clang++)
+set(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
+set(CMAKE_C_COMPILER_AR         ${MINGW_TOOL_PREFIX}ar)
+set(CMAKE_CXX_COMPILER_AR       ${MINGW_TOOL_PREFIX}ar)
+set(CMAKE_C_COMPILER_RANLIB     ${MINGW_TOOL_PREFIX}ranlib)
+set(CMAKE_CXX_COMPILER_RANLIB   ${MINGW_TOOL_PREFIX}ranlib)
+
+# Mingw tools
+set(STRIP                       ${MINGW_TOOL_PREFIX}strip)
+set(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
+set(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+
+# ccache wrapper
+option(USE_CCACHE "Use ccache for compilation" OFF)
+if(USE_CCACHE)
+    find_program(CCACHE ccache)
+    if(CCACHE)
+        message(STATUS "Using ccache found in PATH")
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    else(CCACHE)
+        message(WARNING "USE_CCACHE enabled, but no ccache found")
+    endif(CCACHE)
+endif(USE_CCACHE)
+
+# Search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+
+# Echo modified cmake vars to screen for debugging purposes
+if(NOT DEFINED ENV{MINGW_DEBUG_INFO})
+        message("")
+        message("Custom cmake vars: (blank = system default)")
+        message("-----------------------------------------")
+        message("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
+        message("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
+        message("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
+        message("* WINDRES                              : ${WINDRES}")
+        message("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
+        message("* STRIP                                : ${STRIP}")
+        message("* USE_CCACHE                           : ${USE_CCACHE}")
+        message("")
+        # So that the debug info only appears once
+        set(ENV{MINGW_DEBUG_INFO} SHOWN)
+endif()
--- a/CMakeModules/MinGWCross.cmake
+++ b/CMakeModules/MinGWCross.cmake
@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2018 tech4me <guiwanglong@gmail.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(MINGW_PREFIX   /usr/x86_64-w64-mingw32/)
+set(CMAKE_SYSTEM_NAME               Windows)
+set(CMAKE_SYSTEM_PROCESSOR           x86_64)
+# Actually a hack, w/o this will cause some strange errors
+set(CMAKE_HOST_WIN32                 TRUE)
+
+
+set(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
+set(SDL2_PATH                       ${MINGW_PREFIX})
+set(MINGW_TOOL_PREFIX               ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+
+# Specify the cross compiler
+set(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}gcc)
+set(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}g++)
+set(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
+
+# Mingw tools
+set(STRIP                       ${MINGW_TOOL_PREFIX}strip)
+set(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
+set(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+
+# ccache wrapper
+option(USE_CCACHE "Use ccache for compilation" OFF)
+if(USE_CCACHE)
+    find_program(CCACHE ccache)
+    if(CCACHE)
+        message(STATUS "Using ccache found in PATH")
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    else(CCACHE)
+        message(WARNING "USE_CCACHE enabled, but no ccache found")
+    endif(CCACHE)
+endif(USE_CCACHE)
+
+# Search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+
+# Echo modified cmake vars to screen for debugging purposes
+if(NOT DEFINED ENV{MINGW_DEBUG_INFO})
+        message("")
+        message("Custom cmake vars: (blank = system default)")
+        message("-----------------------------------------")
+        message("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
+        message("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
+        message("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
+        message("* WINDRES                              : ${WINDRES}")
+        message("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
+        message("* STRIP                                : ${STRIP}")
+        message("* USE_CCACHE                           : ${USE_CCACHE}")
+        message("")
+        # So that the debug info only appears once
+        set(ENV{MINGW_DEBUG_INFO} SHOWN)
+endif()
--- a/CMakeModules/StaticQtLibs.cmake
+++ b/CMakeModules/StaticQtLibs.cmake
@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-## When linking to a static Qt build on MinGW, certain additional libraries
-## must be statically linked to as well.
-
-function(static_qt_link target)
-    macro(extra_libs)
-        foreach(lib ${ARGN})
-            find_library(${lib}_LIBRARY ${lib} REQUIRED)
-            target_link_libraries(${target} PRIVATE ${${lib}_LIBRARY})
-        endforeach()
-    endmacro()
-
-    # I am constantly impressed at how ridiculously stupid the linker is
-    # NB: yes, we have to put them here twice. I have no idea why
-
-    # libtiff.a
-    extra_libs(tiff jbig bz2 lzma deflate jpeg tiff)
-
-    # libfreetype.a
-    extra_libs(freetype bz2 Lerc brotlidec brotlicommon freetype)
-
-    # libharfbuzz.a
-    extra_libs(harfbuzz graphite2)
-
-    # sijfjkfnjkdfjsbjsbsdfhvbdf
-    if (ENABLE_OPENSSL)
-        target_link_libraries(${target} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-    endif()
-endfunction()
--- a/CMakeModules/WindowsCopyFiles.cmake
+++ b/CMakeModules/WindowsCopyFiles.cmake
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

@@ -15,25 +12,16 @@ set(__windows_copy_files YES)

 # Any number of files to copy from SOURCE_DIR to DEST_DIR can be specified after DEST_DIR.
 # This copying happens post-build.
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
-        # windows commandline expects the / to be \ so switch them
-        string(REPLACE "/" "\\\\" SOURCE_DIR ${SOURCE_DIR})
-        string(REPLACE "/" "\\\\" DEST_DIR ${DEST_DIR})
+function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
+    # windows commandline expects the / to be \ so switch them
+    string(REPLACE "/" "\\\\" SOURCE_DIR ${SOURCE_DIR})
+    string(REPLACE "/" "\\\\" DEST_DIR ${DEST_DIR})

-        # /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output
-        # cmake adds an extra check for command success which doesn't work too well with robocopy
-        # so trick it into thinking the command was successful with the || cmd /c "exit /b 0"
-        add_custom_command(TARGET ${TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
-            COMMAND robocopy ${SOURCE_DIR} ${DEST_DIR} ${ARGN} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
-        )
-    endfunction()
-else()
-    function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
-        add_custom_command(TARGET ${TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
-            COMMAND cp -ra ${SOURCE_DIR}/. ${DEST_DIR}
-        )
-    endfunction()
-endif()
+    # /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output
+    # cmake adds an extra check for command success which doesn't work too well with robocopy
+    # so trick it into thinking the command was successful with the || cmd /c "exit /b 0"
+    add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
+        COMMAND robocopy ${SOURCE_DIR} ${DEST_DIR} ${ARGN} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
+    )
+endfunction()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,6 @@
-# Contributing
+<!--
+SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->

-You want to contribute? Please consult [the development guide](./docs/Development.md).
-
-Don't forget to [get a git account](./docs/SIGNUP.md) - not a requirement per se but it's highly recommended.
+**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).**
--- a/README.md
+++ b/README.md
@@ -21,14 +21,10 @@ It is written in C++ with portability in mind, and we actively maintain builds f

 <p align="center">
    </a>
-    <a href="https://discord.gg/HstXbPch7X">
-        <img src="https://img.shields.io/discord/1367654015269339267?color=5865F2&label=Eden&logo=discord&logoColor=white"
+    <a href="https://discord.gg/kXAmGCXBGD">
+        <img src="https://img.shields.io/discord/1317386222229917696?color=5865F2&label=Eden&logo=discord&logoColor=white"
            alt="Discord">
    </a>
-    <a href="https://stt.gg/qKgFEAbH">
-        <img src="https://img.shields.io/revolt/invite/qKgFEAbH?color=d61f3a&label=Stoat"
-            alt="Stoat">
-    </a>
 </p>

 <p align="center">
@@ -48,24 +44,21 @@ A list of supported games will be available in future. Please be patient.

 Check out our [website](https://eden-emu.dev) for the latest news on exciting features, monthly progress reports, and more!

-[![Packaging status](https://repology.org/badge/vertical-allrepos/eden-emulator.svg)](https://repology.org/project/eden-emulator/versions)
-
 ## Development

-Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/HstXbPch7X) or [Stoat](https://stt.gg/qKgFEAbH).
-You can also follow us on [X (Twitter)](https://nitter.poast.org/edenemuofficial) for updates and announcements.
+Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/edenemu).

-If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Stoat to learn more about the current state of the emulator.
-
-See the [sign-up instructions](docs/SIGNUP.md) for information on registration.
-
-Alternatively, if you wish to add translations, go to the [Eden project on Transifex](https://app.transifex.com/edenemu/eden-emulator) and review [the translations README](./dist/languages).
+If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented.
+You can also contact any of the developers on Discord to learn more about the current state of the emulator.

 ## Building

-See the [General Build Guide](docs/Build.md)
-
-For information on provided development tooling, see the [Tools directory](./tools)
+* **Windows**: [Windows Building Guide](./docs/build/Windows.md)
+* **Linux**: [Linux Building Guide](./docs/build/Linux.md)
+* **Android**: [Android Building Guide](./docs/build/Android.md)
+* **Solaris**: [Solaris Building Guide](./docs/build/Solaris.md)
+* **FreeBSD**: [FreeBSD Building Guide](./docs/build/FreeBSD.md)
+* **macOS**: [macOS Building Guide](./docs/build/macOS.md)

 ## Download

@@ -73,7 +66,7 @@ You can download the latest releases from [here](https://github.com/eden-emulato

 ## Support

-If you enjoy the project and would like to support us financially, please check out our developers' [donation pages](https://eden-emu.dev/donations)!
+If you enjoy the project and would like to support us financially, please check out our developers' [donation pages](https://eden-emu.dev/donations.html)!

 Any donations received will go towards things such as:
 * Switch consoles to explore and reverse-engineer the hardware
@@ -82,7 +75,7 @@ Any donations received will go towards things such as:
 * Additional hardware (e.g. GPUs as needed to improve rendering support, other peripherals to add support for, etc.)
 * CI Infrastructure

-If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/HstXbPch7X) and talk to Camille or any of our other developers.
+If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/edenemu) and talk to Camille or any of our other developers.

 ## License

--- a/cpmfile.json
+++ b/cpmfile.json
@@ -1,103 +0,0 @@
-{
-    "openssl": {
-        "ci": true,
-        "package": "OpenSSL",
-        "name": "openssl",
-        "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0-965d6279e8",
-        "min_version": "1.1.1"
-    },
-    "boost": {
-        "package": "Boost",
-        "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
-        "artifact": "%TAG%-cmake.tar.xz",
-        "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
-        "git_version": "1.89.0",
-        "version": "1.57",
-        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
-        "patches": [
-            "0001-clang-cl.patch",
-            "0002-use-marmasm.patch",
-            "0003-armasm-options.patch"
-        ]
-    },
-    "fmt": {
-        "repo": "fmtlib/fmt",
-        "tag": "%VERSION%",
-        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
-        "version": "8",
-        "git_version": "12.1.0"
-    },
-    "lz4": {
-        "name": "lz4",
-        "repo": "lz4/lz4",
-        "sha": "ebb370ca83",
-        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
-        "source_subdir": "build/cmake"
-    },
-    "nlohmann": {
-        "package": "nlohmann_json",
-        "repo": "nlohmann/json",
-        "tag": "v%VERSION%",
-        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
-        "version": "3.8",
-        "git_version": "3.12.0"
-    },
-    "zlib": {
-        "package": "ZLIB",
-        "repo": "madler/zlib",
-        "tag": "v%VERSION%",
-        "hash": "8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088",
-        "version": "1.2",
-        "git_version": "1.3.1",
-        "options": [
-            "ZLIB_BUILD_SHARED OFF",
-            "ZLIB_INSTALL OFF"
-        ]
-    },
-    "zstd": {
-        "repo": "facebook/zstd",
-        "sha": "b8d6101fba",
-        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
-        "version": "1.5",
-        "source_subdir": "build/cmake",
-        "find_args": "MODULE",
-        "options": [
-            "ZSTD_BUILD_SHARED OFF"
-        ]
-    },
-    "opus": {
-        "package": "Opus",
-        "repo": "crueter/opus",
-        "sha": "ab19c44fad",
-        "hash": "d632e8f83c5d3245db404bcb637113f9860bf16331498ba2c8e77979d1febee6b52d8b1da448e7d54eeac373e912cd55e3e300fc6c242244923323280dc43fbe",
-        "version": "1.3",
-        "find_args": "MODULE",
-        "options": [
-            "OPUS_PRESUME_NEON ON"
-        ]
-    },
-    "boost_headers": {
-        "repo": "boostorg/headers",
-        "sha": "95930ca8f5",
-        "hash": "8a07d7a6f0065587d3005a83481a794704ae22e773b9f336fbd89ed230aaa7b4c86c03edcbae30bba8b3e20839c3131eaa2dceac037ef811533ef4eadc53b15b",
-        "bundled": true
-    },
-    "llvm-mingw": {
-        "repo": "misc/llvm-mingw",
-        "git_host": "git.crueter.xyz",
-        "tag": "%VERSION%",
-        "version": "20250828",
-        "artifact": "clang-rt-builtins.tar.zst",
-        "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181"
-    },
-    "vulkan-validation-layers": {
-        "package": "VVL",
-        "repo": "KhronosGroup/Vulkan-ValidationLayers",
-        "tag": "vulkan-sdk-%VERSION%",
-        "git_version": "1.4.335.0",
-        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
-    }
-}
--- a/dist/Assets.car
+++ b/dist/Assets.car
--- a/dist/compatibility_list/compatibility_list.json
+++ b/dist/compatibility_list/compatibility_list.json
@@ -1,354 +0,0 @@
-[
-  {
-    "compatibility": 0,
-    "directory": "the-legend-of-zelda-breath-of-the-wild",
-    "releases": [
-      {"id": "01007EF00011E000"}
-    ],
-    "title": "The Legend of Zelda: Breath of the Wild"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-mario-odyssey",
-    "releases": [
-      {"id": "0100000000010000"}
-    ],
-    "title": "Super Mario Odyssey"
-  },
-  {
-    "compatibility": 0,
-    "directory": "animal-crossing-new-horizons",
-    "releases": [
-      {"id": "01006F8002326000"}
-    ],
-    "title": "Animal Crossing: New Horizons"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-legends-z-a",
-    "releases": [
-      {"id": "0100F43008C44000"}
-    ],
-    "title": "Pokémon Legends: Z-A"
-  },
-  {
-    "compatibility": 1,
-    "directory": "the-legend-of-zelda-tears-of-the-kingdom",
-    "releases": [
-      {"id": "0100F2C0115B6000"}
-    ],
-    "title": "The Legend of Zelda: Tears of the Kingdom"
-  },
-  {
-    "compatibility": 0,
-    "directory": "super-mario-galaxy",
-    "releases": [
-      {"id": "010099C022B96000"}
-    ],
-    "title": "Super Mario Galaxy"
-  },
-  {
-    "compatibility": 3,
-    "directory": "star-wars-republic-commando",
-    "releases": [
-      {"id": "0100FA10115F8000"}
-    ],
-    "title": "Star Wars: Republic Commando"
-  },
-  {
-    "compatibility": 0,
-    "directory": "doki-doki-literature-club-plus",
-    "releases": [
-      {"id": "010086901543E000"}
-    ],
-    "title": "Doki Doki Literature Club Plus"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-scarlet",
-    "releases": [
-      {"id": "0100A3D008C5C000"}
-    ],
-    "title": "Pokémon Scarlet"
-  },
-    {
-    "compatibility": 1,
-    "directory": "pokemon-violet",
-    "releases": [
-      {"id": "01008F6008C5E000"}
-    ],
-    "title": "Pokémon Violet"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-legends-arceus",
-    "releases": [
-      {"id": "01001E300D162000"}
-    ],
-    "title": "Pokémon Legends: Arceus"
-  },
-  {
-    "compatibility": 0,
-    "directory": "splatoon-2",
-    "releases": [
-      {"id": "01003BC0000A0000"}
-    ],
-    "title": "Splatoon 2"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-smash-bros-ultimate",
-    "releases": [
-      {"id": "01006A800016E000"}
-    ],
-    "title": "Super Smash Bros. Ultimate"
-  },
-  {
-    "compatibility": 0,
-    "directory": "mario-kart-8-deluxe",
-    "releases": [
-      {"id": "0100152000022000"}
-    ],
-    "title": "Mario Kart 8 Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "splatoon-3",
-    "releases": [
-      {"id": "0100C2500FC20000"}
-    ],
-    "title": "Splatoon 3"
-  },
-  {
-    "compatibility": 0,
-    "directory": "new-super-mario-bros-u-deluxe",
-    "releases": [
-      {"id": "0100EA80032EA000"}
-    ],
-    "title": "New Super Mario Bros. U Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "hyrule-warriors-age-of-calamity",
-    "releases": [
-      {"id": "01002B00111A2000"}
-    ],
-    "title": "Hyrule Warriors: Age of Calamity"
-  },
-  {
-    "compatibility": 2,
-    "directory": "luigis-mansion-3",
-    "releases": [
-      {"id": "0100DCA0064A6000"}
-    ],
-    "title": "Luigi's Mansion 3"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-brilliant-diamond",
-    "releases": [
-      {"id": "0100000011D90000"}
-    ],
-    "title": "Pokémon Brilliant Diamond"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-shining-pearl",
-    "releases": [
-      {"id": "010018E011D92000"}
-    ],
-    "title": "Pokémon Shining Pearl"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-mario-3d-world-bowsers-fury",
-    "releases": [
-      {"id": "010028600EBDA000"}
-    ],
-    "title": "Super Mario 3D World + Bowser's Fury"
-  },
-  {
-    "compatibility": 0,
-    "directory": "the-legend-of-zelda-links-awakening",
-    "releases": [
-      {"id": "01006BB00C6F0000"}
-    ],
-    "title": "The Legend of Zelda: Link's Awakening"
-  },
-  {
-    "compatibility": 1,
-    "directory": "fire-emblem-three-houses",
-    "releases": [
-      {"id": "010055D009F78000"}
-    ],
-    "title": "Fire Emblem: Three Houses"
-  },
-  {
-    "compatibility": 2,
-    "directory": "metroid-dread",
-    "releases": [
-      {"id": "010093801237C000"}
-    ],
-    "title": "Metroid Dread"
-  },
-  {
-    "compatibility": 0,
-    "directory": "paper-mario-the-origami-king",
-    "releases": [
-      {"id": "0100A3900C3E2000"}
-    ],
-    "title": "Paper Mario: The Origami King"
-  },
-  {
-    "compatibility": 1,
-    "directory": "xenoblade-chronicles-definitive-edition",
-    "releases": [
-      {"id": "0100FF500E34A000"}
-    ],
-    "title": "Xenoblade Chronicles: Definitive Edition"
-  },
-  {
-    "compatibility": 2,
-    "directory": "xenoblade-chronicles-3",
-    "releases": [
-      {"id": "010074F013262000"}
-    ],
-    "title": "Xenoblade Chronicles 3"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pikmin-3-deluxe",
-    "releases": [
-      {"id": "0100F8600D4B0000"}
-    ],
-    "title": "Pikmin 3 Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "donkey-kong-country-tropical-freeze",
-    "releases": [
-      {"id": "0100C1F0054B6000"}
-    ],
-    "title": "Donkey Kong Country: Tropical Freeze"
-  },
-  {
-    "compatibility": 1,
-    "directory": "kirby-and-the-forgotten-land",
-    "releases": [
-      {"id": "01004D300C5AE000"}
-    ],
-    "title": "Kirby and the Forgotten Land"
-  },
-  {
-    "compatibility": 2,
-    "directory": "mario-party-superstars",
-    "releases": [
-      {"id": "01006B400D8B2000"}
-    ],
-    "title": "Mario Party Superstars"
-  },
-  {
-    "compatibility": 0,
-    "directory": "clubhouse-games-51-worldwide-classics",
-    "releases": [
-      {"id": "0100F8600D4B0000"}
-    ],
-    "title": "Clubhouse Games: 51 Worldwide Classics"
-  },
-  {
-    "compatibility": 1,
-    "directory": "ring-fit-adventure",
-    "releases": [
-      {"id": "01006B300BAF8000"}
-    ],
-    "title": "Ring Fit Adventure"
-  },
-  {
-    "compatibility": 2,
-    "directory": "arms",
-    "releases": [
-      {"id": "01009B500007C000"}
-    ],
-    "title": "ARMS"
-  },
-  {
-    "compatibility": 0,
-    "directory": "super-mario-maker-2",
-    "releases": [
-      {"id": "01009B90006DC000"}
-    ],
-    "title": "Super Mario Maker 2"
-  },
-  {
-    "compatibility": 0,
-    "directory": "pokemon-lets-go-pikachu",
-    "releases": [
-      {"id": "010003F003A34000"}
-    ],
-    "title": "Pokémon: Let's Go, Pikachu!"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-lets-go-eevee",
-    "releases": [
-      {"id": "0100187003A36000"}
-    ],
-    "title": "Pokémon: Let's Go, Eevee!"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-sword",
-    "releases": [
-      {"id": "0100ABF008968000"}
-    ],
-    "title": "Pokémon Sword"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-shield",
-    "releases": [
-      {"id": "01008DB008C2C000"}
-    ],
-    "title": "Pokémon Shield"
-  },
-  {
-    "compatibility": 1,
-    "directory": "new-pokemon-snap",
-    "releases": [
-      {"id": "0100F4300C182000"}
-    ],
-    "title": "New Pokémon Snap"
-  },
-  {
-    "compatibility": 0,
-    "directory": "mario-golf-super-rush",
-    "releases": [
-      {"id": "0100C9C00E25C000"}
-    ],
-    "title": "Mario Golf: Super Rush"
-  },
-  {
-    "compatibility": 1,
-    "directory": "mario-tennis-aces",
-    "releases": [
-      {"id": "0100BDE00862A000"}
-    ],
-    "title": "Mario Tennis Aces"
-  },
-  {
-    "compatibility": 2,
-    "directory": "wario-ware-get-it-together",
-    "releases": [
-      {"id": "0100563010F22000"}
-    ],
-    "title": "WarioWare: Get It Together!"
-  },
-  {
-    "compatibility": 0,
-    "directory": "big-brain-academy-brain-vs-brain",
-    "releases": [
-      {"id": "0100190010F24000"}
-    ],
-    "title": "Big Brain Academy: Brain vs. Brain"
-  }
-]
--- a/dist/compatibility_list/compatibility_list.qrc
+++ b/dist/compatibility_list/compatibility_list.qrc
@@ -1,3 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+
 <RCC>
  <qresource prefix="compatibility_list">
      <file>compatibility_list.json</file>
--- a/dist/dev.eden_emu.eden.desktop
+++ b/dist/dev.eden_emu.eden.desktop
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Eden
-GenericName=Switch Emulator
-Comment=Nintendo Switch video game console emulator
-Icon=dev.eden_emu.eden
-TryExec=eden
-Exec=eden %f
-Categories=Game;Emulator;Qt;
-MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
-Keywords=Nintendo;Switch;
-StartupWMClass=eden
--- a/dist/dev.eden_emu.eden.svg
+++ b/dist/dev.eden_emu.eden.svg
--- a/dist/dev.eden_emu.eden.xml
+++ b/dist/dev.eden_emu.eden.xml
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-SPDX-FileCopyrightText: 2025 Eden Emulator Project
-SPDX-License-Identifier: GPL-3.0-or-later
-->
-
-<!--
-SPDX-FileCopyrightText: 2018 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
-->
-
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-    <mime-type type="application/x-nx-nro">
-        <comment>Nintendo Switch homebrew executable</comment>
-        <acronym>NRO</acronym>
-        <icon name="org.eden_emu.eden"/>
-        <glob pattern="*.nro"/>
-        <magic><match value="NRO" type="string" offset="16"/></magic>
-    </mime-type>
-
-    <mime-type type="application/x-nx-nso">
-        <comment>Nintendo Switch homebrew executable</comment>
-        <acronym>NSO</acronym>
-        <icon name="org.eden_emu.eden"/>
-        <glob pattern="*.nso"/>
-        <magic><match value="NSO" type="string" offset="0"/></magic>
-    </mime-type>
-
-    <mime-type type="application/x-nx-nsp">
-        <comment>Nintendo Switch Package</comment>
-        <acronym>NSP</acronym>
-        <icon name="org.eden_emu.eden"/>
-        <glob pattern="*.nsp"/>
-        <magic><match value="PFS" type="string" offset="0"/></magic>
-    </mime-type>
-
-    <mime-type type="application/x-nx-xci">
-        <comment>Nintendo Switch Card Image</comment>
-        <acronym>XCI</acronym>
-        <icon name="org.eden_emu.eden"/>
-        <glob pattern="*.xci"/>
-    </mime-type>
-</mime-info>
--- a/dist/eden.icns
+++ b/dist/eden.icns
--- a/dist/eden.ico
+++ b/dist/eden.ico
--- a/dist/eden_named.ico
+++ b/dist/eden_named.ico
--- a/dist/eden_named.svg
+++ b/dist/eden_named.svg
--- a/dist/icon_variations/README.md
+++ b/dist/icon_variations/README.md
@@ -1,9 +0,0 @@
-# Icon variations
-
-These icons are licensed under GPLv3. Please see the [script for generating icons](../../tools/README.md) and appropriatedly redirect for seasonal icons.
-
- `base_named.svg` - Named variant.
- `base_small.svg`: Variant used for tiny icons (16x16, 64x64, etc).
- `base.svg`: Variant without branding/naming.
-
-Try to keep the icons simple. And preferably automatically be able to be generated (to reduce maintanaince burden). Additionally keep the files small (use `svgo` and `optipng`) to not clutter the git.
--- a/dist/icon_variations/base.svg
+++ b/dist/icon_variations/base.svg
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient24"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#f71baa;stop-opacity:0.56623769;"
-         offset="0"
-         id="stop24" />
-      <stop
-         style="stop-color:#fa87d4;stop-opacity:0.25;"
-         offset="1"
-         id="stop25" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:0;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff0950;stop-opacity:0.5;"
-         offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.75;"
-         offset="0.49556771"
-         id="stop20" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="1"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient12"
-       x1="270.39996"
-       y1="39.999989"
-       x2="270.39996"
-       y2="494.39996"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="125.40197"
-       y1="271.834"
-       x2="431.02424"
-       y2="271.834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24"
-       id="linearGradient25"
-       x1="270.39996"
-       y1="33.58408"
-       x2="270.39996"
-       y2="500.81589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.88388348"
-     inkscape:cx="141.98704"
-     inkscape:cy="265.87215"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <circle
-     style="fill:url(#linearGradient12);fill-opacity:1;stroke:url(#linearGradient25);stroke-width:13.7948;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     id="path8"
-     cx="256.76401"
-     cy="253.05354"
-     r="244.25046" />
-  <path
-     id="rect1-3"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="M 55.701477,114.37179 A 244.25044,244.25044 0 0 0 44.86493,131.57252 h 423.79699 a 244.25044,244.25044 0 0 0 -10.83655,-17.20073 z" />
-  <path
-     style="fill:#ff2bd5;fill-opacity:1;stroke-width:14.3776;stroke-opacity:0.415999;paint-order:stroke fill markers"
-     d="M 219.6651,499.13816 209.32675,443.18948"
-     id="path9" />
-  <path
-     id="rect1-2"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 58.271509,395.38922 a 244.25044,244.25044 0 0 0 13.54096,17.20073 H 441.71437 a 244.25044,244.25044 0 0 0 13.54097,-17.20073 z" />
-  <path
-     id="rect1-2-5"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 24.604933,328.95264 a 244.25044,244.25044 0 0 0 6.347389,17.20074 H 482.57453 a 244.25044,244.25044 0 0 0 6.34738,-17.20074 z" />
-  <path
-     id="rect1"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 12.586253,259.07464 a 244.25044,244.25044 0 0 0 1.033053,17.20075 H 499.90754 a 244.25044,244.25044 0 0 0 1.03305,-17.20075 z" />
-  <path
-     id="path15"
-     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffffff;stroke-width:17.2007;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 306.21658,12.242412 c 0,0 -11.75029,42.031067 -17.70256,63.362621 -12.7133,9.964494 -21.07468,19.289937 -21.07468,19.289937 0,0 -22.95662,-32.534232 -44.84956,-46.065299 C 200.69681,35.298604 171.19123,37.04196 171.19123,37.04196 c 0,0 -12.25678,4.2e-4 -27.09242,5.805668 -14.83563,5.805249 -20.85631,9.675414 -20.85631,9.675414 0,0 15.05232,-0.430438 37.19828,7.094883 22.14594,7.525322 31.82093,12.041775 31.82093,12.041775 l 30.42255,-6.880714 -8.27702,11.611336 c 0,0 14.51396,9.3529 22.36179,17.738259 7.84785,8.385359 11.50216,13.114729 11.50216,13.114729 0,0 -13.65224,-5.69691 -55.57904,-1.82674 -41.92679,3.87016 -83.20898,59.12752 -83.20898,59.12752 0,0 40.42048,-16.77155 64.28649,-22.36179 23.86602,-5.59024 46.65742,-8.3862 46.65742,-8.3862 0,0 -18.05952,7.74075 -37.41035,40.20714 -19.35082,32.46639 -13.76142,84.06986 -13.76142,84.06986 0,0 30.74631,-61.92266 60.20258,-82.77854 29.45625,-20.8559 35.47652,-21.50092 35.47652,-21.50092 0,0 -23.6506,50.74216 -32.896,132.23065 -9.24539,81.48849 29.67085,217.8039 29.67085,217.8039 l 46.87159,-7.31116 c 0,0 -44.72107,-44.29147 -48.59124,-158.67636 -3.87017,-114.3849 16.33986,-182.75782 16.33986,-182.75782 0,0 16.77156,1.29005 41.71263,34.40147 24.94106,33.11142 39.56043,60.20258 39.56043,60.20258 0,0 9.46208,-53.75314 -11.1788,-78.26419 -20.64088,-24.51105 -52.46309,-35.26025 -52.46309,-35.26025 0,0 13.4385,-6.98738 41.28219,-4.94479 27.84369,2.04258 85.60053,28.44463 85.60053,28.44462 0,0 -15.50743,-26.7591 -51.84367,-45.30731 -36.33623,-18.548198 -79.76967,0.30655 -79.76967,0.30655 0,0 4.05525,-16.118294 28.53281,-34.210394 24.47756,-18.092095 55.79742,-36.030833 55.79742,-36.030833 0,0 -25.84554,1.216607 -54.12395,12.619193 -7.03608,2.837127 -13.78978,6.605056 -19.96604,10.666471 l 17.06635,-53.527632 z" />
-</svg>
--- a/dist/icon_variations/base_bgcolor
+++ b/dist/icon_variations/base_bgcolor
@@ -1 +0,0 @@
-#1F143C
--- a/dist/icon_variations/base_named.svg
+++ b/dist/icon_variations/base_named.svg
--- a/dist/icon_variations/halloween2025.svg
+++ b/dist/icon_variations/halloween2025.svg
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="dev.eden_emu.eden.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7" />
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.25"
-     inkscape:cx="186.8"
-     inkscape:cy="210.4"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <path
-     fill="#bf42f6"
-     d="M346.71 255.306c.788.006 1.577.013 3.124.059 4.006.027 7.253.015 10.501.003 33.391.022 66.783.028 100.175.078 8.174.013 16.349.279 24.522.209 3.084-.026 4.596.75 4.356 4.156-.293 4.157-.31 8.343-.259 12.513.049 3.964-1.248 5.539-5.679 5.524-48.85-.158-97.701-.071-146.552-.056-22.107.007-44.214 0-66.321 0h-5.43v7.117h223.011c-1.553 8.254-2.894 15.76-4.475 23.215-.17.802-1.666 1.617-2.685 1.87-1.312.327-2.763.099-4.155.099H265.099v6.701h216.666c-1.609 5.425-2.887 10.074-4.367 14.658-2.758 8.54-2.807 8.524-11.564 8.524-64.929 0-129.859.014-194.788-.04-3.401-.003-6.19.251-4.758 4.652.349 1.075 1.875 2.026 3.071 2.491 1.075.418 2.439.092 3.676.092l191.542.001h7.17c-3.533 7.29-6.399 13.72-9.834 19.83-.651 1.157-3.562 1.448-5.432 1.454-27.981.088-55.963.061-83.944.061-31.692 0-63.384.005-95.075-.008-2.61-.002-5.219-.124-8.53-.021-3.11.173-5.518.177-7.926.181-.849-7.032-2.289-14.051-2.44-21.098-.547-25.616-.773-51.242-.844-76.864-.014-4.88 1.228-9.763 2.52-14.927 2.88-.296 5.132-.31 7.81-.259 22.492.021 44.557-.024 67.034-.066 4.149-.049 7.886-.099 11.624-.149"
-     id="path1"
-     style="fill:#fea265;fill-opacity:1" />
-  <path
-     fill="#ff44c4"
-     d="M168.124 257.114v-9.301c-2.407 0-4.67-.001-6.933.001-44.522.025-89.044.01-133.566.146-3.858.012-5.358-1.03-4.744-5 .683-4.418 1.254-8.885 1.393-13.346.106-3.386 1.603-4.005 4.608-4.012 45.9-.11 91.801-.344 137.702-.452 3.865-.009 6.842-.344 6.032-5.831H25.546c1.39-6.599 2.354-12.681 4.138-18.513.413-1.35 3.628-2.615 5.555-2.618 47.458-.084 94.917-.01 142.375.109 3.275.008 5.855-.38 6.138-5.045H31.147c3.43-9.311 6.348-17.71 9.74-25.913.483-1.166 3.265-1.942 4.987-1.95 24.582-.124 49.165-.21 73.745.014 5.283.048 8.073-2.583 11.128-7.248h-86.45c4.35-7.835 8.002-14.753 12.077-21.412.67-1.096 3.197-1.473 4.868-1.478 30.611-.083 61.226-.291 91.832.113 7.185.094 12.719-2.619 18.321-6.774H61.385c2.592-3.805 4.355-6.546 6.268-9.178 8.88-12.216 8.896-12.209 24.069-12.21q60.991-.002 121.982-.001h5.885c-3.968-4.128-7.007-6.966-12.321-6.944-38.959.165-77.92.09-116.88.09H85.03l-.741-1.31c3.832-3.852 7.564-7.81 11.514-11.537 11.456-10.807 11.495-10.996 27.246-10.717 23.209.411 45.103 6.8 66.234 15.885 5.657 2.432 10.56 3.715 16.604.944 4.726-2.166 10.217-2.664 16.034-3.521-4.411 8.139.887 12.041 5.52 16.414 5.73 5.408 11.223 11.07 16.751 16.688 1.165 1.185 2.035 2.659 3.685 4.857-2.256.128-3.665.274-5.075.275-9.739.008-19.489.286-29.214-.085-28.045-1.07-51.592 9.244-71.602 28.209-7.152 6.778-13.525 14.379-20.212 21.643-.683.742-1.079 1.748-2.209 3.632 33.94-11.926 65.876-27.377 101.589-28.637l.859 1.395c-4.228 4.943-8.188 10.148-12.73 14.783-18.091 18.461-28.905 40.673-33.892 65.773-1.402 7.057-1.306 14.412-2.504 21.941-1.992.248-3.377.184-4.762.121m19.995-91.726c3.865.004 7.763-.315 11.585.09 5.562.589 8.92-2.178 12.525-7.52-9.134 2.152-17.144 4.039-25.139 5.988-.008.002.209.928 1.029 1.442"
-     id="path2"
-     style="fill:#ff7f2a;fill-opacity:1" />
-  <path
-     fill="#bf43f5"
-     d="M167.719 257.136c1.79.041 3.175.105 4.979.185.569 3.091.719 6.166.87 9.24l1.623.577c2.3-3.392 4.599-6.785 7.467-10.458 2.456-.382 4.343-.483 6.573-.598 1.405-.133 2.466-.342 3.53-.356 12.08-.162 24.16-.295 36.693-.368 3.463.111 6.473.155 9.484.2-1.12 6.677-2.306 13.345-3.347 20.035-4.715 30.285-5.404 60.697-3.186 91.651-2.469.746-4.517 1.048-6.565 1.35-56.117-.025-112.236-.135-168.353.061-5.334.018-8.298-1.559-10.185-6.415-1.874-4.824-4.295-9.436-6.907-15.069h17.147c53.955 0 107.909.013 161.863-.044 2.026-.002 4.864 1.218 5.327-2.599.469-3.862-1.271-4.625-4.781-4.616-38.803.103-77.607.061-116.411.068-20.405.003-40.811-.065-61.215.125-3.545.033-5.36-1.044-6.324-4.419-1.642-5.75-3.577-11.416-5.879-18.659 65.363-.259 129.677-.027 194.424-.144l.372-6.533c-1.901-.099-3.398-.244-4.896-.245-58.283-.032-116.565-.056-174.848-.06-4.48 0-8.964.279-13.439.163-1.138-.029-3.078-.897-3.247-1.681-1.676-7.766-3.056-15.595-4.624-23.961 8.433 0 15.808-.031 23.182.02 1.998.014 3.995.4 5.992.401 55.964.023 111.928.02 167.892.017 6.075 0 6.307-.256 6.266-7.198H23.431c-.284-6.643-.72-12.739-.592-18.823.016-.786 2.94-2.144 4.53-2.165 15.149-.197 30.3-.177 45.45-.191 17.623-.016 35.248-.072 52.871.018 13.876.07 27.75.335 42.029.491"
-     id="path3"
-     style="fill:#fea265;fill-opacity:1" />
-  <path
-     fill="#985ded"
-     d="M225.868 369.021c2.02-.729 4.068-1.031 6.551-1.351 2.672 17.851 4.169 35.853 7.334 53.556 4.047 22.64 9.785 44.94 18.63 66.298.29.699.498 1.433.742 2.142-25.39 10.452-124.622-22.609-146.929-49.453h122.669c.302-4.81-.85-6.915-5.85-6.891-39.883.193-79.768.055-119.652.182-4.441.014-8.036-.845-11.208-4.17-6.87-7.203-13.99-14.166-21.008-21.228l.69-1.319H229.63l-1.24-7.289h-5.726c-42.821 0-85.642.011-128.464-.013-6.18-.003-12.371-.428-18.537-.173-3.704.154-6.14-1.066-8.104-4.073-4.111-6.292-8.367-12.489-13.256-19.755h171.593c0-2.433 0-4.234-.027-6.463m35.103.062c2.442-.418 4.85-.422 7.641-.431.482 1.987.581 3.979.706 6.499H457.62c-3.126 4.951-5.544 8.946-8.123 12.835-7.64 11.521-7.665 11.508-21.226 11.509l-147.5.003h-5.407c-.602 6.688-.15 7.214 5.824 7.214q73.75.004 147.5.004h6.891c-4.048 4.533-7.454 7.812-10.233 11.556-9.047 12.19-20.575 16.124-35.967 15.542-33.039-1.25-66.159-.384-99.246-.384h-5.45c-.275 5.77.583 6.774 5.594 6.776 34.478.012 68.957.006 103.435.007h5.302l.443 1.274c-3.495 2.62-6.91 5.358-10.5 7.842-23.505 16.265-49.192 27.744-76.893 34.696-3.263.819-6.763 1.374-10.069 1.085-1.874-.164-4.144-1.915-5.266-3.597-9.503-14.258-15.474-30.133-21.055-46.227-7.418-21.394-11.59-43.465-14.702-66.203"
-     id="path4"
-     style="fill:#fe8463;fill-opacity:1" />
-  <path
-     fill="#ff43c4"
-     d="M360.319 254.985c-3.232.395-6.479.407-10.189.359 2.612-14.328 2.295-28.523-1.162-42.703-4.74-19.439-15.808-34.254-32.502-45.039-.639-.413-1.27-.839-1.852-2.137h52.547l.213-1.506c-7.026-2.665-13.978-5.752-21.733-5.819-15.455-.136-30.914.047-46.369-.12-3.092-.034-6.173-1.044-9.202-2.411 18.374-7.385 37.172-6.583 56.061-3.6 19.128 3.021 35.771 12.957 54.614 20.622l-3.662-6.95c1.846-.148 3.252-.359 4.658-.36 21.485-.021 42.97.048 64.454-.082 3.262-.019 5.062.848 6.121 4.101 2.319 7.128 5.012 14.134 7.891 22.129h-127.22c.144 4.537 2.105 5.796 5.897 5.783q43.588-.154 87.175-.028c10.803.031 21.607.309 32.402.688 1.327.047 3.486 1.183 3.763 2.215 1.549 5.774 2.638 11.671 4.021 18.169H361.127c-.548 6.29-.254 6.61 5.207 6.619 38.949.061 77.898.158 116.847.146 2.863-.001 4.211.672 4.397 3.772.304 5.076.956 10.136 1.609 15.183.414 3.199-.637 4.443-4.005 4.328-6.635-.228-13.283-.105-19.926-.106q-49.152-.005-98.304.001c-6.266.001-6.266.007-6.633 6.746"
-     id="path5"
-     style="fill:#ff7f2a;fill-opacity:1" />
-  <path
-     fill="#ff42c3"
-     d="M214.837 27.347c41.832-7.02 81.069-2.12 103 5.453-3.084 7.222-6.153 14.42-9.231 21.612-1.64 3.833-3.549 7.574-4.869 11.513-1.091 3.256-2.992 4.06-6.217 4.042-22.092-.119-44.185-.062-67.454-.062 3.94 4.046 6.873 7.296 12.308 7.245 16.689-.157 33.381-.056 50.072-.055h6.745c-3.661 6.1-6.056 11.84-9.975 16.217-6.139 6.856-13.44 12.659-19.972 19.184-2.516 2.514-3.687 2.416-6.101-.229-9.873-10.813-19.809-21.593-30.196-31.908-11.454-11.376-25.983-16.088-41.742-17.908-14.011-1.618-27.312.965-40.451 5.507a34.7 34.7 0 0 1-9.886 1.86c-7.248.275-14.513.085-21.995-.508 28.501-21.58 60.452-35.31 95.964-41.963m53.746 77.311 3.605-4.283h-11.056c1.525 2.155 2.339 3.846 3.653 4.931.643.531 2.216-.065 3.798-.648"
-     id="path6"
-     style="fill:#63915a;fill-opacity:1" />
-  <path
-     fill="#ff44c4"
-     d="M377.152 144.943c-12.092-9.869-26.287-13.386-40.919-15.513-16.956-2.465-33.583-1.51-50.074 5.653.952-1.742 1.722-3.617 2.884-5.206 15.646-21.395 34.923-38.76 58.357-51.192 3.545-1.881 8.365-1.78 12.607-1.849 13.445-.22 26.898-.165 40.345-.002 2.017.024 4.514.652 5.947 1.938 7.01 6.292 13.741 12.894 20.545 19.414.386.37.542.98 1.172 2.175h-5.468c-30.918 0-61.837.116-92.753-.114-5.213-.039-8.095 2.606-11.98 6.969h6.295c35.092-.001 70.184.065 105.275-.091 4.005-.018 6.738 1.186 8.994 4.365 3.728 5.252 7.642 10.372 12.234 16.566h-90.207l-.153 1.134c6.582 2.444 12.387 6.339 20.175 6.183 23.179-.463 46.374-.087 69.561-.245 3.754-.026 6.054 1.177 7.725 4.48 2.979 5.887 6.211 11.646 9.711 18.154-2.304.15-3.753.325-5.203.326-22.415.017-44.831-.042-67.246.074-3.19.016-5.54-.802-7.705-3.211-3.093-3.441-6.561-6.545-10.119-10.008M267.626 255.455a972 972 0 0 1-7.18.028c2.056-26.604 4.319-53.217 12.215-78.952 1.17-3.813 2.458-5.484 6.241-2.773 3.757 2.69 8.105 4.741 11.346 7.934 22.076 21.743 42.878 44.52 56.347 73.308-3.623.356-7.36.406-11.542.092-1.222-4.579-3.365-6.359-8.021-6.284-17.697.286-35.402.122-53.104.126h-6.302zm2.176-30.951h44.834l.519-1.678c-1.826-.906-3.637-2.562-5.479-2.597-12.466-.234-24.937-.104-37.407-.144-2.831-.009-4.108.992-2.467 4.419m10.378-31.312c-3.285-.223-6.209-.007-5.651 4.577h16.788c-2.211-5.078-6.298-4.716-11.137-4.577m-41.043 62.082c-3.21.24-6.22.195-9.566-.301-.214-2.054-.093-3.657.08-5.95-11.47 0-22.329-.006-33.188.003-5.917.004-6.716.761-7.574 7.07-1.888.101-3.775.202-6.063.302 4.551-9.736 8.81-19.906 14.604-29.11 10.304-16.372 21.983-31.76 37.616-43.656 7.217-5.492 15.096-9.592 23.847-11.977 1.13-.308 2.333-.345 4.833-.691-10.43 27.968-18.906 55.583-24.589 84.31m-25.72-36.778c-4.442-.439-5.459 2.888-7.32 6.624 9.882 0 19.096-.135 28.302.061 4.188.089 5.338-1.767 4.777-6.598-8.393 0-16.684 0-25.759-.087m33.855-22.914c-1.112-.66-2.178-1.777-3.343-1.89-2.903-.28-5.86.032-8.779-.147-3.761-.229-5.839 1.749-7.932 5.507 6.203 0 11.685.126 17.15-.12.95-.043 1.829-1.662 2.904-3.35m96.491-154.518c17.922 7.326 34.473 16.35 49.706 28.527-30.671-2.027-59.888 3.402-88.579 15.8.855-4.673 2.395-7.566 6.408-8.806 5.86-1.811 11.674-3.77 17.472-6.488h-16.478c5.867-11.505 11.161-22.041 16.71-32.442.395-.74 2.807-.966 4.029-.597 3.534 1.07 6.939 2.564 10.732 4.006"
-     id="path7"
-     style="fill:#ff7f2a;fill-opacity:1" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 130,278.4 c 69.2,16 30.4,65.6 30.4,65.6 0,0 -14.8,-92.4 28.8,-46.4 43.6,46 -59.2,-19.2 -59.2,-19.2 z"
-     id="path8" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 76.08469,213.54625 c 17.819091,7.91959 0.282842,24.32447 22.061731,7.91959 21.778889,-16.40487 53.174429,-48.3661 21.778889,-16.40487 -31.395541,31.96122 -43.84062,8.48528 -43.84062,8.48528 z"
-     id="path9" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 310.4,292.8 c 36,20.8 16,50.4 40,18.8 24,-31.6 46.8,-57.2 14.8,-33.6 -32,23.6 -54.8,14.8 -54.8,14.8 z"
-     id="path10" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 380.8,197.2 c 41.6,30.4 18.4,62.8 42,30.4 23.6,-32.4 10,-68.8 23.6,-32.4 13.6,36.4 58,64.4 13.6,36.4 -44.4,-28 -79.2,-34.4 -79.2,-34.4 z"
-     id="path11" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="M 99.6,145.2 C 146,120.4 170.4,80.8 146,120.4 121.6,160 121.2,187.6 120.4,159.6 119.6,131.6 99.6,145.2 99.6,145.2 Z"
-     id="path12" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 166.4,395.2 c 36.4,-34.4 26.8,-68.4 35.2,-32.8 8.4,35.6 -36,4.8 -36,4.8 z"
-     id="path13" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="M 325.6,419.2 C 390,378.4 402,310 388.8,379.6 c -13.2,69.6 7.6,39.6 -15.6,67.6 -23.2,28 81.6,-113.2 50,-90.8 -31.6,22.4 -97.6,62.8 -97.6,62.8 z"
-     id="path14" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="m 298.11622,232.77955 c 9.33381,30.82986 27.43574,16.68772 9.05097,29.41564 -18.38478,12.72793 -23.19311,44.12347 -17.53625,11.59656 5.65685,-32.52692 8.48528,-41.0122 8.48528,-41.0122 z"
-     id="path15" />
-  <path
-     style="fill:#000000;fill-opacity:1"
-     d="M 54.305801,291.32799 C 110.5915,257.10403 141.42136,225.1428 108.89444,258.51824 76.367532,291.89368 96.166522,307.73287 78.913117,291.04515 61.659711,274.35743 54.022958,289.06525 54.022958,289.06525 l 53.174432,-31.1127 z"
-     id="path16" />
-</svg>
--- a/dist/icon_variations/halloween2025_named.svg
+++ b/dist/icon_variations/halloween2025_named.svg
--- a/dist/icon_variations/newyear2025.svg
+++ b/dist/icon_variations/newyear2025.svg
@@ -1,672 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="newyear2025.svg"
-   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <metadata>
-    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#">
-      <cc:Work rdf:about="">
-        <dc:title>New Year 2025 Logo</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Madeline_Dev</dc:title>
-            <dc:identifier>mailto:madelvidel@gmail.com</dc:identifier>
-          </cc:Agent>
-        </dc:creator>
-        <dc:date>2025</dc:date>
-        <dc:license rdf:resource="https://www.gnu.org/licenses/gpl-3.0.html"/>
-        <dc:rights>2025 Eden Emulator Project</dc:rights>
-        <dc:source>https://git.eden-emu.dev</dc:source>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7"><linearGradient
-       id="swatch14"
-       inkscape:swatch="solid"><stop
-         style="stop-color:#66003b;stop-opacity:1;"
-         offset="0"
-         id="stop14" /></linearGradient><linearGradient
-       id="linearGradient1"
-       inkscape:collect="always"><stop
-         style="stop-color:#670047;stop-opacity:1;"
-         offset="0"
-         id="stop1" /><stop
-         style="stop-color:#54003b;stop-opacity:0;"
-         offset="1"
-         id="stop2" /></linearGradient><linearGradient
-       id="linearGradient11"
-       inkscape:collect="always"><stop
-         style="stop-color:#60001d;stop-opacity:1;"
-         offset="0"
-         id="stop11" /><stop
-         style="stop-color:#2f087e;stop-opacity:1;"
-         offset="0.49822688"
-         id="stop20" /><stop
-         style="stop-color:#0d3969;stop-opacity:1;"
-         offset="0.99898213"
-         id="stop12" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient12"
-       x1="109.74531"
-       y1="106.54533"
-       x2="431.05463"
-       y2="427.85461"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="translate(-14.100045,-9.900077)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="125.40197"
-       y1="271.834"
-       x2="431.02424"
-       y2="271.834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0017288,0,0,0.93676627,-14.581021,3.8948884)" /><filter
-       inkscape:label="Light Contour"
-       inkscape:menu="Image Paint and Draw"
-       inkscape:menu-tooltip="Uses vertical specular light to draw lines"
-       style="color-interpolation-filters:sRGB"
-       id="filter11"
-       x="-0.01907517"
-       y="-0.054959154"
-       width="1.0379885"
-       height="1.1092314"><feGaussianBlur
-         in="SourceGraphic"
-         stdDeviation="0.38250006"
-         result="result3"
-         id="feGaussianBlur9" /><feComponentTransfer
-         result="result1"
-         in="result3"
-         id="feComponentTransfer9"><feFuncR
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncR9" /><feFuncG
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncG9" /><feFuncB
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncB9" /></feComponentTransfer><feGaussianBlur
-         result="result5"
-         stdDeviation="0.01"
-         id="feGaussianBlur10" /><feBlend
-         in2="result5"
-         result="result6"
-         mode="lighten"
-         in="result5"
-         id="feBlend10" /><feColorMatrix
-         in="result6"
-         type="luminanceToAlpha"
-         result="result2"
-         id="feColorMatrix10" /><feSpecularLighting
-         surfaceScale="5"
-         result="result9"
-         specularExponent="20"
-         in="result2"
-         specularConstant="1"
-         id="feSpecularLighting10"><feDistantLight
-           azimuth="180"
-           elevation="90"
-           id="feDistantLight10" /></feSpecularLighting><feComposite
-         in2="result6"
-         operator="arithmetic"
-         in="result9"
-         k1="0.4"
-         k3="0.7"
-         result="result3"
-         id="feComposite10"
-         k2="0"
-         k4="0" /><feBlend
-         in2="result1"
-         in="result3"
-         mode="normal"
-         result="result8"
-         id="feBlend11" /><feComposite
-         in2="SourceGraphic"
-         in="result8"
-         operator="in"
-         result="result7"
-         id="feComposite11" /></filter></defs><sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.2"
-     inkscape:cx="255.83333"
-     inkscape:cy="263.75"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7"
-     showguides="false" /><circle
-     style="fill:url(#linearGradient12);fill-opacity:1;stroke:#ffef91;stroke-width:12.8318;stroke-opacity:1;paint-order:stroke fill markers"
-     id="path8"
-     cx="256.2999"
-     cy="257.2999"
-     r="227.2" /><path
-     id="path15"
-     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffef91;stroke-width:15.499;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 302.36635,44.362459 c 0,0 -10.94894,36.624745 -16.49527,55.212494 -11.84627,8.682797 -19.6374,16.808737 -19.6374,16.808737 0,0 -21.391,-28.349465 -41.79087,-40.140074 C 204.04292,64.453007 176.5496,65.97212 176.5496,65.97212 c 0,0 -11.42088,3.65e-4 -25.24473,5.058903 -13.82386,5.058538 -19.43394,8.430897 -19.43394,8.430897 0,0 14.02577,-0.375072 34.66138,6.182291 20.63562,6.557362 29.65079,10.492882 29.65079,10.492882 l 28.34775,-5.99567 -7.71253,10.117817 c 0,0 13.52412,8.14986 20.83674,15.45664 7.31262,7.30677 10.71771,11.42782 10.71771,11.42782 0,0 -12.72117,-4.96414 -51.78859,-1.59178 -39.06742,3.37236 -77.5342,51.52215 -77.5342,51.52215 0,0 37.66383,-14.61428 59.90221,-19.48547 22.23838,-4.87118 43.47542,-7.30751 43.47542,-7.30751 0,0 -16.82788,6.74508 -34.85899,35.03543 -18.03112,28.29034 -12.82292,73.25622 -12.82292,73.25622 0,0 28.64945,-53.95774 56.09682,-72.131 27.44737,-18.17328 33.05705,-18.73533 33.05705,-18.73533 0,0 -22.03764,44.21537 -30.65251,115.22225 -8.61486,71.00688 27.64733,189.78848 27.64733,189.78848 l 43.67498,-6.37074 c 0,0 -41.67114,-38.5944 -45.27736,-138.26634 -3.60623,-99.67193 15.22549,-159.25026 15.22549,-159.25026 0,0 15.62776,1.12412 38.86787,29.97652 23.2401,28.85239 36.86244,52.4589 36.86244,52.4589 0,0 8.81678,-46.83904 -10.41641,-68.19731 -19.2332,-21.35826 -48.88515,-30.72483 -48.88515,-30.72483 0,0 12.522,-6.08862 38.46678,-4.30877 25.94477,1.77987 79.76265,24.7859 79.76265,24.78589 0,0 -14.44983,-23.31717 -48.30798,-39.47958 -33.85813,-16.16241 -74.32945,0.26713 -74.32945,0.26713 0,0 3.77869,-14.04506 26.5869,-29.81003 22.80821,-15.764974 51.99208,-31.396311 51.99208,-31.396311 0,0 -24.0829,1.06012 -50.43274,10.996027 -6.55623,2.472198 -12.84933,5.755465 -18.60438,9.294477 L 311.98256,46.04937 Z" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="path6"
-     cx="95.957726"
-     cy="394.82724"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse6"
-     cx="99.829285"
-     cy="376.65375"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse7"
-     cx="148.00078"
-     cy="402.74686"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse8"
-     cx="120.2822"
-     cy="380.68512"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse9"
-     cx="124.24197"
-     cy="422.54584"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse10"
-     cx="191.27571"
-     cy="438.38504"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse11"
-     cx="156.48605"
-     cy="444.0419"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse12"
-     cx="156.39783"
-     cy="421.90857"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse13"
-     cx="165.44879"
-     cy="389.66449"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse14"
-     cx="109.53416"
-     cy="338.25873"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse15"
-     cx="74.373444"
-     cy="369.86551"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse16"
-     cx="211.26932"
-     cy="459.80951"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse17"
-     cx="166.38556"
-     cy="326.66217"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse18"
-     cx="143.81549"
-     cy="310.87485"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse19"
-     cx="54.096996"
-     cy="302.62054"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse20"
-     cx="81.161667"
-     cy="337.62143"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse21"
-     cx="197.21542"
-     cy="389.73611"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse22"
-     cx="206.17815"
-     cy="420.49435"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse23"
-     cx="191.47032"
-     cy="355.72336"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse24"
-     cx="123.39349"
-     cy="289.32693"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse25"
-     cx="107.918"
-     cy="312.29456"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse26"
-     cx="171.10564"
-     cy="305.74896"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse27"
-     cx="209.00658"
-     cy="326.02487"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse28"
-     cx="233.13644"
-     cy="449.69873"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse29"
-     cx="209.57225"
-     cy="264.93088"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse30"
-     cx="218.14577"
-     cy="234.45544"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse31"
-     cx="69.087662"
-     cy="241.52652"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse32"
-     cx="79.464607"
-     cy="276.81027"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse33"
-     cx="119.91112"
-     cy="240.88925"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse34"
-     cx="149.54393"
-     cy="212.82214"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse35"
-     cx="87.384209"
-     cy="220.24173"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse36"
-     cx="51.834263"
-     cy="200.23149"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse37"
-     cx="102.46313"
-     cy="170.81586"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse38"
-     cx="154.70078"
-     cy="270.58774"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse39"
-     cx="129.52776"
-     cy="146.70262"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse40"
-     cx="72.393524"
-     cy="155.47075"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse41"
-     cx="125.37337"
-     cy="97.276749"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse42"
-     cx="158.09486"
-     cy="117.85267"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse43"
-     cx="292.81625"
-     cy="413.77774"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse44"
-     cx="324.70099"
-     cy="394.23505"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse45"
-     cx="320.42599"
-     cy="453.44434"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse46"
-     cx="285.09122"
-     cy="385.42184"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse48"
-     cx="338.44168"
-     cy="426.85901"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse49"
-     cx="317.79169"
-     cy="357.43658"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse51"
-     cx="365.49063"
-     cy="399.36642"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse53"
-     cx="279.23981"
-     cy="358.34058"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse54"
-     cx="327.80048"
-     cy="293.78082"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse56"
-     cx="372.42056"
-     cy="428.29486"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse57"
-     cx="291.59659"
-     cy="322.63077"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse58"
-     cx="359.18237"
-     cy="279.07053"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse59"
-     cx="383.58429"
-     cy="372.29739"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse60"
-     cx="397.37979"
-     cy="415.40317"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse63"
-     cx="350.44458"
-     cy="330.60577"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse64"
-     cx="278.86871"
-     cy="290.38669"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse65"
-     cx="293.07599"
-     cy="256.95929"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse66"
-     cx="449.10278"
-     cy="346.04938"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse67"
-     cx="414.35034"
-     cy="351.19788"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse68"
-     cx="419.44153"
-     cy="384.85614"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse70"
-     cx="283.1795"
-     cy="218.42702"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse71"
-     cx="321.29507"
-     cy="243.71765"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse73"
-     cx="391.73221"
-     cy="329.27985"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse75"
-     cx="393.46164"
-     cy="270.81857"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse76"
-     cx="464.73605"
-     cy="270.14359"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse77"
-     cx="429.25717"
-     cy="321.05084"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse78"
-     cx="353.9671"
-     cy="172.07269"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse79"
-     cx="374.46957"
-     cy="217.13043"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse80"
-     cx="386.14307"
-     cy="187.46037"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse81"
-     cx="424.05527"
-     cy="244.35493"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse82"
-     cx="430.8371"
-     cy="285.26224"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse83"
-     cx="402.7533"
-     cy="221.62213"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse84"
-     cx="455.30573"
-     cy="229.30444"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse85"
-     cx="431.69202"
-     cy="189.20061"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse86"
-     cx="464.40521"
-     cy="195.28293"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse87"
-     cx="440.46014"
-     cy="142.81439"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse88"
-     cx="411.80481"
-     cy="146.70259"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse89"
-     cx="351.93036"
-     cy="98.973793"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse90"
-     cx="370.50977"
-     cy="120.6811"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse91"
-     cx="394.07391"
-     cy="106.04485"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /></svg>
--- a/dist/icon_variations/newyear2025_bgcolor
+++ b/dist/icon_variations/newyear2025_bgcolor
@@ -1 +0,0 @@
-#1F143C
--- a/dist/icon_variations/newyear2025_named.svg
+++ b/dist/icon_variations/newyear2025_named.svg
--- a/dist/icon_variations/original.svg
+++ b/dist/icon_variations/original.svg
--- a/dist/icon_variations/original_named.svg
+++ b/dist/icon_variations/original_named.svg
--- a/dist/icon_variations/original_small.svg
+++ b/dist/icon_variations/original_small.svg
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base_small.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient10"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#f977d9;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-      <stop
-         style="stop-color:#a655d5;stop-opacity:1;"
-         offset="0.54051435"
-         id="stop13" />
-      <stop
-         style="stop-color:#984fd5;stop-opacity:1;"
-         offset="0.5714342"
-         id="stop12" />
-      <stop
-         style="stop-color:#8c4ad4;stop-opacity:1;"
-         offset="0.59666741"
-         id="stop14" />
-      <stop
-         style="stop-color:#3928d2;stop-opacity:1;"
-         offset="1"
-         id="stop11" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10"
-       id="linearGradient11"
-       x1="264.17508"
-       y1="28.385544"
-       x2="264.17508"
-       y2="488.65109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97815818,0,0,0.97880258,4.570042,5.8799159)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.88388348"
-     inkscape:cx="153.30075"
-     inkscape:cy="243.24473"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7"
-     showguides="false" />
-  <path
-     id="path9"
-     style="fill:url(#linearGradient11);fill-opacity:1;stroke:none;stroke-width:13.3314;stroke-opacity:1;paint-order:stroke fill markers"
-     d="M 262.97461 33.6875 A 218.44267 225.23091 0 0 0 138.83789 73.589844 L 141.13867 72.265625 L 161.2207 65.195312 L 181.01953 61.517578 L 204.35352 64.205078 L 228.96094 76.650391 L 265.80078 115 L 283 99.400391 L 304.59961 85.800781 L 331 76.400391 L 360.59961 69.599609 L 379.95508 69.208984 A 218.44267 225.23091 0 0 0 262.97461 33.6875 z M 380.07617 69.291016 L 350.19922 77.800781 L 329.19922 89.199219 L 307.40039 108 L 288.80078 129.80078 L 287.40039 135 L 302.40039 129.59961 L 319 127.80078 L 348.80078 131.80078 L 370.19922 141.40039 L 393 161.40039 L 399.59961 171.59961 L 374.80078 160.80078 L 338.40039 150.80078 L 309.19922 150 L 288.80078 154.40039 L 293.19922 155.19922 L 319.19922 168.80078 L 338 187.19922 L 350.80078 224 L 349.19922 260 L 326 222.80078 L 302.80078 194 L 277.59961 172.40039 L 269.19922 187.59961 L 256.80078 281.59961 L 258 364 L 278.40039 452.80078 L 297.19531 481.36914 A 218.44267 225.23091 0 0 0 481.41797 258.91797 A 218.44267 225.23091 0 0 0 380.07617 69.291016 z M 133.07422 77.839844 A 218.44267 225.23091 0 0 0 44.533203 258.91797 A 218.44267 225.23091 0 0 0 257.04102 484.06641 L 247.3457 458.62891 L 237.87109 418.18359 L 233.0625 380.42383 L 230.375 354.9668 L 229.95117 321.30859 L 232.35547 291.32812 L 237.44727 254.98242 L 254.55859 191.9082 L 261.62891 172.5332 L 255.54883 174.08984 L 240.98242 180.87695 L 229.59961 190.19922 L 210.59961 208.19922 L 197.40039 229.40039 L 186.40039 252.59961 L 173.40039 269 L 171.40039 253.19922 L 173.59961 229.40039 L 183 202.40039 L 199.40039 178 L 221.04102 153.44141 L 209.02148 155.70508 L 177.05859 162.77539 L 148.06836 171.40234 L 119.92578 183 L 120.63281 180.16992 L 129.82422 165.88672 L 151.17969 147.50195 L 172.95898 135.48242 L 190.07031 129.54102 L 209.02148 127.98633 L 227.6875 128.69336 L 247.76953 128.41016 L 246.49805 125.1582 L 226.69922 105.92383 L 219.62695 97.439453 L 221.4668 90.085938 L 206.75781 94.044922 L 195.86914 95.458984 L 179.46289 88.671875 L 156.12891 81.458984 L 133.07422 77.839844 z " />
-  <path
-     style="fill:#1b1b1b;fill-opacity:0.12492698;stroke:none;stroke-width:13.374;stroke-opacity:0.415999;paint-order:stroke fill markers"
-     d="m 259.36665,490.16617 39.03323,-6.96642 -20,-30.4 -20.4,-88.8 -1.2,-82.4 12.4,-94 8.4,-15.2 25.2,21.6 23.2,28.8 23.2,37.2 1.6,-36 -12.8,-36.8 -18.8,-18.4 -26,-13.6 -4.4,-0.8 20.4,-4.4 29.2,0.8 36.4,10 24.8,10.8 -6.6,-10.2 -22.8,-20 -21.4,-9.6 -29.8,-4 -16.6,1.8 -15,5.4 1.4,-5.2 18.6,-21.8 21.8,-18.800003 21,-11.4 30.2,-8.6 -19.8,0.4 -29.6,6.8 -26.4,9.4 -21.6,13.6 -17.2,15.600003 -36.83882,-38.349628 -24.60732,-12.445079 -23.33452,-2.687006 -19.79899,3.676955 -20.08184,7.071068 -9.33381,5.374012 24.32448,3.818376 23.33452,7.212489 16.40488,6.788226 10.88944,-1.414214 14.70782,-3.959798 -1.83847,7.353911 7.07106,8.485288 19.79899,19.2333 1.2728,3.25269 -20.08184,0.28284 -18.66762,-0.7071 -18.95046,1.55563 -17.11198,5.9397 -21.77889,12.02081 -21.35462,18.38478 -9.19239,14.28356 -0.70711,2.82843 28.14285,-11.59656 28.99138,-8.6267 31.96122,-7.07107 12.02082,-2.26274 -21.64158,24.55783 -16.4,24.4 -9.4,27 -2.2,23.8 2,15.8 13,-16.4 11,-23.2 13.2,-21.2 19,-18 11.38199,-9.32209 14.5664,-6.78822 6.08112,-1.55564 -7.07107,19.37473 -17.11198,63.07393 -5.09117,36.34528 -2.40416,29.98133 0.42426,33.65828 2.68701,25.45585 4.80832,37.7595 9.47523,40.44651 z"
-     id="path8-4" />
-</svg>
--- a/dist/icons/controller/applet_dual_joycon.png
+++ b/dist/icons/controller/applet_dual_joycon.png
--- a/dist/icons/controller/applet_dual_joycon_dark.png
+++ b/dist/icons/controller/applet_dual_joycon_dark.png
--- a/dist/icons/controller/applet_dual_joycon_dark_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_dark_disabled.png
--- a/dist/icons/controller/applet_dual_joycon_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_disabled.png
--- a/dist/icons/controller/applet_dual_joycon_midnight.png
+++ b/dist/icons/controller/applet_dual_joycon_midnight.png
--- a/dist/icons/controller/applet_dual_joycon_midnight_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_midnight_disabled.png
--- a/dist/icons/controller/applet_handheld.png
+++ b/dist/icons/controller/applet_handheld.png
--- a/dist/icons/controller/applet_handheld_dark.png
+++ b/dist/icons/controller/applet_handheld_dark.png
--- a/dist/icons/controller/applet_handheld_dark_disabled.png
+++ b/dist/icons/controller/applet_handheld_dark_disabled.png
--- a/dist/icons/controller/applet_handheld_disabled.png
+++ b/dist/icons/controller/applet_handheld_disabled.png
--- a/dist/icons/controller/applet_handheld_midnight.png
+++ b/dist/icons/controller/applet_handheld_midnight.png
--- a/dist/icons/controller/applet_handheld_midnight_disabled.png
+++ b/dist/icons/controller/applet_handheld_midnight_disabled.png
--- a/dist/icons/controller/applet_pro_controller.png
+++ b/dist/icons/controller/applet_pro_controller.png
--- a/Show More
+++ b/Show More