llicense fix

Signed-off-by: lizzie <lizzie@eden-emu.dev>

.ci/license-header.sh

@@ -115,7 +115,7 @@ for file in $FILES; do
 		*.cmake|*.sh|*CMakeLists.txt)
 			begin="#"
 			;;
-		*.kt*|*.cpp|*.h)
+		*.kt*|*.cpp|*.h|*.qml)
 			begin="//"
 			;;
 		*)
@@ -193,7 +193,7 @@ if [ "$UPDATE" = "true" ]; then
 				begin="#"
 				shell=true
 				;;
-			*.kt*|*.cpp|*.h)
+			*)
 				begin="//"
 				shell="false"
 				;;

.patch/httplib/0002-fix-zstd.patch

@@ -0,0 +1,89 @@
+From 509be32bbfa6eb95014860f7c9ea6d45c8ddaa56 Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Sun, 8 Mar 2026 15:11:12 -0400
+Subject: [PATCH] [cmake] Simplify zstd find logic, and support pre-existing
+ zstd target
+
+Some deduplication work on the zstd required/if-available logic. Also
+adds support for pre-existing `zstd::libzstd` which is useful for
+projects that bundle their own zstd in a way that doesn't get caught by
+`CONFIG`
+
+Signed-off-by: crueter <crueter@eden-emu.dev>
+---
+ CMakeLists.txt | 46 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 26 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1874e36be0..8d31198006 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,28 +241,34 @@ endif()
+ # NOTE:
+ # zstd < 1.5.6 does not provide the CMake imported target `zstd::libzstd`.
+ # Older versions must be consumed via their pkg-config file.
+-if(HTTPLIB_REQUIRE_ZSTD)
+-	find_package(zstd 1.5.6 CONFIG)
+-	if(NOT zstd_FOUND)
+-		find_package(PkgConfig REQUIRED)
+-		pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
+-		add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+-	endif()
+-	set(HTTPLIB_IS_USING_ZSTD TRUE)
+-elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
+-	find_package(zstd 1.5.6 CONFIG QUIET)
+-	if(NOT zstd_FOUND)
+-		find_package(PkgConfig QUIET)
+-		if(PKG_CONFIG_FOUND)
+-			pkg_check_modules(zstd QUIET IMPORTED_TARGET libzstd)
+-
+-			if(TARGET PkgConfig::zstd)
++if (HTTPLIB_REQUIRE_ZSTD)
++	set(HTTPLIB_ZSTD_REQUESTED ON)
++	set(HTTPLIB_ZSTD_REQUIRED REQUIRED)
++elseif (HTTPLIB_USE_ZSTD_IF_AVAILABLE)
++	set(HTTPLIB_ZSTD_REQUESTED ON)
++	set(HTTPLIB_ZSTD_REQUIRED QUIET)
++endif()
++
++if (HTTPLIB_ZSTD_REQUESTED)
++	if (TARGET zstd::libzstd)
++		set(HTTPLIB_IS_USING_ZSTD TRUE)
++	else()
++		find_package(zstd 1.5.6 CONFIG QUIET)
++
++		if (NOT zstd_FOUND)
++			find_package(PkgConfig ${HTTPLIB_ZSTD_REQUIRED})
++			pkg_check_modules(zstd ${HTTPLIB_ZSTD_REQUIRED} IMPORTED_TARGET libzstd)
++
++			if (TARGET PkgConfig::zstd)
+ 				add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+ 			endif()
+ 		endif()
++
++		# This will always be true if zstd is required.
++		# If zstd *isn't* found when zstd is set to required,
++		# CMake will error out earlier in this block.
++		set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
+ 	endif()
+-	# Both find_package and PkgConf set a XXX_FOUND var
+-	set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
+ endif()
+ 
+ # Used for default, common dirs that the end-user can change (if needed)
+@@ -317,13 +323,13 @@ if(HTTPLIB_COMPILE)
+ 			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
+ 			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
+ 	)
+-	
++
+ 	# Add C++20 module support if requested
+ 	# Include from separate file to prevent parse errors on older CMake versions
+ 	if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
+ 		include(cmake/modules.cmake)
+ 	endif()
+-	
++
+ 	set_target_properties(${PROJECT_NAME}
+ 		PROPERTIES
+ 			VERSION ${${PROJECT_NAME}_VERSION}

CMakeLists.txt

@@ -196,7 +196,7 @@ option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
 # FreeBSD 15+ has libusb, versions below should disable it
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR PLATFORM_FREEBSD OR APPLE" OFF)
 
-cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)

cpmfile.json

@@ -46,9 +46,9 @@
         "package": "ZLIB",
         "repo": "madler/zlib",
         "tag": "v%VERSION%",
-        "hash": "06eaa3a1eaaeb31f461a2283b03a91ed8eb2406e62cd97ea1c69836324909edeecd93edd03ff0bf593d9dde223e3376149134c5b1fe2e8688c258cadf8cd60ff",
+        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
         "version": "1.2",
-        "git_version": "1.3.1.2",
+        "git_version": "1.3.2",
         "options": [
             "ZLIB_BUILD_SHARED OFF",
             "ZLIB_INSTALL OFF"
@@ -98,9 +98,9 @@
         "package": "VVL",
         "repo": "KhronosGroup/Vulkan-ValidationLayers",
         "tag": "vulkan-sdk-%VERSION%",
-        "git_version": "1.4.335.0",
+        "git_version": "1.4.341.0",
         "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
+        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753"
     },
     "quazip": {
         "package": "QuaZip-Qt6",

docs/Caveats.md

@@ -91,7 +91,7 @@ After configuration, you may need to modify `externals/ffmpeg/CMakeFiles/ffmpeg-
 
 `-lc++-experimental` doesn't exist in OpenBSD but the LLVM driver still tries to link against it, to solve just symlink `ln -s /usr/lib/libc++.a /usr/lib/libc++experimental.a`. Builds are currently not working due to lack of `std::jthread` and such, either compile libc++ manually or wait for ports to catch up.
 
-If clang has errors, try using `g++-11`.
+If clang has errors, try using `g++11`.
 
 ## FreeBSD
 
@@ -107,6 +107,8 @@ hw.usb.usbhid.enable="0"
 
 ## NetBSD
 
+2026-02-07: `vulkan-headers` must not be installed, since the version found in `pkgsrc` is older than required. Either wait for binary packages to update or build newer versions from source.
+
 Install `pkgin` if not already `pkg_add pkgin`, see also the general [pkgsrc guide](https://www.netbsd.org/docs/pkgsrc/using.html). For NetBSD 10.1 provide `echo 'PKG_PATH="https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.1/All/"' >/etc/pkg_install.conf`. If `pkgin` is taking too much time consider adding the following to `/etc/rc.conf`:
 
 ```sh
@@ -116,7 +118,7 @@ ip6addrctl_policy=ipv4_prefer
 
 System provides a default `g++-10` which doesn't support the current C++ codebase; install `clang-19` with `pkgin install clang-19`. Or install `gcc14` (or `gcc15` with current pkgsrc). Provided that, the following CMake commands may work:
 
-- `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Bbuild`
+- `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Bbuild` (Recommended)
 - `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/pkg/gcc14/bin/gcc -DCMAKE_CXX_COMPILER=/usr/pkg/gcc14/bin/g++ -Bbuild`
 - `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/pkg/gcc15/bin/gcc -DCMAKE_CXX_COMPILER=/usr/pkg/gcc15/bin/g++ -Bbuild`
 
@@ -138,8 +140,12 @@ cmake --install build
 
 However, pkgsrc is highly recommended, see [getting pkgsrc](https://iso.us.netbsd.org/pub/pkgsrc/current/pkgsrc/doc/pkgsrc.html#getting). You must get `current` not the `2025Q2` version.
 
+`QtCore` on NetBSD is included, but due to misconfigurations(!) we MUST include one of the standard headers that include `bits/c++config.h`, since source_location (required by `QtCore`) isn't properly configured to intake `bits/c++config.h` (none of the experimental library is). This is a bug with NetBSD packaging and not our fault, but alas.
+
 ## DragonFlyBSD
 
+2026-02-07: `vulkan-headers` and `vulkan-utility-libraries` must NOT be uninstalled, since they're too old: `1.3.289`. Either wait for binary packages to update or build newer versions from source.
+
 If `libstdc++.so.6` is not found (`GLIBCXX_3.4.30`) then attempt:
 
 ```sh

docs/Options.md

@@ -70,8 +70,8 @@ These options control executables and build flavors.
 
 The following options are desktop only.
 
-- `ENABLE_LIBUSB` (ON) Enable the use of the libusb input frontend (HIGHLY RECOMMENDED)
-- `ENABLE_OPENGL` (ON) Enable the OpenGL graphics frontend
+- `ENABLE_LIBUSB` (ON) Enable the use of the libusb input backend (HIGHLY RECOMMENDED)
+- `ENABLE_OPENGL` (ON) Enable the OpenGL graphics backend
   - Unavailable on Windows/ARM64
   - You probably shouldn't turn this off.
 

docs/user/AlterDateTime.md

@@ -1,6 +1,6 @@
 # Setting a Custom Date/Time in Eden
 
-Use this guide whenever you want to modify the Date or Time that Eden reports to games.  This can be useful for modifying RNG elements, skipping wait times in games, etc.
+Use this guide whenever you want to modify the Date or Time that Eden reports to games. This can be useful for modifying RNG elements, skipping wait times in games, etc.
 
 **Click [Here](https://evilperson1337.notion.site/Setting-a-Custom-Date-Time-in-Eden-2b357c2edaf680acb8d4e63ccc126564) for a version of this guide with images & visual elements.**
 
@@ -16,5 +16,5 @@ Use this guide whenever you want to modify the Date or Time that Eden reports to
 
 1. Navigate to *Emulation → Configure*.    
 2. Click on the **System** item on the left-hand side navigation, then check the *Custom RTC Date* box.
-3. The Date/Time option now becomes editable.  Set it to the value you want and hit **OK**.
-4. GREAT SCOTT! We have time traveled!  You can of course go forward or backward in time (as long as it is not before the year 1970) and your game should update accordingly (e.g. certain *Super Mario Odyssey* moons that take time for flowers to grow will now be fully grown.).
+3. The Date/Time option now becomes editable. Set it to the value you want and hit **OK**.
+4. GREAT SCOTT! We have time traveled! You can of course go forward or backward in time (as long as it is not before the year 1970) and your game should update accordingly (e.g. certain *Super Mario Odyssey* moons that take time for flowers to grow will now be fully grown.).

docs/user/Basics.md

@@ -16,6 +16,15 @@ The CPU must support FMA for an optimal gameplay experience. The GPU needs to su
 
 If your GPU doesn't support or is just behind by a minor version, see Mesa environment variables below (*nix only).
 
+## Releases and versions
+
+- Stable releases/Versioned releases: Has a version number and it's the versions we expect 3rd party repositories to host (package managers and such), these are, well, stable, have low amount of regressions (wrt. to master and nightlies) and generally focus on "keeping things without regressions", recommended for the average user.
+    - RC releases: Release candidate, generally "less stable but still stable" versions.
+    - Full release: "The stablest possible you could get".
+- Nightly: Builds done around 2PM UTC (if there are any changes), generally stable, but not recommended for the average user. These contain daily updates and may contain critical fixes for some games.
+- Master: Unstable builds, can lead from a game working exceptionally fine to absolute crashing in some systems because someone forgot to check if NixOS or Solaris worked. These contain straight from the oven fixes, please don't use them unless you plan to contribute something! They're very experimental! Still 95% of the time it will work just fine.
+- PR builds: Highly experimental builds, testers may grab from these. The average user should treat them the same as master builds, except sometimes they straight up don't build/work.
+
 ## User configuration
 
 ### Configuration directories

docs/user/CommandLine.md

@@ -7,6 +7,7 @@ There are two main applications, an SDL2 based app (`eden-cli`) and a Qt based a
 - `-g <path>`: Alternate way to specify what to load, overrides. However let it be noted that arguments that use `-` will be treated as options/ignored, if your game, for some reason, starts with `-`, in order to safely handle it you may need to specify it as an argument.
 - `-f`: Use fullscreen.
 - `-u <number>`: Select the index of the user to load as.
+- `-input-profile <name>`: Specifies input profile name to use (for player #0 only).
 - `-qlaunch`: Launch QLaunch.
 - `-setup`: Launch setup applet.
 
@@ -20,3 +21,4 @@ There are two main applications, an SDL2 based app (`eden-cli`) and a Qt based a
 - `--program/-p`: Specify the program arguments to pass (optional).
 - `--user/-u`: Specify the user index.
 - `--version/-v`: Display version and quit.
+- `--input-profile/-i`: Specifies input profile name to use (for player #0 only).

docs/user/ControllerProfiles.md

@@ -1,49 +0,0 @@
-# Configuring Controller Profiles
-
-Use this guide for when you want to configure specific controller settings to be reused.
-
-**Click [Here](https://evilperson1337.notion.site/Configuring-Controller-Profiles-2be57c2edaf680eabc3ac8c333ec75c4) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden Set Up and Configured
-
----
-
-### Steps
-1. Launch Eden and wait for it to load.
-2. Navigate to *Emulation > Configure…*
-3. Select **Controls** from the left-hand menu and configure your controller for the way you want it to be in game.
-4. Select **New** and enter a name for the profile in the box that appears.  Press **OK** to save the profile settings.
-5. Select **OK** to close the settings menu.
-
-## Setting Controller Profiles By Game
-
-Use this guide when you want to set up specific controller profiles for specific games.  This can be useful for certain games like *Captain Toad Treasure Tracker* where a blue dot appears in the middle of the screen when you have docked mode enabled, but not handheld mode.
-
-**Click [Here](https://evilperson1337.notion.site/Setting-Controller-Profiles-By-Game-2b057c2edaf681658a57f0c199cb6083) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden Emulator set up and fully configured
-- Controller Profile Created
-    - See [*Configuring Controller Profiles*](./ControllerProfiles.md) for instructions on how to do this if needed.
-
----
-
-### Steps
-
-1. *Right-Click* the game you want to apply the profile to in the main window and select **Properties.**
-2. Navigate to the **Input Profiles** tab in the window that appears.  Drop down on *Player 1 profile* (or whatever player profile you want to apply it to) and select the profile you want.
-
-    <aside>
-
-    ***NOTE***: You may have to resize the window to see all tabs, or press the arrows by the tabs to see **Input Profiles**.
-
-    </aside>
-1. Click **OK** to apply the profile mapping.
-2. Launch the game and confirm that the profile is applied, regardless of what the global configuration is.

docs/user/Controllers.md

@@ -0,0 +1,65 @@
+# User Handbook - Controllers
+
+Most of the controls should work out of the box. If not, please use a joystick calibrator to ensure it's not an issue with your own controller, for example:
+
+- https://github.com/dkosmari/calibrate-joystick
+
+## Using external controllers on the Steamdeck
+
+In desktop mode ignore your pro controller/xbox contoller external controller and use **Steam Virtual Gamepad 0 as Player 1**. If you have multiple external controllers set **Player 2 to Steam Virtual Gamepad 1**. Steam app must not be closed on desktop mode.
+
+Here's the annoying part of it. When waking up the steam deck from sleep try not to touch any button on the Steamdeck and turn on your external controller. Then open the Eden.AppImage. If you're lucky you can get your external controller to be position 0 and also Steam Virtual Gamepad 0 in desktop mode. If not that is ok too unless you need to configure player 1 to have gyro. You might need to repeat this to get your external controller as Steam Virtual Gamepad 0 so you can config Player 1 having gyro. You might be able to config player 1 to have gyro with the Steamdeck itself. Or you can also config player 1, 2, 3, etc, to have gyro somehow. Make sure they are all using Virtual Gamepads though.
+
+Turn off controller then go to gaming mode. Try not to touch any buttons on the physical Steamdeck. When in gaming mode turn on the external controller. If lucky it will be assigned as Steam Virtual Gamepad 0. If not just use steam Gamemode feature to rearrange controller positions order.
+
+Basically the Steamdeck or the external controller is fighting for position 0 and it depends on what is touched first after waking from sleep.
+
+## Configuring Controller Profiles
+
+Use this guide for when you want to configure specific controller settings to be reused.
+
+**Click [Here](https://evilperson1337.notion.site/Configuring-Controller-Profiles-2be57c2edaf680eabc3ac8c333ec75c4) for a version of this guide with images & visual elements.**
+
+---
+
+#### Pre-Requisites
+
+- Eden Set Up and Configured
+
+---
+
+#### Steps
+1. Launch Eden and wait for it to load.
+2. Navigate to *Emulation > Configure…*
+3. Select **Controls** from the left-hand menu and configure your controller for the way you want it to be in game.
+4. Select **New** and enter a name for the profile in the box that appears. Press **OK** to save the profile settings.
+5. Select **OK** to close the settings menu.
+
+### Setting Controller Profiles By Game
+
+Use this guide when you want to set up specific controller profiles for specific games. This can be useful for certain games like *Captain Toad Treasure Tracker* where a blue dot appears in the middle of the screen when you have docked mode enabled, but not handheld mode.
+
+**Click [Here](https://evilperson1337.notion.site/Setting-Controller-Profiles-By-Game-2b057c2edaf681658a57f0c199cb6083) for a version of this guide with images & visual elements.**
+
+---
+
+#### Pre-Requisites
+
+- Eden Emulator set up and fully configured
+- Controller Profile Created
+    - See [*Configuring Controller Profiles*](./ControllerProfiles.md) for instructions on how to do this if needed.
+
+---
+
+#### Steps
+
+1. *Right-Click* the game you want to apply the profile to in the main window and select **Properties.**
+2. Navigate to the **Input Profiles** tab in the window that appears. Drop down on *Player 1 profile* (or whatever player profile you want to apply it to) and select the profile you want.
+
+    <aside>
+
+    ***NOTE***: You may have to resize the window to see all tabs, or press the arrows by the tabs to see **Input Profiles**.
+
+    </aside>
+1. Click **OK** to apply the profile mapping.
+2. Launch the game and confirm that the profile is applied, regardless of what the global configuration is.

docs/user/README.md

@@ -11,10 +11,12 @@ A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/
 - **[The Basics](Basics.md)**
 - **[Quickstart](./QuickStart.md)**
 - **[Settings](./Settings.md)**
-- **[Installing Mods](./Mods.md)**
-- **[Run On macOS](./RunOnMacOS.md)**
+- **[Controllers](./Controllers.md)**
+    - **[Controller profiles](./Controllers.md#configuring-controller-profiles)**
 - **[Audio](Audio.md)**
 - **[Graphics](Graphics.md)**
+- **[Installing Mods](./Mods.md)**
+- **[Run On macOS](./RunOnMacOS.md)**
 - **[Data, Savefiles and Storage](Storage.md)**
 - **[Orphaned Profiles](Orphaned.md)**
 - **[Troubleshooting](./Troubleshoot.md)**
@@ -23,7 +25,6 @@ A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/
 - **[Importing Saves](./ImportingSaves.md)**
 - **[Installing Atmosphere Mods](./InstallingAtmosphereMods.md)**
 - **[Installing Updates & DLCs](./InstallingUpdatesDLC.md)**
-- **[Controller Profiles](./ControllerProfiles.md)**
 - **[Alter Date & Time](./AlterDateTime.md)**
 
 ## 3rd-party Integration
@@ -35,6 +36,7 @@ A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/
     - **[Obtainium](./ThirdParty.md#configuring-obtainium)**
     - **[ES-DE](./ThirdParty.md#configuring-es-de)**
     - **[Mirrors](./ThirdParty.md#mirrors)**
+    - **[GameMode](./ThirdParty.md#configuring-gamemode)**
 
 ## Advanced
 

docs/user/RunOnMacOS.md

@@ -1,4 +1,12 @@
-# Allowing Eden to Run on MacOS
+# User Handbook - Run on macOS
+
+Current macOS support is still experimental and very reliant on MoltenVK developments, plans have shifted to properly provide support for KosmicKrisp and similar new GPU endeavours, but macOS users still are bound to MoltenVK itself.
+
+Users of macOS may wish to use [Asahi Linux](https://wiki.gentoo.org/wiki/Project:Asahi/Guide) for the rising KosmicKrisp support.
+
+As of writing, neither macOS nor Asahi has support for NCE; additionally Asahi has extraneous paging bugs with fastmem.
+
+## Allowing Eden to Run on MacOS
 
 Use this guide when you need to allow Eden to run on a Mac system, but are being blocked by Apple Security policy.
 
@@ -6,19 +14,19 @@ Use this guide when you need to allow Eden to run on a Mac system, but are being
 
 ---
 
-### Pre-Requisites
+#### Pre-Requisites
 
 - Permissions to modify settings in MacOS
 
 ---
 
-## Why am I Seeing This?
+### Why am I Seeing This?
 
 Recent versions of MacOS (Catalina & newer) introduced the **Gatekeeper** security functionality, requiring software to be signed by Apple or a trusted (aka - paying) developer.  If the signature isn’t on the list of trusted ones, it will stop the program from executing and display the message above.
 
 ---
 
-## Steps
+### Steps
 
 1. Open the *System Settings* panel.
 2. Navigate to *Privacy & Security*.

docs/user/Settings.md

@@ -50,5 +50,4 @@ See also [an extended breakdown of some options](./Graphics.md).
 
 ## Controls
 
-Most of the controls should work out of the box. If not, please use a joystick calibrator to ensure it's not an issue with your own controller, for example:
-- https://github.com/dkosmari/calibrate-joystick
+See [controllers](./Controllers.md).

docs/user/Testing.md

@@ -1,39 +1,99 @@
-# User Handbook - Testing
-
-While this is mainly aimed for testers - normal users can benefit from these guidelines to make their life easier when trying to outline and/or report an issue.
-
-## Getting logs
-
-In order to get more information, you can find logs in the following location:
-
-
-## How to Test a PR Against the Based Master When Issues Arise
+# Testing
 
 When you're testing a pull request (PR) and encounter unexpected behavior, it's important to determine whether the issue was introduced by the PR or if it already exists in the base code. To do this, compare the behavior against the based master branch.
 
 Even before an issue occurs, it is best practice to keep the same settings and delete the shader cache. Using an already made shader cache can make the PR look like it is having a regression in some rare cases.
 
-### What to Do When Something Seems Off
+Try not to test PRs which are for documentation or extremely trivial changes (like a PR that changes the app icon), unless you really want to; generally avoid any PRs marked `[docs]`.
+
+If a PR specifies it is for a given platform (i.e `linux`) then just test on Linux. If it says `NCE` then test on Android and Linux ARM64 (Raspberry Pi and such). macOS fixes may also affect Asahi, test that if you can too.
+
+You may also build artifacts yourself, be aware that the resulting builds are NOT the same as those from CI, because of package versioning and build environment differences. One famous example is FFmpeg randomly breaking on many Arch distros due to packaging differences.
+
+## Quickstart
+
+Think of the source code as a "tree", with the "trunk" of that tree being our `master` branch, any other branches are PRs or separate development branches, only our stable releases pull from `master` - all other branches are considered unstable and aren't recommended to pull from unless you're testing multiple branches at once.
+
+Here's some terminology you may want to familiarize yourself with:
+
+- PR: Pull request, a change in the codebase; from which the author of said change (the programmer) requests a pull of that branch into master (make it so the new code makes it into a release basically).
+- Bisect: Bilinear method of searching regressions, some regressions may be sporadic and can't be bisected, but the overwhelming majority are.
+- WIP: Work-in-progress.
+- Regression: A new bug/glitch caused by new code, i.e "Zelda broke in android after commit xyz".
+- Master: The "root" branch, this is where all merged code goes to, traditionally called `main`, `trunk` or just `master`, it contains all the code that eventually make it to stable releases.
+- `HEAD`: Latest commit in a given branch, `HEAD` of `master` is the latest commit on branch `master`.
+- `origin`: The default "remote", basically the URL from where git is located at, for most of the time that location is https://git.eden-emu.dev/eden-emu/eden.
+
+## Testing checklist
+
+For regressions/bugs from PRs or commits:
+
+- [ ] Occurs in master?
+    - If it occurs on master:
+        - [ ] Occurs on previous stable release? (before this particular PR).
+            - If it occurs on previous stable release:
+                - [ ] Occurs on previous-previous stable release?
+                    - And so on and so forth... some bugs come from way before Eden was even conceived.
+            - Otherwise, try bisecting between the previous stable release AND the latest `HEAD` of master
+                - [ ] Occurs in given commit?
+- [ ] Occurs in PR?
+    - If it occurs on PR:
+        - [ ] Bisected PR? (if it has commits)
+        - [ ] Found bisected commit?
+
+If an issue sporadically appears, try to do multiple runs, try if possible, to count the number of times it has failed and the number of times it has "worked just fine"; say it worked 3 times but failed 1. then there is a 1/4th chance every run that the issue is replicated - so every bisect step would require 4 runs to ensure there is atleast a chance of triggering the bug.
+
+## What to do when something seems off
+
 If you notice something odd during testing:
+
 - Reproduce the issue using the based master branch.
 - Observe whether the same behavior occurs.
 
-### Two Possible Outcomes
+From there onwards there can be two possible outcomes:
+
 - If the issue exists in the based master: This means the problem was already present before the PR. The PR most likely did not introduce the regression.
 - If the issue does not exist in the based master: This suggests the PR most likely introduced the regression and needs further investigation.
 
-### Report your findings
+## Reporting Your Findings
+
 When you report your results:
+
 - Clearly state whether the behavior was observed in the based master.
-- Indicate whether the result is good (expected behavior) or bad (unexpected or broken behavior). Without mentioning if your post/report/log is good or bad it may confuse the Developer of the PR.
-- Example:
-```
-1. "Tested on based master — issue not present. Bad result for PR, likely regression introduced."
-2. "Tested on based master — issue already present. Good result for PR, not a regression."
-```
+- Indicate whether the result is good (expected behavior) or bad (unexpected or broken behavior). Without mentioning if your post/report/log is good or bad it may confuse the developer of the PR.
+
+For example:
+
+1. "Bad result for PR: Tested on based master - issue not present. Likely regression introduced."
+2. "Good result for PR: Tested on based master - issue already present. Not a regression."
+
+This approach helps maintain clarity and accountability in the testing process and ensures regressions are caught and addressed efficiently.
+
+If the behavior seems normal for a certain game/feature then it may not be always required to check against the based master.
 
 This approach helps maintain clarity and accountability in the testing process and ensures regressions are caught and addressed efficiently. If the behavior seems normal for a certain game/feature then it may not be always required to check against the based master.
 
 If a master build for the PR' based master does not exist. It will be helpful to just test past and future builds nearby. That would help with gathering more information about the problem.
 
-**Always include [debugging info](../Debug.md) as needed**.
+**Always include [debugging info](../Debug.md) as needed**.
+
+## Bisecting
+
+One happy reminder, when testing, *know how to bisect!*
+
+Say you're trying to find an issue between 1st of Jan and 8th of Jan, you can search by dividing "in half" the time between each commit:
+- Check for 4th of Jan
+- If 4th of Jan is "working" then the issue must be in the future
+- So then check 6th of Jan
+- If 6th of Jan isn't working then the issue must be in the past
+- So then check 5th of Jan
+- If 5th of Jan worked, then the issue starts at 6th of Jan
+
+The faulty commit then, is 6th of Jan. This is called bisection https://git-scm.com/docs/git-bisect
+
+## Notes
+
+- PR's marked with **WIP** do NOT need to be tested unless explicitly asked (check the git in case)
+- Sometimes license checks may fail, hover over the build icon to see if builds did succeed, as the CI will push builds even if license checks fail.
+- All open PRs can be viewed [here](https://git.eden-emu.dev/eden-emu/eden/pulls/).
+- If site is down use one of the [mirrors](./user/ThirdParty.md#mirrors).

docs/user/ThirdParty.md

@@ -4,7 +4,6 @@ The Eden emulator by itself lacks some functionality - or otherwise requires ext
 
 While most of the links mentioned in this guide are relatively "safe"; we urge users to use their due diligence and appropriatedly verify the integrity of all files downloaded and ensure they're not compromised.
 
-- [Nightly Eden builds](https://github.com/pflyly/eden-nightly)
 - [NixOS Eden Flake](https://github.com/Grantimatter/eden-flake)
 - [ES-DE Frontend Support](https://github.com/GlazedBelmont/es-de-android-custom-systems)
 
@@ -66,3 +65,9 @@ Note: Even though the site isn't Codeberg, it uses the same Forgejo/Gitea backen
 ```xml
 <command label="Eden (Standalone)">%EMULATOR_EDEN% %ACTION%=android.nfc.action.TECH_DISCOVERED %DATA%=%ROMPROVIDER%</command>
 ```
+
+## Configuring GameMode
+
+There is a checkbox to enable gamemode automatically. The `libgamemode.so` library must be findable on the standard `LD_LIBRARY_PATH` otherwise it will not properly be enabled. If for whatever reason it doesn't work, see [Arch wiki: GameMode](https://wiki.archlinux.org/title/GameMode) for more info.
+
+You may launch the emulator directly via the wrapper `gamemode <program>`, and things should work out of the box.

externals/cpmfile.json

@@ -9,7 +9,7 @@
     },
     "sirit": {
         "repo": "eden-emulator/sirit",
-        "git_version": "1.0.3",
+        "git_version": "1.0.4",
         "tag": "v%VERSION%",
         "artifact": "sirit-source-%VERSION%.tar.zst",
         "hash_suffix": "sha512sum",
@@ -28,11 +28,12 @@
     "httplib": {
         "repo": "yhirose/cpp-httplib",
         "tag": "v%VERSION%",
-        "hash": "a229e24cca4afe78e5c0aa2e482f15108ac34101fd8dbd927365f15e8c37dec4de38c5277d635017d692a5b320e1b929f8bfcc076f52b8e4dcdab8fe53bfdf2e",
-        "git_version": "0.30.1",
+        "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded",
+        "git_version": "0.37.0",
         "find_args": "MODULE GLOBAL",
         "patches": [
-            "0001-mingw.patch"
+            "0001-mingw.patch",
+            "0002-fix-zstd.patch"
         ],
         "options": [
             "HTTPLIB_REQUIRE_OPENSSL ON"
@@ -55,8 +56,8 @@
         "package": "xbyak",
         "repo": "herumi/xbyak",
         "tag": "v%VERSION%",
-        "hash": "ac333d7bea1d61865bebebb116201a58db431946aa2f11aa042ef5795c390ff30af4d6c90ed3b3d24443a1d430703b08f14fc13b2fa405c155a241456ed78a47",
-        "git_version": "7.33.2"
+        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
+        "git_version": "7.35.2"
     },
     "oaknut": {
         "repo": "eden-emulator/oaknut",
@@ -146,9 +147,9 @@
         "package": "Catch2",
         "repo": "catchorg/Catch2",
         "tag": "v%VERSION%",
-        "hash": "acb3f463a7404d6a3bce52e474075cdadf9bb241d93feaf147c182d756e5a2f8bd412f4658ca186d15ab8fed36fc587d79ec311f55642d8e4ded16df9e213656",
+        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
         "version": "3.0.1",
-        "git_version": "3.12.0",
+        "git_version": "3.13.0",
         "patches": [
             "0001-solaris-isnan-fix.patch"
         ]
@@ -256,15 +257,15 @@
         "repo": "KhronosGroup/Vulkan-Headers",
         "package": "VulkanHeaders",
         "version": "1.4.317",
-        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
-        "git_version": "1.4.342",
+        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
+        "git_version": "1.4.345",
         "tag": "v%VERSION%"
     },
     "vulkan-utility-libraries": {
         "repo": "KhronosGroup/Vulkan-Utility-Libraries",
         "package": "VulkanUtilityLibraries",
-        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
-        "git_version": "1.4.342",
+        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
+        "git_version": "1.4.345",
         "tag": "v%VERSION%"
     },
     "frozen": {

src/CMakeLists.txt

@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: Copyright 2026 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
 
@@ -241,7 +242,6 @@ if (YUZU_CMD)
 endif()
 
 if (ENABLE_QT)
-    add_definitions(-DYUZU_QT_WIDGETS)
     add_subdirectory(qt_common)
     add_subdirectory(yuzu)
 endif()

src/android/app/src/main/AndroidManifest.xml

@@ -73,6 +73,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
             android:theme="@style/Theme.Yuzu.Main"
             android:label="@string/preferences_settings"/>
 
+        <activity
+            android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreenActivity"
+            android:theme="@style/Theme.Yuzu.Main"
+            android:label="@string/preferences_settings"/>
+
         <activity
             android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
             android:theme="@style/Theme.Yuzu.Main"

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt

@@ -40,11 +40,21 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
                 }
             }
 
-            val deleteAction = {
-                addonViewModel.setAddonToDelete(model)
+            val canDelete = model.isRemovable
+            binding.deleteCard.isEnabled = canDelete
+            binding.buttonDelete.isEnabled = canDelete
+            binding.deleteCard.alpha = if (canDelete) 1f else 0.38f
+
+            if (canDelete) {
+                val deleteAction = {
+                    addonViewModel.setAddonToDelete(model)
+                }
+                binding.deleteCard.setOnClickListener { deleteAction() }
+                binding.buttonDelete.setOnClickListener { deleteAction() }
+            } else {
+                binding.deleteCard.setOnClickListener(null)
+                binding.buttonDelete.setOnClickListener(null)
             }
-            binding.deleteCard.setOnClickListener { deleteAction() }
-            binding.buttonDelete.setOnClickListener { deleteAction() }
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AppletAdapter.kt

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -6,10 +9,10 @@ package org.yuzu.yuzu_emu.adapters
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
-import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -67,8 +70,13 @@ class AppletAdapter(val activity: FragmentActivity, applets: List<Applet>) :
                 title = YuzuApplication.appContext.getString(applet.titleId),
                 path = appletPath
             )
-            val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-            binding.root.findNavController().navigate(action)
+            binding.root.findNavController().navigate(
+                R.id.action_global_emulationActivity,
+                bundleOf(
+                    "game" to appletGame,
+                    "custom" to false
+                )
+            )
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt

@@ -111,18 +111,10 @@ class SettingsActivity : AppCompatActivity() {
         if (navHostFragment.childFragmentManager.backStackEntryCount > 0) {
             navHostFragment.navController.popBackStack()
         } else {
-            finishWithFragmentLikeAnimation()
+            finish()
         }
     }
 
-    private fun finishWithFragmentLikeAnimation() {
-        finish()
-        overridePendingTransition(
-            androidx.navigation.ui.R.anim.nav_default_pop_enter_anim,
-            androidx.navigation.ui.R.anim.nav_default_pop_exit_anim
-        )
-    }
-
     override fun onStart() {
         super.onStart()
         if (!DirectoryInitialization.areDirectoriesReady) {
@@ -178,7 +170,7 @@ class SettingsActivity : AppCompatActivity() {
             getString(R.string.settings_reset),
             Toast.LENGTH_LONG
         ).show()
-        finishWithFragmentLikeAnimation()
+        finish()
     }
 
     private fun setInsets() {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsSubscreenActivity.kt

@@ -0,0 +1,152 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package org.yuzu.yuzu_emu.features.settings.ui
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.navArgs
+import com.google.android.material.color.MaterialColors
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
+import org.yuzu.yuzu_emu.utils.DirectoryInitialization
+import org.yuzu.yuzu_emu.utils.InsetsHelper
+import org.yuzu.yuzu_emu.utils.ThemeHelper
+
+enum class SettingsSubscreen {
+    PROFILE_MANAGER,
+    DRIVER_MANAGER,
+    DRIVER_FETCHER,
+    FREEDRENO_SETTINGS,
+    APPLET_LAUNCHER,
+    INSTALLABLE,
+    GAME_FOLDERS,
+    ABOUT,
+    LICENSES,
+    GAME_INFO,
+    ADDONS,
+}
+
+class SettingsSubscreenActivity : AppCompatActivity() {
+    private lateinit var binding: ActivitySettingsBinding
+
+    private val args by navArgs<SettingsSubscreenActivityArgs>()
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(YuzuApplication.applyLanguage(base))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.setTheme(this)
+
+        super.onCreate(savedInstanceState)
+
+        binding = ActivitySettingsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        if (savedInstanceState == null) {
+            val navController = navHostFragment.navController
+            val navGraph = navController.navInflater.inflate(
+                R.navigation.settings_subscreen_navigation
+            )
+            navGraph.setStartDestination(resolveStartDestination())
+            navController.setGraph(navGraph, createStartDestinationArgs())
+        }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        if (InsetsHelper.getSystemGestureType(applicationContext) !=
+            InsetsHelper.GESTURE_NAVIGATION
+        ) {
+            binding.navigationBarShade.setBackgroundColor(
+                ThemeHelper.getColorWithOpacity(
+                    MaterialColors.getColor(
+                        binding.navigationBarShade,
+                        com.google.android.material.R.attr.colorSurface
+                    ),
+                    ThemeHelper.SYSTEM_BAR_ALPHA
+                )
+            )
+        }
+
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() = navigateBack()
+            }
+        )
+
+        setInsets()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (!DirectoryInitialization.areDirectoriesReady) {
+            DirectoryInitialization.start()
+        }
+    }
+
+    fun navigateBack() {
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        if (!navHostFragment.navController.popBackStack()) {
+            finish()
+        }
+    }
+
+    private fun resolveStartDestination(): Int =
+        when (args.destination) {
+            SettingsSubscreen.PROFILE_MANAGER -> R.id.profileManagerFragment
+            SettingsSubscreen.DRIVER_MANAGER -> R.id.driverManagerFragment
+            SettingsSubscreen.DRIVER_FETCHER -> R.id.driverFetcherFragment
+            SettingsSubscreen.FREEDRENO_SETTINGS -> R.id.freedrenoSettingsFragment
+            SettingsSubscreen.APPLET_LAUNCHER -> R.id.appletLauncherFragment
+            SettingsSubscreen.INSTALLABLE -> R.id.installableFragment
+            SettingsSubscreen.GAME_FOLDERS -> R.id.gameFoldersFragment
+            SettingsSubscreen.ABOUT -> R.id.aboutFragment
+            SettingsSubscreen.LICENSES -> R.id.licensesFragment
+            SettingsSubscreen.GAME_INFO -> R.id.gameInfoFragment
+            SettingsSubscreen.ADDONS -> R.id.addonsFragment
+        }
+
+    private fun createStartDestinationArgs(): Bundle =
+        when (args.destination) {
+            SettingsSubscreen.DRIVER_MANAGER,
+            SettingsSubscreen.FREEDRENO_SETTINGS -> bundleOf("game" to args.game)
+
+            SettingsSubscreen.GAME_INFO,
+            SettingsSubscreen.ADDONS -> bundleOf(
+                "game" to requireNotNull(args.game) {
+                    "Game is required for ${args.destination}"
+                }
+            )
+
+            else -> Bundle()
+        }
+
+    private fun setInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.navigationBarShade
+        ) { _: View, windowInsets: WindowInsetsCompat ->
+            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+            val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
+            mlpNavShade.height = barInsets.bottom
+            binding.navigationBarShade.layoutParams = mlpNavShade
+
+            windowInsets
+        }
+    }
+}

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt

@@ -21,9 +21,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.BuildConfig
+import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentAboutBinding
+import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import org.yuzu.yuzu_emu.NativeLibrary
@@ -54,7 +55,7 @@ class AboutFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         homeViewModel.setStatusBarShadeVisibility(visible = false)
         binding.toolbarAbout.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         binding.imageLogo.setOnLongClickListener {
@@ -72,8 +73,11 @@ class AboutFragment : Fragment() {
             )
         }
         binding.buttonLicenses.setOnClickListener {
-            exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-            binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
+            val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                SettingsSubscreen.LICENSES,
+                null
+            )
+            binding.root.findNavController().navigate(action)
         }
 
         val buildName = getString(R.string.app_name_suffixed)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt

@@ -15,7 +15,6 @@ import androidx.core.view.updatePadding
 import androidx.documentfile.provider.DocumentFile
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
@@ -61,7 +60,7 @@ class AddonsFragment : Fragment() {
         homeViewModel.setStatusBarShadeVisibility(false)
 
         binding.toolbarAddons.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         binding.toolbarAddons.title = getString(R.string.addons_game, args.game.title)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -12,7 +12,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.R
@@ -50,7 +49,7 @@ class AppletLauncherFragment : Fragment() {
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         binding.toolbarApplets.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         val applets = listOf(

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverFetcherFragment.kt

@@ -13,7 +13,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -142,7 +141,7 @@ class DriverFetcherFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         homeViewModel.setStatusBarShadeVisibility(visible = false)
         binding.toolbarDrivers.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         binding.listDrivers.layoutManager = LinearLayoutManager(context)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -19,6 +19,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
+import org.yuzu.yuzu_emu.HomeNavigationDirections
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -27,6 +28,7 @@ import org.yuzu.yuzu_emu.adapters.DriverAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentDriverManagerBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
+import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
 import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
@@ -105,7 +107,7 @@ class DriverManagerFragment : Fragment() {
         }
 
         binding.toolbarDrivers.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         binding.buttonInstall.setOnClickListener {
@@ -113,9 +115,11 @@ class DriverManagerFragment : Fragment() {
         }
 
         binding.buttonFetch.setOnClickListener {
-            binding.root.findNavController().navigate(
-                R.id.action_driverManagerFragment_to_driverFetcherFragment
+            val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                SettingsSubscreen.DRIVER_FETCHER,
+                null
             )
+            binding.root.findNavController().navigate(action)
         }
 
         binding.listDrivers.apply {

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt

@@ -4,20 +4,21 @@
 package org.yuzu.yuzu_emu.fragments
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.adapters.FolderAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentFoldersBinding
@@ -25,7 +26,6 @@ import org.yuzu.yuzu_emu.model.DirectoryType
 import org.yuzu.yuzu_emu.model.GameDir
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import org.yuzu.yuzu_emu.utils.collect
 
@@ -36,6 +36,20 @@ class GameFoldersFragment : Fragment() {
     private val homeViewModel: HomeViewModel by activityViewModels()
     private val gamesViewModel: GamesViewModel by activityViewModels()
 
+    private val getGamesDirectory =
+        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
+            if (result != null) {
+                processGamesDir(result)
+            }
+        }
+
+    private val getExternalContentDirectory =
+        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
+            if (result != null) {
+                processExternalContentDir(result)
+            }
+        }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
@@ -59,7 +73,7 @@ class GameFoldersFragment : Fragment() {
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         binding.toolbarFolders.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         binding.listFolders.apply {
@@ -74,7 +88,6 @@ class GameFoldersFragment : Fragment() {
             (binding.listFolders.adapter as FolderAdapter).submitList(it)
         }
 
-        val mainActivity = requireActivity() as MainActivity
         binding.buttonAdd.setOnClickListener {
             // Show a model to choose between Game and External Content
             val options = arrayOf(
@@ -87,10 +100,10 @@ class GameFoldersFragment : Fragment() {
                 .setItems(options) { _, which ->
                     when (which) {
                         0 -> { // Game Folder
-                            mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
+                            getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
                         }
                         1 -> { // External Content Folder
-                            mainActivity.getExternalContentDirectory.launch(null)
+                            getExternalContentDirectory.launch(null)
                         }
                     }
                 }
@@ -105,6 +118,50 @@ class GameFoldersFragment : Fragment() {
         gamesViewModel.onCloseGameFoldersFragment()
     }
 
+    private fun processGamesDir(result: Uri) {
+        requireContext().contentResolver.takePersistableUriPermission(
+            result,
+            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        )
+
+        val uriString = result.toString()
+        val folder = gamesViewModel.folders.value.firstOrNull { it.uriString == uriString }
+        if (folder != null) {
+            Toast.makeText(
+                requireContext().applicationContext,
+                R.string.folder_already_added,
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        AddGameFolderDialogFragment.newInstance(uriString, calledFromGameFragment = false)
+            .show(parentFragmentManager, AddGameFolderDialogFragment.TAG)
+    }
+
+    private fun processExternalContentDir(result: Uri) {
+        requireContext().contentResolver.takePersistableUriPermission(
+            result,
+            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        )
+
+        val uriString = result.toString()
+        val folder = gamesViewModel.folders.value.firstOrNull {
+            it.uriString == uriString && it.type == DirectoryType.EXTERNAL_CONTENT
+        }
+        if (folder != null) {
+            Toast.makeText(
+                requireContext().applicationContext,
+                R.string.folder_already_added,
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        val externalContentDir = GameDir(uriString, deepScan = false, DirectoryType.EXTERNAL_CONTENT)
+        gamesViewModel.addFolder(externalContentDir, savedFromGameFragment = false)
+    }
+
     private fun setInsets() =
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.root

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -18,7 +18,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.NativeLibrary
@@ -64,7 +63,7 @@ class GameInfoFragment : Fragment() {
         binding.apply {
             toolbarInfo.title = args.game.title
             toolbarInfo.setNavigationOnClickListener {
-                view.findNavController().popBackStack()
+                requireActivity().onBackPressedDispatcher.onBackPressed()
             }
 
             val pathString = Uri.parse(args.game.path).path ?: ""

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt

@@ -35,6 +35,7 @@ import org.yuzu.yuzu_emu.adapters.GamePropertiesAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentGamePropertiesBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GameProperty
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -250,8 +251,10 @@ class GamePropertiesFragment : Fragment() {
                     R.string.info_description,
                     R.drawable.ic_info_outline,
                     action = {
-                        val action = GamePropertiesFragmentDirections
-                            .actionPerGamePropertiesFragmentToGameInfoFragment(args.game)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.GAME_INFO,
+                            args.game
+                        )
                         binding.root.findNavController().navigate(action)
                     }
                 )
@@ -317,8 +320,11 @@ class GamePropertiesFragment : Fragment() {
                         R.string.add_ons_description,
                         R.drawable.ic_edit,
                         action = {
-                            val action = GamePropertiesFragmentDirections
-                                .actionPerGamePropertiesFragmentToAddonsFragment(args.game)
+                            val action =
+                                HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                                    SettingsSubscreen.ADDONS,
+                                    args.game
+                                )
                             binding.root.findNavController().navigate(action)
                         }
                     )
@@ -333,8 +339,11 @@ class GamePropertiesFragment : Fragment() {
                         R.drawable.ic_build,
                         detailsFlow = driverViewModel.selectedDriverTitle,
                         action = {
-                            val action = GamePropertiesFragmentDirections
-                                .actionPerGamePropertiesFragmentToDriverManagerFragment(args.game)
+                            val action =
+                                HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                                    SettingsSubscreen.DRIVER_MANAGER,
+                                    args.game
+                                )
                             binding.root.findNavController().navigate(action)
                         }
                     )
@@ -347,8 +356,11 @@ class GamePropertiesFragment : Fragment() {
                         R.string.freedreno_per_game_description,
                         R.drawable.ic_graphics,
                         action = {
-                            val action = GamePropertiesFragmentDirections
-                                .actionPerGamePropertiesFragmentToFreedrenoSettingsFragment(args.game)
+                            val action =
+                                HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                                    SettingsSubscreen.FREEDRENO_SETTINGS,
+                                    args.game
+                                )
                             binding.root.findNavController().navigate(action)
                         }
                     )

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -36,6 +36,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.fetcher.SpacingItemDecoration
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.HomeSetting
 import org.yuzu.yuzu_emu.model.HomeViewModel
@@ -126,8 +127,11 @@ class HomeSettingsFragment : Fragment() {
                     R.string.profile_manager_description,
                     R.drawable.ic_account_circle,
                     {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_profileManagerFragment)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.PROFILE_MANAGER,
+                            null
+                        )
+                        binding.root.findNavController().navigate(action)
                     }
                 )
             )
@@ -137,8 +141,10 @@ class HomeSettingsFragment : Fragment() {
                     R.string.install_gpu_driver_description,
                     R.drawable.ic_build,
                     {
-                        val action = HomeSettingsFragmentDirections
-                            .actionHomeSettingsFragmentToDriverManagerFragment(null)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.DRIVER_MANAGER,
+                            null
+                        )
                         binding.root.findNavController().navigate(action)
                     },
                     { true },
@@ -154,7 +160,12 @@ class HomeSettingsFragment : Fragment() {
                         R.string.gpu_driver_settings,
                         R.drawable.ic_graphics,
                         {
-                            binding.root.findNavController().navigate(R.id.freedrenoSettingsFragment)
+                            val action =
+                                HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                                    SettingsSubscreen.FREEDRENO_SETTINGS,
+                                    null
+                                )
+                            binding.root.findNavController().navigate(action)
                         }
                     )
                 )
@@ -175,8 +186,11 @@ class HomeSettingsFragment : Fragment() {
                     R.string.applets_description,
                     R.drawable.ic_applet,
                     {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_appletLauncherFragment)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.APPLET_LAUNCHER,
+                            null
+                        )
+                        binding.root.findNavController().navigate(action)
                     },
                     { NativeLibrary.isFirmwareAvailable() },
                     R.string.applets_error_firmware,
@@ -189,8 +203,11 @@ class HomeSettingsFragment : Fragment() {
                     R.string.manage_yuzu_data_description,
                     R.drawable.ic_install,
                     {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_installableFragment)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.INSTALLABLE,
+                            null
+                        )
+                        binding.root.findNavController().navigate(action)
                     }
                 )
             )
@@ -200,8 +217,11 @@ class HomeSettingsFragment : Fragment() {
                     R.string.select_games_folder_description,
                     R.drawable.ic_add,
                     {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_gameFoldersFragment)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.GAME_FOLDERS,
+                            null
+                        )
+                        binding.root.findNavController().navigate(action)
                     }
                 )
             )
@@ -284,9 +304,11 @@ class HomeSettingsFragment : Fragment() {
                     R.string.about_description,
                     R.drawable.ic_info_outline,
                     {
-                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-                        parentFragmentManager.primaryNavigationFragment?.findNavController()
-                            ?.navigate(R.id.action_homeSettingsFragment_to_aboutFragment)
+                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
+                            SettingsSubscreen.ABOUT,
+                            null
+                        )
+                        binding.root.findNavController().navigate(action)
                     }
                 )
             )

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -14,23 +14,23 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.InstallableAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
+import org.yuzu.yuzu_emu.model.AddonViewModel
+import org.yuzu.yuzu_emu.model.DriverViewModel
+import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.model.Installable
 import org.yuzu.yuzu_emu.model.TaskState
-import org.yuzu.yuzu_emu.ui.main.MainActivity
-import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
+import org.yuzu.yuzu_emu.utils.InstallableActions
 import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 import org.yuzu.yuzu_emu.utils.collect
@@ -45,6 +45,9 @@ class InstallableFragment : Fragment() {
     private val binding get() = _binding!!
 
     private val homeViewModel: HomeViewModel by activityViewModels()
+    private val gamesViewModel: GamesViewModel by activityViewModels()
+    private val addonViewModel: AddonViewModel by activityViewModels()
+    private val driverViewModel: DriverViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -65,12 +68,10 @@ class InstallableFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val mainActivity = requireActivity() as MainActivity
-
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         binding.toolbarInstallables.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         homeViewModel.openImportSaves.collect(viewLifecycleOwner) {
@@ -84,8 +85,8 @@ class InstallableFragment : Fragment() {
             Installable(
                 R.string.user_data,
                 R.string.user_data_description,
-                install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
-                export = { mainActivity.exportUserData.launch("export.zip") }
+                install = { importUserDataLauncher.launch(arrayOf("application/zip")) },
+                export = { exportUserDataLauncher.launch("export.zip") }
             ),
             Installable(
                 R.string.manage_save_data,
@@ -127,27 +128,33 @@ class InstallableFragment : Fragment() {
             Installable(
                 R.string.install_game_content,
                 R.string.install_game_content_description,
-                install = { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
+                install = { installGameUpdateLauncher.launch(arrayOf("*/*")) }
             ),
             Installable(
                 R.string.install_firmware,
                 R.string.install_firmware_description,
-                install = { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
+                install = { getFirmwareLauncher.launch(arrayOf("application/zip")) }
             ),
             Installable(
                 R.string.uninstall_firmware,
                 R.string.uninstall_firmware_description,
-                install = { mainActivity.uninstallFirmware() }
+                install = {
+                    InstallableActions.uninstallFirmware(
+                        activity = requireActivity(),
+                        fragmentManager = parentFragmentManager,
+                        homeViewModel = homeViewModel
+                    )
+                }
             ),
             Installable(
                 R.string.install_prod_keys,
                 R.string.install_prod_keys_description,
-                install = { mainActivity.getProdKey.launch(arrayOf("*/*")) }
+                install = { getProdKeyLauncher.launch(arrayOf("*/*")) }
             ),
             Installable(
                 R.string.install_amiibo_keys,
                 R.string.install_amiibo_keys_description,
-                install = { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
+                install = { getAmiiboKeyLauncher.launch(arrayOf("*/*")) }
             )
         )
 
@@ -180,6 +187,132 @@ class InstallableFragment : Fragment() {
             windowInsets
         }
 
+    private val getProdKeyLauncher =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                InstallableActions.processKey(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    gamesViewModel = gamesViewModel,
+                    result = result,
+                    extension = "keys"
+                )
+            }
+        }
+
+    private val getAmiiboKeyLauncher =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                InstallableActions.processKey(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    gamesViewModel = gamesViewModel,
+                    result = result,
+                    extension = "bin"
+                )
+            }
+        }
+
+    private val getFirmwareLauncher =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                InstallableActions.processFirmware(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    homeViewModel = homeViewModel,
+                    result = result
+                )
+            }
+        }
+
+    private val installGameUpdateLauncher =
+        registerForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) { documents ->
+            if (documents.isEmpty()) {
+                return@registerForActivityResult
+            }
+
+            if (addonViewModel.game == null) {
+                InstallableActions.installContent(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    addonViewModel = addonViewModel,
+                    documents = documents
+                )
+                return@registerForActivityResult
+            }
+
+            ProgressDialogFragment.newInstance(
+                requireActivity(),
+                R.string.verifying_content,
+                false
+            ) { _, _ ->
+                var updatesMatchProgram = true
+                for (document in documents) {
+                    val valid = NativeLibrary.doesUpdateMatchProgram(
+                        addonViewModel.game!!.programId,
+                        document.toString()
+                    )
+                    if (!valid) {
+                        updatesMatchProgram = false
+                        break
+                    }
+                }
+
+                if (updatesMatchProgram) {
+                    requireActivity().runOnUiThread {
+                        InstallableActions.installContent(
+                            activity = requireActivity(),
+                            fragmentManager = parentFragmentManager,
+                            addonViewModel = addonViewModel,
+                            documents = documents
+                        )
+                    }
+                } else {
+                    requireActivity().runOnUiThread {
+                        MessageDialogFragment.newInstance(
+                            requireActivity(),
+                            titleId = R.string.content_install_notice,
+                            descriptionId = R.string.content_install_notice_description,
+                            positiveAction = {
+                                InstallableActions.installContent(
+                                    activity = requireActivity(),
+                                    fragmentManager = parentFragmentManager,
+                                    addonViewModel = addonViewModel,
+                                    documents = documents
+                                )
+                            },
+                            negativeAction = {}
+                        ).show(parentFragmentManager, MessageDialogFragment.TAG)
+                    }
+                }
+                return@newInstance Any()
+            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+        }
+
+    private val importUserDataLauncher =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                InstallableActions.importUserData(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    gamesViewModel = gamesViewModel,
+                    driverViewModel = driverViewModel,
+                    result = result
+                )
+            }
+        }
+
+    private val exportUserDataLauncher =
+        registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { result ->
+            if (result != null) {
+                InstallableActions.exportUserData(
+                    activity = requireActivity(),
+                    fragmentManager = parentFragmentManager,
+                    result = result
+                )
+            }
+        }
+
     private val importSaves =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
             if (result == null) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -13,7 +13,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.R
@@ -48,7 +47,7 @@ class LicensesFragment : Fragment() {
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         binding.toolbarLicenses.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         val licenses = listOf(

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ProfileManagerFragment.kt

@@ -51,7 +51,7 @@ class ProfileManagerFragment : Fragment() {
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         binding.toolbarProfiles.setNavigationOnClickListener {
-            findNavController().popBackStack()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
         setupRecyclerView()

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt

@@ -16,5 +16,17 @@ data class Patch(
     val type: Int,
     val programId: String,
     val titleId: String,
-    val numericVersion: Long = 0
-)
+    val numericVersion: Long = 0,
+    val source: Int = 0
+) {
+    companion object {
+        const val SOURCE_UNKNOWN = 0
+        const val SOURCE_NAND = 1
+        const val SOURCE_SDMC = 2
+        const val SOURCE_EXTERNAL = 3
+        const val SOURCE_PACKED = 4
+    }
+
+    val isRemovable: Boolean
+        get() = source != SOURCE_EXTERNAL && source != SOURCE_PACKED
+}

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -26,7 +26,6 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
-import java.io.FilenameFilter
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
@@ -39,16 +38,10 @@ import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.InstallResult
 import android.os.Build
-import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
-import java.io.BufferedInputStream
-import java.io.BufferedOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 import androidx.core.content.edit
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import kotlin.text.compareTo
@@ -453,35 +446,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     }
 
     fun processKey(result: Uri, extension: String = "keys") {
-        contentResolver.takePersistableUriPermission(
-            result,
-            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        InstallableActions.processKey(
+            activity = this,
+            fragmentManager = supportFragmentManager,
+            gamesViewModel = gamesViewModel,
+            result = result,
+            extension = extension
         )
-
-        val resultCode: Int = NativeLibrary.installKeys(result.toString(), extension)
-
-        if (resultCode == 0) {
-            // TODO(crueter): It may be worth it to switch some of these Toasts to snackbars,
-            // since most of it is foreground-only anyways.
-            Toast.makeText(
-                applicationContext,
-                R.string.keys_install_success,
-                Toast.LENGTH_SHORT
-            ).show()
-
-            gamesViewModel.reloadGames(true)
-
-            return
-        }
-
-        val resultString: String =
-            resources.getStringArray(R.array.installKeysResults)[resultCode]
-
-        MessageDialogFragment.newInstance(
-            titleId = R.string.keys_failed,
-            descriptionString = resultString,
-            helpLinkId = R.string.keys_missing_help
-        ).show(supportFragmentManager, MessageDialogFragment.TAG)
     }
 
     val getFirmware = registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
@@ -491,75 +462,21 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     }
 
     fun processFirmware(result: Uri, onComplete: (() -> Unit)? = null) {
-        val filterNCA = FilenameFilter { _, dirName -> dirName.endsWith(".nca") }
-
-        val firmwarePath =
-            File(NativeConfig.getNandDir() + "/system/Contents/registered/")
-        val cacheFirmwareDir = File("${cacheDir.path}/registered/")
-
-        ProgressDialogFragment.newInstance(
-            this,
-            R.string.firmware_installing
-        ) { progressCallback, _ ->
-            var messageToShow: Any
-            try {
-                FileUtil.unzipToInternalStorage(
-                    result.toString(),
-                    cacheFirmwareDir,
-                    progressCallback
-                )
-                val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
-                val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
-                messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
-                    MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.firmware_installed_failure,
-                        descriptionId = R.string.firmware_installed_failure_description
-                    )
-                } else {
-                    firmwarePath.deleteRecursively()
-                    cacheFirmwareDir.copyRecursively(firmwarePath, true)
-                    NativeLibrary.initializeSystem(true)
-                    homeViewModel.setCheckKeys(true)
-                    getString(R.string.save_file_imported_success)
-                }
-            } catch (e: Exception) {
-                Log.error("[MainActivity] Firmware install failed - ${e.message}")
-                messageToShow = getString(R.string.fatal_error)
-            } finally {
-                cacheFirmwareDir.deleteRecursively()
-            }
-            messageToShow
-        }.apply {
-            onDialogComplete = onComplete
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        InstallableActions.processFirmware(
+            activity = this,
+            fragmentManager = supportFragmentManager,
+            homeViewModel = homeViewModel,
+            result = result,
+            onComplete = onComplete
+        )
     }
 
     fun uninstallFirmware() {
-        val firmwarePath =
-            File(NativeConfig.getNandDir() + "/system/Contents/registered/")
-        ProgressDialogFragment.newInstance(
-            this,
-            R.string.firmware_uninstalling
-        ) { progressCallback, _ ->
-            var messageToShow: Any
-            try {
-                // Ensure the firmware directory exists before attempting to delete
-                if (firmwarePath.exists()) {
-                    firmwarePath.deleteRecursively()
-                    // Optionally reinitialize the system or perform other necessary steps
-                    NativeLibrary.initializeSystem(true)
-                    homeViewModel.setCheckKeys(true)
-                    messageToShow = getString(R.string.firmware_uninstalled_success)
-                } else {
-                    messageToShow = getString(R.string.firmware_uninstalled_failure)
-                }
-            } catch (e: Exception) {
-                Log.error("[MainActivity] Firmware uninstall failed - ${e.message}")
-                messageToShow = getString(R.string.fatal_error)
-            }
-            messageToShow
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        InstallableActions.uninstallFirmware(
+            activity = this,
+            fragmentManager = supportFragmentManager,
+            homeViewModel = homeViewModel
+        )
     }
 
     val installGameUpdate = registerForActivityResult(
@@ -606,101 +523,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     }
 
     private fun installContent(documents: List<Uri>) {
-        ProgressDialogFragment.newInstance(
-            this@MainActivity,
-            R.string.installing_game_content
-        ) { progressCallback, messageCallback ->
-            var installSuccess = 0
-            var installOverwrite = 0
-            var errorBaseGame = 0
-            var error = 0
-            documents.forEach {
-                messageCallback.invoke(FileUtil.getFilename(it))
-                when (
-                    InstallResult.from(
-                        NativeLibrary.installFileToNand(
-                            it.toString(),
-                            progressCallback
-                        )
-                    )
-                ) {
-                    InstallResult.Success -> {
-                        installSuccess += 1
-                    }
-
-                    InstallResult.Overwrite -> {
-                        installOverwrite += 1
-                    }
-
-                    InstallResult.BaseInstallAttempted -> {
-                        errorBaseGame += 1
-                    }
-
-                    InstallResult.Failure -> {
-                        error += 1
-                    }
-                }
-            }
-
-            addonViewModel.refreshAddons(force = true)
-
-            val separator = System.lineSeparator() ?: "\n"
-            val installResult = StringBuilder()
-            if (installSuccess > 0) {
-                installResult.append(
-                    getString(
-                        R.string.install_game_content_success_install,
-                        installSuccess
-                    )
-                )
-                installResult.append(separator)
-            }
-            if (installOverwrite > 0) {
-                installResult.append(
-                    getString(
-                        R.string.install_game_content_success_overwrite,
-                        installOverwrite
-                    )
-                )
-                installResult.append(separator)
-            }
-            val errorTotal: Int = errorBaseGame + error
-            if (errorTotal > 0) {
-                installResult.append(separator)
-                installResult.append(
-                    getString(
-                        R.string.install_game_content_failed_count,
-                        errorTotal
-                    )
-                )
-                installResult.append(separator)
-                if (errorBaseGame > 0) {
-                    installResult.append(separator)
-                    installResult.append(
-                        getString(R.string.install_game_content_failure_base)
-                    )
-                    installResult.append(separator)
-                }
-                if (error > 0) {
-                    installResult.append(
-                        getString(R.string.install_game_content_failure_description)
-                    )
-                    installResult.append(separator)
-                }
-                return@newInstance MessageDialogFragment.newInstance(
-                    this,
-                    titleId = R.string.install_game_content_failure,
-                    descriptionString = installResult.toString().trim(),
-                    helpLinkId = R.string.install_game_content_help_link
-                )
-            } else {
-                return@newInstance MessageDialogFragment.newInstance(
-                    this,
-                    titleId = R.string.install_game_content_success,
-                    descriptionString = installResult.toString().trim()
-                )
-            }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        InstallableActions.installContent(
+            activity = this,
+            fragmentManager = supportFragmentManager,
+            addonViewModel = addonViewModel,
+            documents = documents
+        )
     }
 
     val exportUserData = registerForActivityResult(
@@ -709,25 +537,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         if (result == null) {
             return@registerForActivityResult
         }
-
-        ProgressDialogFragment.newInstance(
-            this,
-            R.string.exporting_user_data,
-            true
-        ) { progressCallback, _ ->
-            val zipResult = FileUtil.zipFromInternalStorage(
-                File(DirectoryInitialization.userDirectory!!),
-                DirectoryInitialization.userDirectory!!,
-                BufferedOutputStream(contentResolver.openOutputStream(result)),
-                progressCallback,
-                compression = false
-            )
-            return@newInstance when (zipResult) {
-                TaskState.Completed -> getString(R.string.user_data_export_success)
-                TaskState.Failed -> R.string.export_failed
-                TaskState.Cancelled -> R.string.user_data_export_cancelled
-            }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        InstallableActions.exportUserData(
+            activity = this,
+            fragmentManager = supportFragmentManager,
+            result = result
+        )
     }
 
     val importUserData =
@@ -735,58 +549,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             if (result == null) {
                 return@registerForActivityResult
             }
-
-            ProgressDialogFragment.newInstance(
-                this,
-                R.string.importing_user_data
-            ) { progressCallback, _ ->
-                val checkStream =
-                    ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
-                var isYuzuBackup = false
-                checkStream.use { stream ->
-                    var ze: ZipEntry? = null
-                    while (stream.nextEntry?.also { ze = it } != null) {
-                        val itemName = ze!!.name.trim()
-                        if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
-                            isYuzuBackup = true
-                            return@use
-                        }
-                    }
-                }
-                if (!isYuzuBackup) {
-                    return@newInstance MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.invalid_yuzu_backup,
-                        descriptionId = R.string.user_data_import_failed_description
-                    )
-                }
-
-                // Clear existing user data
-                NativeConfig.unloadGlobalConfig()
-                File(DirectoryInitialization.userDirectory!!).deleteRecursively()
-
-                // Copy archive to internal storage
-                try {
-                    FileUtil.unzipToInternalStorage(
-                        result.toString(),
-                        File(DirectoryInitialization.userDirectory!!),
-                        progressCallback
-                    )
-                } catch (e: Exception) {
-                    return@newInstance MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.import_failed,
-                        descriptionId = R.string.user_data_import_failed_description
-                    )
-                }
-
-                // Reinitialize relevant data
-                NativeLibrary.initializeSystem(true)
-                NativeConfig.initializeGlobalConfig()
-                gamesViewModel.reloadGames(false)
-                driverViewModel.reloadDriverData()
-
-                return@newInstance getString(R.string.user_data_import_success)
-            }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+            InstallableActions.importUserData(
+                activity = this,
+                fragmentManager = supportFragmentManager,
+                gamesViewModel = gamesViewModel,
+                driverViewModel = driverViewModel,
+                result = result
+            )
         }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InstallableActions.kt

@@ -0,0 +1,327 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package org.yuzu.yuzu_emu.utils
+
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import org.yuzu.yuzu_emu.NativeLibrary
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
+import org.yuzu.yuzu_emu.fragments.ProgressDialogFragment
+import org.yuzu.yuzu_emu.model.AddonViewModel
+import org.yuzu.yuzu_emu.model.DriverViewModel
+import org.yuzu.yuzu_emu.model.GamesViewModel
+import org.yuzu.yuzu_emu.model.HomeViewModel
+import org.yuzu.yuzu_emu.model.InstallResult
+import org.yuzu.yuzu_emu.model.TaskState
+import java.io.BufferedInputStream
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FilenameFilter
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
+object InstallableActions {
+    fun processKey(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        gamesViewModel: GamesViewModel,
+        result: Uri,
+        extension: String = "keys"
+    ) {
+        activity.contentResolver.takePersistableUriPermission(
+            result,
+            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        )
+
+        val resultCode = NativeLibrary.installKeys(result.toString(), extension)
+        if (resultCode == 0) {
+            Toast.makeText(
+                activity.applicationContext,
+                R.string.keys_install_success,
+                Toast.LENGTH_SHORT
+            ).show()
+            gamesViewModel.reloadGames(true)
+            return
+        }
+
+        val resultString = activity.resources.getStringArray(R.array.installKeysResults)[resultCode]
+        MessageDialogFragment.newInstance(
+            titleId = R.string.keys_failed,
+            descriptionString = resultString,
+            helpLinkId = R.string.keys_missing_help
+        ).show(fragmentManager, MessageDialogFragment.TAG)
+    }
+
+    fun processFirmware(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        homeViewModel: HomeViewModel,
+        result: Uri,
+        onComplete: (() -> Unit)? = null
+    ) {
+        val filterNCA = FilenameFilter { _, dirName -> dirName.endsWith(".nca") }
+        val firmwarePath = File(NativeConfig.getNandDir() + "/system/Contents/registered/")
+        val cacheFirmwareDir = File("${activity.cacheDir.path}/registered/")
+
+        ProgressDialogFragment.newInstance(
+            activity,
+            R.string.firmware_installing
+        ) { progressCallback, _ ->
+            var messageToShow: Any
+            try {
+                FileUtil.unzipToInternalStorage(
+                    result.toString(),
+                    cacheFirmwareDir,
+                    progressCallback
+                )
+                val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
+                val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
+                messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
+                    MessageDialogFragment.newInstance(
+                        activity,
+                        titleId = R.string.firmware_installed_failure,
+                        descriptionId = R.string.firmware_installed_failure_description
+                    )
+                } else {
+                    firmwarePath.deleteRecursively()
+                    cacheFirmwareDir.copyRecursively(firmwarePath, overwrite = true)
+                    NativeLibrary.initializeSystem(true)
+                    homeViewModel.setCheckKeys(true)
+                    activity.getString(R.string.save_file_imported_success)
+                }
+            } catch (_: Exception) {
+                messageToShow = activity.getString(R.string.fatal_error)
+            } finally {
+                cacheFirmwareDir.deleteRecursively()
+            }
+            messageToShow
+        }.apply {
+            onDialogComplete = onComplete
+        }.show(fragmentManager, ProgressDialogFragment.TAG)
+    }
+
+    fun uninstallFirmware(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        homeViewModel: HomeViewModel
+    ) {
+        val firmwarePath = File(NativeConfig.getNandDir() + "/system/Contents/registered/")
+        ProgressDialogFragment.newInstance(
+            activity,
+            R.string.firmware_uninstalling
+        ) { _, _ ->
+            val messageToShow: Any = try {
+                if (firmwarePath.exists()) {
+                    firmwarePath.deleteRecursively()
+                    NativeLibrary.initializeSystem(true)
+                    homeViewModel.setCheckKeys(true)
+                    activity.getString(R.string.firmware_uninstalled_success)
+                } else {
+                    activity.getString(R.string.firmware_uninstalled_failure)
+                }
+            } catch (_: Exception) {
+                activity.getString(R.string.fatal_error)
+            }
+            messageToShow
+        }.show(fragmentManager, ProgressDialogFragment.TAG)
+    }
+
+    fun installContent(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        addonViewModel: AddonViewModel,
+        documents: List<Uri>
+    ) {
+        ProgressDialogFragment.newInstance(
+            activity,
+            R.string.installing_game_content
+        ) { progressCallback, messageCallback ->
+            var installSuccess = 0
+            var installOverwrite = 0
+            var errorBaseGame = 0
+            var error = 0
+            documents.forEach {
+                messageCallback.invoke(FileUtil.getFilename(it))
+                when (
+                    InstallResult.from(
+                        NativeLibrary.installFileToNand(
+                            it.toString(),
+                            progressCallback
+                        )
+                    )
+                ) {
+                    InstallResult.Success -> installSuccess += 1
+                    InstallResult.Overwrite -> installOverwrite += 1
+                    InstallResult.BaseInstallAttempted -> errorBaseGame += 1
+                    InstallResult.Failure -> error += 1
+                }
+            }
+
+            addonViewModel.refreshAddons(force = true)
+
+            val separator = System.lineSeparator() ?: "\n"
+            val installResult = StringBuilder()
+            if (installSuccess > 0) {
+                installResult.append(
+                    activity.getString(
+                        R.string.install_game_content_success_install,
+                        installSuccess
+                    )
+                )
+                installResult.append(separator)
+            }
+            if (installOverwrite > 0) {
+                installResult.append(
+                    activity.getString(
+                        R.string.install_game_content_success_overwrite,
+                        installOverwrite
+                    )
+                )
+                installResult.append(separator)
+            }
+            val errorTotal = errorBaseGame + error
+            if (errorTotal > 0) {
+                installResult.append(separator)
+                installResult.append(
+                    activity.getString(
+                        R.string.install_game_content_failed_count,
+                        errorTotal
+                    )
+                )
+                installResult.append(separator)
+                if (errorBaseGame > 0) {
+                    installResult.append(separator)
+                    installResult.append(activity.getString(R.string.install_game_content_failure_base))
+                    installResult.append(separator)
+                }
+                if (error > 0) {
+                    installResult.append(
+                        activity.getString(R.string.install_game_content_failure_description)
+                    )
+                    installResult.append(separator)
+                }
+                return@newInstance MessageDialogFragment.newInstance(
+                    activity,
+                    titleId = R.string.install_game_content_failure,
+                    descriptionString = installResult.toString().trim(),
+                    helpLinkId = R.string.install_game_content_help_link
+                )
+            } else {
+                return@newInstance MessageDialogFragment.newInstance(
+                    activity,
+                    titleId = R.string.install_game_content_success,
+                    descriptionString = installResult.toString().trim()
+                )
+            }
+        }.show(fragmentManager, ProgressDialogFragment.TAG)
+    }
+
+    fun exportUserData(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        result: Uri
+    ) {
+        val userDirectory = DirectoryInitialization.userDirectory
+        if (userDirectory == null) {
+            Toast.makeText(
+                activity.applicationContext,
+                R.string.fatal_error,
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        ProgressDialogFragment.newInstance(
+            activity,
+            R.string.exporting_user_data,
+            true
+        ) { progressCallback, _ ->
+            val zipResult = FileUtil.zipFromInternalStorage(
+                File(userDirectory),
+                userDirectory,
+                BufferedOutputStream(activity.contentResolver.openOutputStream(result)),
+                progressCallback,
+                compression = false
+            )
+            return@newInstance when (zipResult) {
+                TaskState.Completed -> activity.getString(R.string.user_data_export_success)
+                TaskState.Failed -> R.string.export_failed
+                TaskState.Cancelled -> R.string.user_data_export_cancelled
+            }
+        }.show(fragmentManager, ProgressDialogFragment.TAG)
+    }
+
+    fun importUserData(
+        activity: FragmentActivity,
+        fragmentManager: FragmentManager,
+        gamesViewModel: GamesViewModel,
+        driverViewModel: DriverViewModel,
+        result: Uri
+    ) {
+        val userDirectory = DirectoryInitialization.userDirectory
+        if (userDirectory == null) {
+            Toast.makeText(
+                activity.applicationContext,
+                R.string.fatal_error,
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        ProgressDialogFragment.newInstance(
+            activity,
+            R.string.importing_user_data
+        ) { progressCallback, _ ->
+            val checkStream = ZipInputStream(
+                BufferedInputStream(activity.contentResolver.openInputStream(result))
+            )
+            var isYuzuBackup = false
+            checkStream.use { stream ->
+                var ze: ZipEntry? = null
+                while (stream.nextEntry?.also { ze = it } != null) {
+                    val itemName = ze!!.name.trim()
+                    if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
+                        isYuzuBackup = true
+                        return@use
+                    }
+                }
+            }
+            if (!isYuzuBackup) {
+                return@newInstance MessageDialogFragment.newInstance(
+                    activity,
+                    titleId = R.string.invalid_yuzu_backup,
+                    descriptionId = R.string.user_data_import_failed_description
+                )
+            }
+
+            NativeConfig.unloadGlobalConfig()
+            File(userDirectory).deleteRecursively()
+
+            try {
+                FileUtil.unzipToInternalStorage(
+                    result.toString(),
+                    File(userDirectory),
+                    progressCallback
+                )
+            } catch (_: Exception) {
+                return@newInstance MessageDialogFragment.newInstance(
+                    activity,
+                    titleId = R.string.import_failed,
+                    descriptionId = R.string.user_data_import_failed_description
+                )
+            }
+
+            NativeLibrary.initializeSystem(true)
+            NativeConfig.initializeGlobalConfig()
+            gamesViewModel.reloadGames(false)
+            driverViewModel.reloadDriverData()
+
+            return@newInstance activity.getString(R.string.user_data_import_success)
+        }.show(fragmentManager, ProgressDialogFragment.TAG)
+    }
+}

src/android/app/src/main/jni/native.cpp

@@ -1407,7 +1407,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
             Common::Android::ToJString(env, patch.version), static_cast<jint>(patch.type),
             Common::Android::ToJString(env, std::to_string(patch.program_id)),
             Common::Android::ToJString(env, std::to_string(patch.title_id)),
-            static_cast<jlong>(patch.numeric_version));
+            static_cast<jlong>(patch.numeric_version), static_cast<jint>(patch.source));
         env->SetObjectArrayElement(jpatchArray, i, jpatch);
         ++i;
     }

src/android/app/src/main/res/layout-w600dp/fragment_about.xml

@@ -10,12 +10,11 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_about"
+        style="@style/Widget.Eden.TransparentTopAppBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
-        android:background="@android:color/transparent"
-        app:elevation="0dp">
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
@@ -41,15 +40,41 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
-            android:padding="24dp">
+            android:paddingBottom="24dp"
+            android:paddingStart="24dp"
+            android:paddingTop="0dp"
+            android:paddingEnd="24dp">
 
-            <ImageView
-                android:id="@+id/image_logo"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:layout_gravity="center_vertical"
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="32dp"
-                android:src="@drawable/ic_yuzu" />
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/image_logo"
+                    android:layout_width="200dp"
+                    android:layout_height="200dp"
+                    android:layout_marginBottom="8dp"
+                    android:src="@drawable/ic_yuzu" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleMedium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textAlignment="center" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:layout_width="220dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/about_app_description"
+                    android:textAlignment="center" />
+
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -57,39 +82,6 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:cardCornerRadius="16dp"
-                    app:cardBackgroundColor="?attr/colorSurface"
-                    app:strokeColor="?attr/colorOutline"
-                    app:strokeWidth="1dp"
-                    app:cardElevation="0dp">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingHorizontal="24dp"
-                        android:paddingVertical="20dp">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextAppearance.Material3.TitleMedium"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/about"
-                            android:textAlignment="viewStart" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextAppearance.Material3.BodyMedium"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:text="@string/about_app_description"
-                            android:textAlignment="viewStart" />
-
-                    </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
-
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/button_contributors"
                     android:layout_width="match_parent"
@@ -205,7 +197,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="12dp"
                     android:gravity="start"
                     android:orientation="horizontal">
 

src/android/app/src/main/res/layout/fragment_about.xml

@@ -10,12 +10,11 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_about"
+        style="@style/Widget.Eden.TransparentTopAppBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
-        android:background="@android:color/transparent"
-        app:elevation="0dp">
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
@@ -43,48 +42,35 @@
             android:orientation="vertical"
             android:paddingBottom="24dp">
 
-            <ImageView
-                android:id="@+id/image_logo"
-                android:layout_width="160dp"
-                android:layout_height="160dp"
-                android:layout_marginVertical="24dp"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/ic_yuzu" />
-
-            <com.google.android.material.card.MaterialCardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:layout_marginTop="16dp"
-                app:cardBackgroundColor="@android:color/transparent"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="0dp"
-                app:strokeColor="?attr/colorOutline"
-                app:strokeWidth="1dp">
-                <LinearLayout
-                    android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:gravity="center_horizontal">
+
+                <ImageView
+                    android:id="@+id/image_logo"
+                    android:layout_width="160dp"
+                    android:layout_height="160dp"
+                    android:layout_marginBottom="8dp"
+                    android:src="@drawable/ic_yuzu" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleMedium"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingVertical="20dp"
-                    android:paddingHorizontal="20dp"
-                    android:orientation="vertical">
+                    android:text="@string/app_name"
+                    android:textAlignment="center" />
 
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextAppearance.Material3.TitleMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="viewStart"
-                        android:text="@string/about" />
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/SynthwaveText.Body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:textAlignment="center"
+                    android:text="@string/about_app_description" />
 
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/SynthwaveText.Body"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:textAlignment="viewStart"
-                        android:text="@string/about_app_description" />
-
-                </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/button_contributors"
@@ -206,7 +192,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:gravity="center_horizontal"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="12dp"
                 android:layout_marginBottom="16dp"
                 android:layout_marginHorizontal="40dp">
 
@@ -220,7 +206,9 @@
                     app:icon="@drawable/ic_discord"
                     app:iconSize="24dp"
                     app:iconGravity="textStart"
-                    app:iconPadding="0dp" />
+                    app:iconPadding="0dp"
+                    app:strokeColor="?attr/colorOutline"
+                    app:strokeWidth="1dp" />
 
                 <com.google.android.material.button.MaterialButton
                     style="@style/EdenButton.Secondary"
@@ -232,7 +220,9 @@
                     app:icon="@drawable/ic_stoat"
                     app:iconSize="24dp"
                     app:iconGravity="textStart"
-                    app:iconPadding="0dp" />
+                    app:iconPadding="0dp"
+                    app:strokeColor="?attr/colorOutline"
+                    app:strokeWidth="1dp" />
 
                 <com.google.android.material.button.MaterialButton
                     style="@style/EdenButton.Secondary"
@@ -244,7 +234,9 @@
                     app:icon="@drawable/ic_x"
                     app:iconSize="24dp"
                     app:iconGravity="textStart"
-                    app:iconPadding="0dp" />
+                    app:iconPadding="0dp"
+                    app:strokeColor="?attr/colorOutline"
+                    app:strokeWidth="1dp" />
 
                 <com.google.android.material.button.MaterialButton
                     style="@style/EdenButton.Secondary"
@@ -256,7 +248,9 @@
                     app:icon="@drawable/ic_website"
                     app:iconSize="24dp"
                     app:iconGravity="textStart"
-                    app:iconPadding="0dp" />
+                    app:iconPadding="0dp"
+                    app:strokeColor="?attr/colorOutline"
+                    app:strokeWidth="1dp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_github"
@@ -268,7 +262,9 @@
                     app:icon="@drawable/ic_github"
                     app:iconSize="24dp"
                     app:iconGravity="textStart"
-                    app:iconPadding="0dp" />
+                    app:iconPadding="0dp"
+                    app:strokeColor="?attr/colorOutline"
+                    app:strokeWidth="1dp" />
 
             </LinearLayout>
 

src/android/app/src/main/res/navigation/emulation_navigation.xml

@@ -40,10 +40,6 @@
 
     <action
         android:id="@+id/action_global_settingsActivity"
-        app:destination="@id/settingsActivity"
-        app:enterAnim="@anim/nav_default_enter_anim"
-        app:exitAnim="@anim/nav_default_exit_anim"
-        app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-        app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+        app:destination="@id/settingsActivity" />
 
 </navigation>

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -20,26 +20,7 @@
     <fragment
         android:id="@+id/homeSettingsFragment"
         android:name="org.yuzu.yuzu_emu.fragments.HomeSettingsFragment"
-        android:label="HomeSettingsFragment" >
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_aboutFragment"
-            app:destination="@id/aboutFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_installableFragment"
-            app:destination="@id/installableFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_driverManagerFragment"
-            app:destination="@id/driverManagerFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_appletLauncherFragment"
-            app:destination="@id/appletLauncherFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_gameFoldersFragment"
-            app:destination="@id/gameFoldersFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_profileManagerFragment"
-            app:destination="@id/profileManagerFragment" />
-    </fragment>
+        android:label="HomeSettingsFragment" />
 
     <fragment
         android:id="@+id/firstTimeSetupFragment"
@@ -55,11 +36,7 @@
     <fragment
         android:id="@+id/aboutFragment"
         android:name="org.yuzu.yuzu_emu.fragments.AboutFragment"
-        android:label="AboutFragment" >
-        <action
-            android:id="@+id/action_aboutFragment_to_licensesFragment"
-            app:destination="@id/licensesFragment" />
-    </fragment>
+        android:label="AboutFragment" />
 
     <fragment
         android:id="@+id/licensesFragment"
@@ -101,11 +78,23 @@
 
     <action
         android:id="@+id/action_global_settingsActivity"
-        app:destination="@id/settingsActivity"
-        app:enterAnim="@anim/nav_default_enter_anim"
-        app:exitAnim="@anim/nav_default_exit_anim"
-        app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-        app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+        app:destination="@id/settingsActivity" />
+    <activity
+        android:id="@+id/settingsSubscreenActivity"
+        android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreenActivity"
+        android:label="SettingsSubscreenActivity">
+        <argument
+            android:name="destination"
+            app:argType="org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen" />
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game"
+            app:nullable="true"
+            android:defaultValue="@null" />
+    </activity>
+    <action
+        android:id="@+id/action_global_settingsSubscreenActivity"
+        app:destination="@id/settingsSubscreenActivity" />
     <fragment
         android:id="@+id/installableFragment"
         android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
@@ -119,9 +108,6 @@
             app:argType="org.yuzu.yuzu_emu.model.Game"
             app:nullable="true"
             android:defaultValue="@null" />
-        <action
-            android:id="@+id/action_driverManagerFragment_to_driverFetcherFragment"
-            app:destination="@id/driverFetcherFragment" />
     </fragment>
     <fragment
         android:id="@+id/appletLauncherFragment"

src/android/app/src/main/res/navigation/settings_subscreen_navigation.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/settings_subscreen_navigation"
+    app:startDestination="@id/profileManagerFragment">
+
+    <fragment
+        android:id="@+id/profileManagerFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.ProfileManagerFragment"
+        android:label="ProfileManagerFragment">
+        <action
+            android:id="@+id/action_profileManagerFragment_to_newUserDialog"
+            app:destination="@id/newUserDialogFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/newUserDialogFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.EditUserDialogFragment"
+        android:label="NewUserDialogFragment" />
+
+    <fragment
+        android:id="@+id/driverManagerFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.DriverManagerFragment"
+        android:label="DriverManagerFragment">
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game"
+            app:nullable="true"
+            android:defaultValue="@null" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/driverFetcherFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.DriverFetcherFragment"
+        android:label="fragment_driver_fetcher"
+        tools:layout="@layout/fragment_driver_fetcher" />
+
+    <fragment
+        android:id="@+id/freedrenoSettingsFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.FreedrenoSettingsFragment"
+        android:label="@string/freedreno_settings_title">
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game"
+            app:nullable="true"
+            android:defaultValue="@null" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/appletLauncherFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.AppletLauncherFragment"
+        android:label="AppletLauncherFragment">
+        <action
+            android:id="@+id/action_appletLauncherFragment_to_cabinetLauncherDialogFragment"
+            app:destination="@id/cabinetLauncherDialogFragment" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/cabinetLauncherDialogFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.CabinetLauncherDialogFragment"
+        android:label="CabinetLauncherDialogFragment" />
+
+    <fragment
+        android:id="@+id/aboutFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.AboutFragment"
+        android:label="AboutFragment" />
+
+    <fragment
+        android:id="@+id/licensesFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.LicensesFragment"
+        android:label="LicensesFragment" />
+
+    <fragment
+        android:id="@+id/gameInfoFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.GameInfoFragment"
+        android:label="GameInfoFragment">
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/addonsFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.AddonsFragment"
+        android:label="AddonsFragment">
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/installableFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
+        android:label="InstallableFragment" />
+
+    <fragment
+        android:id="@+id/gameFoldersFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.GameFoldersFragment"
+        android:label="GameFoldersFragment" />
+
+    <activity
+        android:id="@+id/emulationActivity"
+        android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
+        android:label="EmulationActivity">
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game"
+            app:nullable="true"
+            android:defaultValue="@null" />
+        <argument
+            android:name="custom"
+            app:argType="boolean"
+            android:defaultValue="false" />
+    </activity>
+
+    <action
+        android:id="@+id/action_global_emulationActivity"
+        app:destination="@id/emulationActivity"
+        app:launchSingleTop="true" />
+
+    <activity
+        android:id="@+id/settingsSubscreenActivity"
+        android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreenActivity"
+        android:label="SettingsSubscreenActivity">
+        <argument
+            android:name="destination"
+            app:argType="org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen" />
+        <argument
+            android:name="game"
+            app:argType="org.yuzu.yuzu_emu.model.Game"
+            app:nullable="true"
+            android:defaultValue="@null" />
+    </activity>
+
+    <action
+        android:id="@+id/action_global_settingsSubscreenActivity"
+        app:destination="@id/settingsSubscreenActivity" />
+</navigation>

src/android/app/src/main/res/values/strings.xml

@@ -400,7 +400,7 @@
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="about_app_description">An open-source Switch emulator</string>
     <string name="contributors">Contributors</string>
-    <string name="contributors_description">Contributors who made Eden for Android possible</string>
+    <string name="contributors_description">People who made Eden for Android possible</string>
     <string name="contributors_link" translatable="false">https://git.eden-emu.dev/eden-emu/eden/activity/contributors</string>
     <string name="licenses_description">Projects that make Eden for Android possible</string>
     <string name="build">Build</string>

src/audio_core/audio_core.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -8,10 +11,11 @@
 
 namespace AudioCore {
 
-AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
+AudioCore::AudioCore(Core::System& system) {
+    audio_manager.emplace();
     CreateSinks();
     // Must be created after the sinks
-    adsp = std::make_unique<ADSP::ADSP>(system, *output_sink);
+    adsp.emplace(system, *output_sink);
 }
 
 AudioCore ::~AudioCore() {

src/audio_core/audio_core.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -15,10 +18,7 @@ class System;
 
 namespace AudioCore {
 
-class AudioManager;
-/**
- * Main audio class, stored inside the core, and holding the audio manager, all sinks, and the ADSP.
- */
+/// @brief Main audio class, stored inside the core, and holding the audio manager, all sinks, and the ADSP.
 class AudioCore {
 public:
     explicit AudioCore(Core::System& system);
@@ -50,27 +50,22 @@ public:
      */
     Sink::Sink& GetInputSink();
 
-    /**
-     * Get the ADSP.
-     *
-     * @return Ref to the ADSP.
-     */
+    /// @brief Get the ADSP.
+    /// @return Ref to the ADSP.
     ADSP::ADSP& ADSP();
 
 private:
-    /**
-     * Create the sinks on startup.
-     */
+    /// @brief Create the sinks on startup.
     void CreateSinks();
 
     /// Main audio manager for audio in/out
-    std::unique_ptr<AudioManager> audio_manager;
+    std::optional<AudioManager> audio_manager;
     /// Sink used for audio renderer and audio out
     std::unique_ptr<Sink::Sink> output_sink;
     /// Sink used for audio input
     std::unique_ptr<Sink::Sink> input_sink;
     /// The ADSP in the sysmodule
-    std::unique_ptr<ADSP::ADSP> adsp;
+    std::optional<ADSP::ADSP> adsp;
 };
 
 } // namespace AudioCore

src/audio_core/audio_in_manager.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -41,8 +44,7 @@ void Manager::ReleaseSessionId(const size_t session_id) {
 Result Manager::LinkToManager() {
     std::scoped_lock l{mutex};
     if (!linked_to_manager) {
-        AudioManager& manager{system.AudioCore().GetAudioManager()};
-        manager.SetInManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        system.AudioCore().GetAudioManager().SetInManager(std::bind(&Manager::BufferReleaseAndRegister, this));
         linked_to_manager = true;
     }
 

src/audio_core/audio_manager.cpp

@@ -1,81 +1,77 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "audio_core/audio_manager.h"
+#include "common/thread.h"
 #include "core/core.h"
 #include "core/hle/service/audio/errors.h"
 
 namespace AudioCore {
 
 AudioManager::AudioManager() {
-    thread = std::jthread([this]() { ThreadFunc(); });
+    thread = std::jthread([this](std::stop_token stop_token) {
+        Common::SetCurrentThreadName("AudioManager");
+        std::unique_lock l{events.GetAudioEventLock()};
+        events.ClearEvents();
+        while (!stop_token.stop_requested()) {
+            const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
+            if (events.CheckAudioEventSet(Event::Type::Max)) {
+                break;
+            }
+            for (size_t i = 0; i < buffer_events.size(); i++) {
+                const auto event_type = Event::Type(i);
+                if (events.CheckAudioEventSet(event_type) || timed_out) {
+                    if (buffer_events[i]) {
+                        buffer_events[i]();
+                    }
+                }
+                events.SetAudioEvent(event_type, false);
+            }
+        }
+    });
 }
 
 void AudioManager::Shutdown() {
-    running = false;
     events.SetAudioEvent(Event::Type::Max, true);
-    thread.join();
+    if (thread.joinable()) {
+        thread.request_stop();
+        thread.join();
+    }
 }
 
 Result AudioManager::SetOutManager(BufferEventFunc buffer_func) {
-    if (!running) {
-        return Service::Audio::ResultOperationFailed;
+    if (thread.joinable()) {
+        std::scoped_lock l{lock};
+        const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
+        if (buffer_events[index] == nullptr) {
+            buffer_events[index] = std::move(buffer_func);
+            needs_update = true;
+            events.SetAudioEvent(Event::Type::AudioOutManager, true);
+        }
+        return ResultSuccess;
     }
-
-    std::scoped_lock l{lock};
-
-    const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
-    if (buffer_events[index] == nullptr) {
-        buffer_events[index] = std::move(buffer_func);
-        needs_update = true;
-        events.SetAudioEvent(Event::Type::AudioOutManager, true);
-    }
-    return ResultSuccess;
+    return Service::Audio::ResultOperationFailed;
 }
 
 Result AudioManager::SetInManager(BufferEventFunc buffer_func) {
-    if (!running) {
-        return Service::Audio::ResultOperationFailed;
+    if (thread.joinable()) {
+        std::scoped_lock l{lock};
+        const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
+        if (buffer_events[index] == nullptr) {
+            buffer_events[index] = std::move(buffer_func);
+            needs_update = true;
+            events.SetAudioEvent(Event::Type::AudioInManager, true);
+        }
+        return ResultSuccess;
     }
-
-    std::scoped_lock l{lock};
-
-    const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
-    if (buffer_events[index] == nullptr) {
-        buffer_events[index] = std::move(buffer_func);
-        needs_update = true;
-        events.SetAudioEvent(Event::Type::AudioInManager, true);
-    }
-    return ResultSuccess;
+    return Service::Audio::ResultOperationFailed;
 }
 
 void AudioManager::SetEvent(const Event::Type type, const bool signalled) {
     events.SetAudioEvent(type, signalled);
 }
 
-void AudioManager::ThreadFunc() {
-    std::unique_lock l{events.GetAudioEventLock()};
-    events.ClearEvents();
-    running = true;
-
-    while (running) {
-        const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
-
-        if (events.CheckAudioEventSet(Event::Type::Max)) {
-            break;
-        }
-
-        for (size_t i = 0; i < buffer_events.size(); i++) {
-            const auto event_type = static_cast<Event::Type>(i);
-
-            if (events.CheckAudioEventSet(event_type) || timed_out) {
-                if (buffer_events[i]) {
-                    buffer_events[i]();
-                }
-            }
-            events.SetAudioEvent(event_type, false);
-        }
-    }
-}
-
 } // namespace AudioCore

src/audio_core/audio_manager.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -66,13 +69,6 @@ public:
     void SetEvent(Event::Type type, bool signalled);
 
 private:
-    /**
-     * Main thread, waiting on a manager signal and calling the registered function.
-     */
-    void ThreadFunc();
-
-    /// Is the main thread running?
-    std::atomic<bool> running{};
     /// Unused
     bool needs_update{};
     /// Events to be set and signalled

src/audio_core/audio_out_manager.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -40,8 +43,7 @@ void Manager::ReleaseSessionId(const size_t session_id) {
 Result Manager::LinkToManager() {
     std::scoped_lock l{mutex};
     if (!linked_to_manager) {
-        AudioManager& manager{system.AudioCore().GetAudioManager()};
-        manager.SetOutManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        system.AudioCore().GetAudioManager().SetOutManager(std::bind(&Manager::BufferReleaseAndRegister, this));
         linked_to_manager = true;
     }
 

src/common/android/id_cache.cpp

@@ -516,7 +516,7 @@ namespace Common::Android {
         s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class));
         s_patch_constructor = env->GetMethodID(
                 patch_class, "<init>",
-                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;J)V");
+                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JI)V");
         s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z");
         s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;");
         s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;");

src/common/settings.cpp

@@ -27,6 +27,10 @@
 #include "common/settings.h"
 #include "common/time_zone.h"
 
+#if defined(__linux__ ) && defined(ARCHITECTURE_arm64)
+#include <unistd.h>
+#endif
+
 namespace Settings {
 
 // Clang 14 and earlier have errors when explicitly instantiating these classes
@@ -178,7 +182,11 @@ bool IsFastmemEnabled() {
         return bool(values.cpuopt_fastmem);
     else if (values.cpu_accuracy.GetValue() == CpuAccuracy::Unsafe)
         return bool(values.cpuopt_unsafe_host_mmu);
-#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32)
+#if defined(__linux__) && defined(ARCHITECTURE_arm64)
+    // Only 4kb systems support host MMU right now
+    // TODO: Support this
+    return getpagesize() == 4096;
+#elif !defined(__APPLE__) && !defined(__ANDROID__) && !defined(_WIN32) && !defined(__linux__)
     return false;
 #else
     return true;

src/common/settings.h

@@ -777,6 +777,7 @@ struct Values {
     Setting<bool> reporting_services{
                                      linkage, false, "reporting_services", Category::Debugging, Specialization::Default, false};
     Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
+    Setting<bool> use_dev_keys{linkage, false, "use_dev_keys", Category::Debugging};
     Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit",
                                     Category::DebuggingGraphics};
     Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle",

src/common/thread.cpp

@@ -19,10 +19,12 @@
 #include <windows.h>
 #include "common/string_util.h"
 #else
-#if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__)
 #include <sys/cpuset.h>
 #include <sys/_cpuset.h>
 #include <pthread_np.h>
+#elif defined(__DragonFly__) || defined(__OpenBSD__) || defined(__Bitrig__)
+#include <pthread_np.h>
 #endif
 #include <pthread.h>
 #include <sched.h>

src/core/CMakeLists.txt

@@ -1220,7 +1220,7 @@ target_link_libraries(core PRIVATE
     RenderDoc::API
     ZLIB::ZLIB)
 
-target_link_libraries(core PRIVATE httplib::httplib)
+target_link_libraries(core PUBLIC httplib::httplib zstd::zstd)
 
 if (ENABLE_WEB_SERVICE)
     target_compile_definitions(core PUBLIC ENABLE_WEB_SERVICE)

src/core/core.cpp

@@ -347,7 +347,7 @@ struct System::Impl {
 
         // Register with applet manager
         // All threads are started, begin main process execution, now that we're in the clear
-        applet_manager.CreateAndInsertByFrontendAppletParameters(std::move(process), params);
+        applet_manager.CreateAndInsertByFrontendAppletParameters(std::make_unique<Service::Process>(*std::move(process)), params);
 
         if (Settings::values.gamecard_inserted) {
             if (Settings::values.gamecard_current_game) {

src/core/crypto/key_manager.cpp

@@ -21,6 +21,7 @@
 #include "common/fs/path_util.h"
 #include "common/hex_util.h"
 #include "common/logging/log.h"
+#include "common/settings.h"
 #include "common/string_util.h"
 #include "core/crypto/aes_util.h"
 #include "core/crypto/key_manager.h"
@@ -642,8 +643,15 @@ void KeyManager::ReloadKeys() {
     const auto keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir);
     if (!Common::FS::CreateDir(keys_dir))
         LOG_ERROR(Core, "Failed to create the keys directory.");
-    LoadFromFile(keys_dir / "prod.keys_autogenerated", false);
-    LoadFromFile(keys_dir / "prod.keys", false);
+    if (Settings::values.use_dev_keys.GetValue()) {
+        dev_mode = true;
+        LoadFromFile(keys_dir / "dev.keys_autogenerated", false);
+        LoadFromFile(keys_dir / "dev.keys", false);
+    } else {
+        dev_mode = false;
+        LoadFromFile(keys_dir / "prod.keys_autogenerated", false);
+        LoadFromFile(keys_dir / "prod.keys", false);
+    }
     LoadFromFile(keys_dir / "title.keys_autogenerated", true);
     LoadFromFile(keys_dir / "title.keys", true);
     LoadFromFile(keys_dir / "console.keys_autogenerated", false);
@@ -838,7 +846,7 @@ void KeyManager::WriteKeyToFile(KeyCategory category, std::string_view keyname,
 
     std::string filename = "title.keys_autogenerated";
     if (category == KeyCategory::Standard) {
-        filename = "prod.keys_autogenerated";
+        filename = dev_mode ? "dev.keys_autogenerated" : "prod.keys_autogenerated";
     } else if (category == KeyCategory::Console) {
         filename = "console.keys_autogenerated";
     }
@@ -936,6 +944,8 @@ bool KeyManager::KeyFileExists(bool title) {
     const auto keys_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::KeysDir);
     if (title)
         return Common::FS::Exists(keys_dir / "title.keys");
+    if (Settings::values.use_dev_keys.GetValue())
+        return Common::FS::Exists(keys_dir / "dev.keys");
     return Common::FS::Exists(keys_dir / "prod.keys");
 }
 

src/core/crypto/key_manager.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -314,6 +314,7 @@ private:
     std::array<u8, 576> eticket_extended_kek{};
     RSAKeyPair<2048> eticket_rsa_keypair{};
 
+    bool dev_mode;
     void LoadFromFile(const std::filesystem::path& file_path, bool is_title_keys);
 
     template <size_t Size>

src/core/device_memory_manager.h

@@ -76,16 +76,16 @@ public:
 
     template <typename Func>
     void ApplyOpOnPAddr(PAddr address, Common::ScratchBuffer<u32>& buffer, Func&& operation) {
-        DAddr subbits = static_cast<DAddr>(address & page_mask);
+        DAddr subbits = DAddr(address & page_mask);
         const u32 base = compressed_device_addr[(address >> page_bits)];
         if ((base >> MULTI_FLAG_BITS) == 0) [[likely]] {
-            const DAddr d_address = (static_cast<DAddr>(base) << page_bits) + subbits;
+            const DAddr d_address = (DAddr(base) << page_bits) + subbits;
             operation(d_address);
             return;
         }
         InnerGatherDeviceAddresses(buffer, address);
         for (u32 value : buffer) {
-            operation((static_cast<DAddr>(value) << page_bits) + subbits);
+            operation((DAddr(value) << page_bits) + subbits);
         }
     }
 
@@ -96,12 +96,12 @@ public:
     }
 
     PAddr GetPhysicalRawAddressFromDAddr(DAddr address) const {
-        PAddr subbits = static_cast<PAddr>(address & page_mask);
-        auto paddr = compressed_physical_ptr[(address >> page_bits)];
+        PAddr subbits = PAddr(address & page_mask);
+        auto paddr = tracked_entries[(address >> page_bits)].compressed_physical_ptr;
         if (paddr == 0) {
             return 0;
         }
-        return (static_cast<PAddr>(paddr - 1) << page_bits) + subbits;
+        return (PAddr(paddr - 1) << page_bits) + subbits;
     }
 
     template <typename T>
@@ -172,9 +172,14 @@ private:
 
     const uintptr_t physical_base;
     DeviceInterface* device_inter;
-    Common::VirtualBuffer<u32> compressed_physical_ptr;
+
+    struct TrackedEntry {
+        VAddr cpu_backing_address;
+        u32 continuity_tracker;
+        u32 compressed_physical_ptr;
+    };
     Common::VirtualBuffer<u32> compressed_device_addr;
-    Common::VirtualBuffer<u32> continuity_tracker;
+    Common::VirtualBuffer<TrackedEntry> tracked_entries;
 
     // Process memory interfaces
 
@@ -189,17 +194,16 @@ private:
     static constexpr size_t asid_start_bit = guest_max_as_bits;
 
     std::pair<Asid, VAddr> ExtractCPUBacking(size_t page_index) {
-        auto content = cpu_backing_address[page_index];
+        auto content = tracked_entries[page_index].cpu_backing_address;
         const VAddr address = content & guest_mask;
         const Asid asid{static_cast<size_t>(content >> asid_start_bit)};
         return std::make_pair(asid, address);
     }
 
     void InsertCPUBacking(size_t page_index, VAddr address, Asid asid) {
-        cpu_backing_address[page_index] = address | (asid.id << asid_start_bit);
+        tracked_entries[page_index].cpu_backing_address = address | (asid.id << asid_start_bit);
     }
 
-    Common::VirtualBuffer<VAddr> cpu_backing_address;
     std::array<TranslationEntry, 4> t_slot{};
     u32 cache_cursor = 0;
     using CounterType = u8;

src/core/device_memory_manager.inc

@@ -166,29 +166,21 @@ struct DeviceMemoryManagerAllocator {
 
 template <typename Traits>
 DeviceMemoryManager<Traits>::DeviceMemoryManager(const DeviceMemory& device_memory_)
-    : physical_base{reinterpret_cast<const uintptr_t>(device_memory_.buffer.BackingBasePointer())},
-      device_inter{nullptr}, compressed_physical_ptr(device_as_size >> Memory::YUZU_PAGEBITS),
-      compressed_device_addr(1ULL << ((Settings::values.memory_layout_mode.GetValue() ==
-                                               Settings::MemoryLayout::Memory_4Gb
-                                           ? physical_min_bits
-                                           : physical_max_bits) -
-                                      Memory::YUZU_PAGEBITS)),
-      continuity_tracker(device_as_size >> Memory::YUZU_PAGEBITS),
-      cpu_backing_address(device_as_size >> Memory::YUZU_PAGEBITS) {
+    : physical_base{uintptr_t(device_memory_.buffer.BackingBasePointer())}
+    , device_inter{nullptr}
+    , compressed_device_addr(1ULL << ((Settings::values.memory_layout_mode.GetValue() == Settings::MemoryLayout::Memory_4Gb ? physical_min_bits : physical_max_bits) - Memory::YUZU_PAGEBITS))
+    , tracked_entries(device_as_size >> Memory::YUZU_PAGEBITS)
+{
     impl = std::make_unique<DeviceMemoryManagerAllocator<Traits>>();
     cached_pages = std::make_unique<CachedPages>();
 
     const size_t total_virtual = device_as_size >> Memory::YUZU_PAGEBITS;
     for (size_t i = 0; i < total_virtual; i++) {
-        compressed_physical_ptr[i] = 0;
-        continuity_tracker[i] = 1;
-        cpu_backing_address[i] = 0;
+        tracked_entries[i].compressed_physical_ptr = 0;
+        tracked_entries[i].continuity_tracker = 1;
+        tracked_entries[i].cpu_backing_address = 0;
     }
-    const size_t total_phys = 1ULL << ((Settings::values.memory_layout_mode.GetValue() ==
-                                                Settings::MemoryLayout::Memory_4Gb
-                                            ? physical_min_bits
-                                            : physical_max_bits) -
-                                       Memory::YUZU_PAGEBITS);
+    const size_t total_phys = 1ULL << ((Settings::values.memory_layout_mode.GetValue() == Settings::MemoryLayout::Memory_4Gb ? physical_min_bits : physical_max_bits) - Memory::YUZU_PAGEBITS);
     for (size_t i = 0; i < total_phys; i++) {
         compressed_device_addr[i] = 0;
     }
@@ -228,11 +220,11 @@ void DeviceMemoryManager<Traits>::Map(DAddr address, VAddr virtual_address, size
         const VAddr new_vaddress = virtual_address + i * Memory::YUZU_PAGESIZE;
         auto* ptr = process_memory->GetPointerSilent(Common::ProcessAddress(new_vaddress));
         if (ptr == nullptr) [[unlikely]] {
-            compressed_physical_ptr[start_page_d + i] = 0;
+            tracked_entries[start_page_d + i].compressed_physical_ptr = 0;
             continue;
         }
         auto phys_addr = static_cast<u32>(GetRawPhysicalAddr(ptr) >> Memory::YUZU_PAGEBITS) + 1U;
-        compressed_physical_ptr[start_page_d + i] = phys_addr;
+        tracked_entries[start_page_d + i].compressed_physical_ptr = phys_addr;
         InsertCPUBacking(start_page_d + i, new_vaddress, asid);
         const u32 base_dev = compressed_device_addr[phys_addr - 1U];
         const u32 new_dev = static_cast<u32>(start_page_d + i);
@@ -260,9 +252,9 @@ void DeviceMemoryManager<Traits>::Unmap(DAddr address, size_t size) {
     device_inter->InvalidateRegion(address, size);
     std::scoped_lock lk(mapping_guard);
     for (size_t i = 0; i < num_pages; i++) {
-        auto phys_addr = compressed_physical_ptr[start_page_d + i];
-        compressed_physical_ptr[start_page_d + i] = 0;
-        cpu_backing_address[start_page_d + i] = 0;
+        auto phys_addr = tracked_entries[start_page_d + i].compressed_physical_ptr;
+        tracked_entries[start_page_d + i].compressed_physical_ptr = 0;
+        tracked_entries[start_page_d + i].cpu_backing_address = 0;
         if (phys_addr != 0) [[likely]] {
             const u32 base_dev = compressed_device_addr[phys_addr - 1U];
             if ((base_dev >> MULTI_FLAG_BITS) == 0) [[likely]] {
@@ -300,14 +292,14 @@ void DeviceMemoryManager<Traits>::TrackContinuityImpl(DAddr address, VAddr virtu
             page_count = 1;
         }
         last_ptr = new_ptr;
-        continuity_tracker[start_page_d + index] = static_cast<u32>(page_count);
+        tracked_entries[start_page_d + index].continuity_tracker = static_cast<u32>(page_count);
     }
 }
 template <typename Traits>
 u8* DeviceMemoryManager<Traits>::GetSpan(const DAddr src_addr, const std::size_t size) {
     size_t page_index = src_addr >> page_bits;
     size_t subbits = src_addr & page_mask;
-    if ((static_cast<size_t>(continuity_tracker[page_index]) << page_bits) >= size + subbits) {
+    if ((static_cast<size_t>(tracked_entries[page_index].continuity_tracker) << page_bits) >= size + subbits) {
         return GetPointer<u8>(src_addr);
     }
     return nullptr;
@@ -317,7 +309,7 @@ template <typename Traits>
 const u8* DeviceMemoryManager<Traits>::GetSpan(const DAddr src_addr, const std::size_t size) const {
     size_t page_index = src_addr >> page_bits;
     size_t subbits = src_addr & page_mask;
-    if ((static_cast<size_t>(continuity_tracker[page_index]) << page_bits) >= size + subbits) {
+    if ((static_cast<size_t>(tracked_entries[page_index].continuity_tracker) << page_bits) >= size + subbits) {
         return GetPointer<u8>(src_addr);
     }
     return nullptr;
@@ -342,12 +334,10 @@ template <typename T>
 T* DeviceMemoryManager<Traits>::GetPointer(DAddr address) {
     const size_t index = address >> Memory::YUZU_PAGEBITS;
     const size_t offset = address & Memory::YUZU_PAGEMASK;
-    auto phys_addr = compressed_physical_ptr[index];
-    if (phys_addr == 0) [[unlikely]] {
+    auto phys_addr = tracked_entries[index].compressed_physical_ptr;
+    if (phys_addr == 0) [[unlikely]]
         return nullptr;
-    }
-    return GetPointerFromRaw<T>((static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) +
-                                offset);
+    return GetPointerFromRaw<T>((PAddr(phys_addr - 1) << Memory::YUZU_PAGEBITS) + offset);
 }
 
 template <typename Traits>
@@ -355,12 +345,10 @@ template <typename T>
 const T* DeviceMemoryManager<Traits>::GetPointer(DAddr address) const {
     const size_t index = address >> Memory::YUZU_PAGEBITS;
     const size_t offset = address & Memory::YUZU_PAGEMASK;
-    auto phys_addr = compressed_physical_ptr[index];
-    if (phys_addr == 0) [[unlikely]] {
+    auto phys_addr = tracked_entries[index].compressed_physical_ptr;
+    if (phys_addr == 0)
         return nullptr;
-    }
-    return GetPointerFromRaw<T>((static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) +
-                                offset);
+    return GetPointerFromRaw<T>((PAddr(phys_addr - 1) << Memory::YUZU_PAGEBITS) + offset);
 }
 
 template <typename Traits>
@@ -386,18 +374,14 @@ T DeviceMemoryManager<Traits>::Read(DAddr address) const {
 }
 
 template <typename Traits>
-void DeviceMemoryManager<Traits>::WalkBlock(DAddr addr, std::size_t size, auto on_unmapped,
-                                            auto on_memory, auto increment) {
+void DeviceMemoryManager<Traits>::WalkBlock(DAddr addr, std::size_t size, auto on_unmapped, auto on_memory, auto increment) {
     std::size_t remaining_size = size;
     std::size_t page_index = addr >> Memory::YUZU_PAGEBITS;
     std::size_t page_offset = addr & Memory::YUZU_PAGEMASK;
-
     while (remaining_size) {
-        const size_t next_pages = static_cast<std::size_t>(continuity_tracker[page_index]);
-        const std::size_t copy_amount =
-            (std::min)((next_pages << Memory::YUZU_PAGEBITS) - page_offset, remaining_size);
-        const auto current_vaddr =
-            static_cast<u64>((page_index << Memory::YUZU_PAGEBITS) + page_offset);
+        const size_t next_pages = std::size_t(tracked_entries[page_index].continuity_tracker);
+        const std::size_t copy_amount = (std::min)((next_pages << Memory::YUZU_PAGEBITS) - page_offset, remaining_size);
+        const auto current_vaddr = u64((page_index << Memory::YUZU_PAGEBITS) + page_offset);
         SCOPE_EXIT{
             page_index += next_pages;
             page_offset = 0;
@@ -405,13 +389,12 @@ void DeviceMemoryManager<Traits>::WalkBlock(DAddr addr, std::size_t size, auto o
             remaining_size -= copy_amount;
         };
 
-        auto phys_addr = compressed_physical_ptr[page_index];
+        auto phys_addr = tracked_entries[page_index].compressed_physical_ptr;
         if (phys_addr == 0) {
             on_unmapped(copy_amount, current_vaddr);
             continue;
         }
-        auto* mem_ptr = GetPointerFromRaw<u8>(
-            (static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) + page_offset);
+        auto* mem_ptr = GetPointerFromRaw<u8>((PAddr(phys_addr - 1) << Memory::YUZU_PAGEBITS) + page_offset);
         on_memory(copy_amount, mem_ptr);
     }
 }
@@ -430,7 +413,7 @@ void DeviceMemoryManager<Traits>::ReadBlock(DAddr address, void* dest_pointer, s
         }
 
         const std::size_t page_index = address >> Memory::YUZU_PAGEBITS;
-        const auto phys_addr = compressed_physical_ptr[page_index];
+        const auto phys_addr = tracked_entries[page_index].compressed_physical_ptr;
         if (phys_addr != 0) {
             auto* const mem_ptr = GetPointerFromRaw<u8>((PAddr(phys_addr - 1) << Memory::YUZU_PAGEBITS));
             t_slot[cache_cursor % t_slot.size()] = TranslationEntry{.guest_page = guest_page, .host_ptr = mem_ptr};
@@ -488,7 +471,7 @@ void DeviceMemoryManager<Traits>::ReadBlockUnsafe(DAddr address, void* dest_poin
         }
 
         const std::size_t page_index = address >> Memory::YUZU_PAGEBITS;
-        const auto phys_addr = compressed_physical_ptr[page_index];
+        const auto phys_addr = tracked_entries[page_index].compressed_physical_ptr;
         if (phys_addr != 0) {
             auto* const mem_ptr = GetPointerFromRaw<u8>((PAddr(phys_addr - 1) << Memory::YUZU_PAGEBITS));
             t_slot[cache_cursor % t_slot.size()] = TranslationEntry{.guest_page = guest_page, .host_ptr = mem_ptr};

src/core/file_sys/patch_manager.cpp

@@ -123,6 +123,39 @@ bool IsVersionedExternalUpdateDisabled(const std::vector<std::string>& disabled,
     return std::find(disabled.cbegin(), disabled.cend(), disabled_key) != disabled.cend() ||
            std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
 }
+
+std::string GetUpdateVersionStringFromSlot(const ContentProvider* provider, u64 update_tid) {
+    if (provider == nullptr) {
+        return {};
+    }
+
+    auto control_nca = provider->GetEntry(update_tid, ContentRecordType::Control);
+    if (control_nca == nullptr ||
+        control_nca->GetStatus() != Loader::ResultStatus::Success) {
+        return {};
+    }
+
+    const auto romfs = control_nca->GetRomFS();
+    if (romfs == nullptr) {
+        return {};
+    }
+
+    const auto extracted = ExtractRomFS(romfs);
+    if (extracted == nullptr) {
+        return {};
+    }
+
+    auto nacp_file = extracted->GetFile("control.nacp");
+    if (nacp_file == nullptr) {
+        nacp_file = extracted->GetFile("Control.nacp");
+    }
+    if (nacp_file == nullptr) {
+        return {};
+    }
+
+    NACP nacp{nacp_file};
+    return nacp.GetVersionString();
+}
 } // Anonymous namespace
 
 PatchManager::PatchManager(u64 title_id_,
@@ -771,6 +804,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
             std::nullopt, std::nullopt, ContentRecordType::Program, update_tid);
 
         for (const auto& [slot, entry] : all_updates) {
+            (void)entry;
             if (slot == ContentProviderUnionSlot::External ||
                 slot == ContentProviderUnionSlot::FrontendManual) {
                 continue;
@@ -786,7 +820,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                     source_suffix = " (NAND)";
                     break;
                 case ContentProviderUnionSlot::SDMC:
-                    source_type = PatchSource::NAND;
+                    source_type = PatchSource::SDMC;
                     source_suffix = " (SDMC)";
                     break;
                 default:
@@ -795,19 +829,16 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
 
             std::string version_str;
             u32 numeric_ver = 0;
-            PatchManager update{update_tid, fs_controller, content_provider};
-            const auto metadata = update.GetControlMetadata();
-            const auto& nacp = metadata.first;
+            const auto* slot_provider = content_union->GetSlotProvider(slot);
+            version_str = GetUpdateVersionStringFromSlot(slot_provider, update_tid);
 
-            if (nacp != nullptr) {
-                version_str = nacp->GetVersionString();
-            }
-
-            const auto meta_ver = content_provider.GetEntryVersion(update_tid);
-            if (meta_ver.has_value()) {
-                numeric_ver = *meta_ver;
-                if (version_str.empty() && numeric_ver != 0) {
-                    version_str = FormatTitleVersion(numeric_ver);
+            if (slot_provider != nullptr) {
+                const auto slot_ver = slot_provider->GetEntryVersion(update_tid);
+                if (slot_ver.has_value()) {
+                    numeric_ver = *slot_ver;
+                    if (version_str.empty() && numeric_ver != 0) {
+                        version_str = FormatTitleVersion(numeric_ver);
+                    }
                 }
             }
 
@@ -956,37 +987,60 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
     }
 
     // DLC
-    const auto dlc_entries =
-        content_provider.ListEntriesFilter(TitleType::AOC, ContentRecordType::Data);
-
     std::vector<ContentProviderEntry> dlc_match;
-    dlc_match.reserve(dlc_entries.size());
-    std::copy_if(dlc_entries.begin(), dlc_entries.end(), std::back_inserter(dlc_match),
-                 [this](const ContentProviderEntry& entry) {
-                     const auto base_tid = GetBaseTitleID(entry.title_id);
-                     const bool matches_base = base_tid == title_id;
+    bool has_external_dlc = false;
+    bool has_nand_dlc = false;
+    bool has_sdmc_dlc = false;
+    bool has_other_dlc = false;
+    const auto dlc_entries_with_origin =
+        content_union->ListEntriesFilterOrigin(std::nullopt, TitleType::AOC, ContentRecordType::Data);
 
-                     if (!matches_base) {
-                         LOG_DEBUG(Loader, "DLC {:016X} base {:016X} doesn't match title {:016X}",
-                                   entry.title_id, base_tid, title_id);
-                         return false;
-                     }
+    dlc_match.reserve(dlc_entries_with_origin.size());
+    for (const auto& [slot, entry] : dlc_entries_with_origin) {
+        const auto base_tid = GetBaseTitleID(entry.title_id);
+        const bool matches_base = base_tid == title_id;
+        if (!matches_base) {
+            LOG_DEBUG(Loader, "DLC {:016X} base {:016X} doesn't match title {:016X}",
+                      entry.title_id, base_tid, title_id);
+            continue;
+        }
 
-                     auto nca = content_provider.GetEntry(entry);
-                     if (!nca) {
-                         LOG_DEBUG(Loader, "Failed to get NCA for DLC {:016X}", entry.title_id);
-                         return false;
-                     }
+        const auto* slot_provider = content_union->GetSlotProvider(slot);
+        if (slot_provider == nullptr) {
+            continue;
+        }
 
-                     const auto status = nca->GetStatus();
-                     if (status != Loader::ResultStatus::Success) {
-                         LOG_DEBUG(Loader, "DLC {:016X} NCA has status {}",
-                                     entry.title_id, static_cast<int>(status));
-                         return false;
-                     }
+        auto nca = slot_provider->GetEntry(entry);
+        if (!nca) {
+            LOG_DEBUG(Loader, "Failed to get NCA for DLC {:016X}", entry.title_id);
+            continue;
+        }
 
-                     return true;
-                 });
+        const auto status = nca->GetStatus();
+        if (status != Loader::ResultStatus::Success) {
+            LOG_DEBUG(Loader, "DLC {:016X} NCA has status {}", entry.title_id,
+                      static_cast<int>(status));
+            continue;
+        }
+
+        switch (slot) {
+            case ContentProviderUnionSlot::External:
+            case ContentProviderUnionSlot::FrontendManual:
+                has_external_dlc = true;
+                break;
+            case ContentProviderUnionSlot::UserNAND:
+            case ContentProviderUnionSlot::SysNAND:
+                has_nand_dlc = true;
+                break;
+            case ContentProviderUnionSlot::SDMC:
+                has_sdmc_dlc = true;
+                break;
+            default:
+                has_other_dlc = true;
+                break;
+        }
+        dlc_match.push_back(entry);
+    }
 
     if (!dlc_match.empty()) {
         // Ensure sorted so DLC IDs show in order.
@@ -1000,13 +1054,22 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
 
         const auto dlc_disabled =
             std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end();
+        PatchSource dlc_source = PatchSource::Unknown;
+        if (has_external_dlc && !has_nand_dlc && !has_sdmc_dlc && !has_other_dlc) {
+            dlc_source = PatchSource::External;
+        } else if (has_nand_dlc && !has_external_dlc && !has_sdmc_dlc && !has_other_dlc) {
+            dlc_source = PatchSource::NAND;
+        } else if (has_sdmc_dlc && !has_external_dlc && !has_nand_dlc && !has_other_dlc) {
+            dlc_source = PatchSource::SDMC;
+        }
+
         out.push_back({.enabled = !dlc_disabled,
                        .name = "DLC",
                        .version = std::move(list),
                        .type = PatchType::DLC,
                        .program_id = title_id,
                        .title_id = dlc_match.back().title_id,
-                       .source = PatchSource::Unknown});
+                       .source = dlc_source});
     }
 
     return out;

src/core/file_sys/patch_manager.h

@@ -34,6 +34,7 @@ enum class PatchType { Update, DLC, Mod };
 enum class PatchSource {
     Unknown,
     NAND,
+    SDMC,
     External,
     Packed,
 };

src/core/hle/service/am/applet_manager.cpp

@@ -268,7 +268,7 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
 
     if (Settings::values.enable_overlay && m_window_system->GetOverlayDisplayApplet() == nullptr) {
         if (auto overlay_process = CreateProcess(m_system, static_cast<u64>(AppletProgramId::OverlayDisplay), 0, 0)) {
-            auto overlay_applet = std::make_shared<Applet>(m_system, std::move(overlay_process), false);
+            auto overlay_applet = std::make_shared<Applet>(m_system, std::make_unique<Service::Process>(*std::move(overlay_process)), false);
             overlay_applet->program_id = static_cast<u64>(AppletProgramId::OverlayDisplay);
             overlay_applet->applet_id = AppletId::OverlayDisplay;
             overlay_applet->type = AppletType::OverlayApplet;

src/core/hle/service/am/button_poller.cpp

@@ -1,9 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <thread>
+#include "common/thread.h"
 #include "core/core.h"
 #include "core/hle/service/am/am_types.h"
 #include "core/hle/service/am/button_poller.h"
@@ -34,16 +36,15 @@ ButtonPressDuration ClassifyPressDuration(std::chrono::steady_clock::time_point
 
 } // namespace
 
-ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system)
-    : m_window_system(window_system) {
+ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system) {
     // TODO: am reads this from the home button state in hid, which is controller-agnostic.
     Core::HID::ControllerUpdateCallback engine_callback{
-        .on_change =
-            [this](Core::HID::ControllerTriggerType type) {
-                if (type == Core::HID::ControllerTriggerType::Button) {
-                    this->OnButtonStateChanged();
-                }
-            },
+        .on_change = [this, &window_system](Core::HID::ControllerTriggerType type) {
+            if (type == Core::HID::ControllerTriggerType::Button) {
+                std::unique_lock lk{m_mutex};
+                OnButtonStateChanged(window_system);
+            }
+        },
         .is_npad_service = true,
     };
 
@@ -52,25 +53,35 @@ ButtonPoller::ButtonPoller(Core::System& system, WindowSystem& window_system)
     m_player1 = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
     m_player1_key = m_player1->SetCallback(engine_callback);
 
-    m_thread = std::thread([this] { this->ThreadLoop(); });
+    m_thread = std::jthread([this, &window_system](std::stop_token stop_token) {
+        Common::SetCurrentThreadName("ButtonPoller");
+        while (!stop_token.stop_requested()) {
+            using namespace std::chrono_literals;
+            std::unique_lock lk{m_mutex};
+            m_cv.wait_for(lk, 50ms);
+            if (stop_token.stop_requested())
+                break;
+            OnButtonStateChanged(window_system);
+            std::this_thread::sleep_for(5ms);
+        }
+    });
 }
 
 ButtonPoller::~ButtonPoller() {
     m_handheld->DeleteCallback(m_handheld_key);
     m_player1->DeleteCallback(m_player1_key);
-    m_stop = true;
     m_cv.notify_all();
     if (m_thread.joinable()) {
+        m_thread.request_stop();
         m_thread.join();
     }
 }
 
-void ButtonPoller::OnButtonStateChanged() {
-    std::lock_guard lk{m_mutex};
-    const bool home_button =
-        m_handheld->GetHomeButtons().home.Value() || m_player1->GetHomeButtons().home.Value();
-    const bool capture_button = m_handheld->GetCaptureButtons().capture.Value() ||
-                                m_player1->GetCaptureButtons().capture.Value();
+void ButtonPoller::OnButtonStateChanged(WindowSystem& window_system) {
+    auto const home_button = m_handheld->GetHomeButtons().home.Value()
+        || m_player1->GetHomeButtons().home.Value();
+    auto const capture_button = m_handheld->GetCaptureButtons().capture.Value()
+        || m_player1->GetCaptureButtons().capture.Value();
 
     // Buttons pressed which were not previously pressed
     if (home_button && !m_home_button_press_start) {
@@ -90,7 +101,7 @@ void ButtonPoller::OnButtonStateChanged() {
     if (home_button && m_home_button_press_start && !m_home_button_long_sent) {
         const auto duration = ClassifyPressDuration(*m_home_button_press_start);
         if (duration != ButtonPressDuration::ShortPressing) {
-            m_window_system.OnSystemButtonPress(SystemButtonType::HomeButtonLongPressing);
+            window_system.OnSystemButtonPress(SystemButtonType::HomeButtonLongPressing);
             m_home_button_long_sent = true;
         }
      }
@@ -98,7 +109,7 @@ void ButtonPoller::OnButtonStateChanged() {
     if (capture_button && m_capture_button_press_start && !m_capture_button_long_sent) {
          const auto duration = ClassifyPressDuration(*m_capture_button_press_start);
          if (duration != ButtonPressDuration::ShortPressing) {
-             m_window_system.OnSystemButtonPress(SystemButtonType::CaptureButtonLongPressing);
+             window_system.OnSystemButtonPress(SystemButtonType::CaptureButtonLongPressing);
              m_capture_button_long_sent = true;
          }
      }
@@ -107,9 +118,8 @@ void ButtonPoller::OnButtonStateChanged() {
     if (!home_button && m_home_button_press_start) {
         if(!m_home_button_long_sent) {
             const auto duration = ClassifyPressDuration(*m_home_button_press_start);
-            m_window_system.OnSystemButtonPress(
-                duration == ButtonPressDuration::ShortPressing ? SystemButtonType::HomeButtonShortPressing
-                                                               : SystemButtonType::HomeButtonLongPressing);
+            window_system.OnSystemButtonPress(duration == ButtonPressDuration::ShortPressing
+                ? SystemButtonType::HomeButtonShortPressing : SystemButtonType::HomeButtonLongPressing);
         }
         m_home_button_press_start = std::nullopt;
         m_home_button_long_sent = false;
@@ -117,9 +127,8 @@ void ButtonPoller::OnButtonStateChanged() {
     if (!capture_button && m_capture_button_press_start) {
         if (!m_capture_button_long_sent) {
             const auto duration = ClassifyPressDuration(*m_capture_button_press_start);
-            m_window_system.OnSystemButtonPress(
-                duration == ButtonPressDuration::ShortPressing ? SystemButtonType::CaptureButtonShortPressing
-                                                               : SystemButtonType::CaptureButtonLongPressing);
+            window_system.OnSystemButtonPress(duration == ButtonPressDuration::ShortPressing
+                ? SystemButtonType::CaptureButtonShortPressing : SystemButtonType::CaptureButtonLongPressing);
         }
         m_capture_button_press_start = std::nullopt;
         m_capture_button_long_sent = false;
@@ -130,16 +139,4 @@ void ButtonPoller::OnButtonStateChanged() {
     // }
 }
 
-void ButtonPoller::ThreadLoop() {
-    using namespace std::chrono_literals;
-    std::unique_lock lk{m_mutex};
-    while (!m_stop) {
-        m_cv.wait_for(lk, 50ms);
-        if (m_stop) break;
-        lk.unlock();
-        OnButtonStateChanged();
-        lk.lock();
-    }
-}
-
 } // namespace Service::AM

src/core/hle/service/am/button_poller.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -30,31 +30,23 @@ class ButtonPoller {
 public:
     explicit ButtonPoller(Core::System& system, WindowSystem& window_system);
     ~ButtonPoller();
+    void OnButtonStateChanged(WindowSystem& window_system);
 
 private:
-    void OnButtonStateChanged();
-    void ThreadLoop();
-
-private:
-    WindowSystem& m_window_system;
-
-    Core::HID::EmulatedController* m_handheld{};
-    int m_handheld_key{};
-    Core::HID::EmulatedController* m_player1{};
-    int m_player1_key{};
-
+    std::mutex m_mutex;
+    std::condition_variable m_cv;
+    std::jthread m_thread;
     std::optional<std::chrono::steady_clock::time_point> m_home_button_press_start{};
     std::optional<std::chrono::steady_clock::time_point> m_capture_button_press_start{};
     std::optional<std::chrono::steady_clock::time_point> m_power_button_press_start{};
 
-    bool m_home_button_long_sent{};
-    bool m_capture_button_long_sent{};
-    bool m_power_button_long_sent{};
-
-    std::thread m_thread;
-    std::atomic<bool> m_stop{false};
-    std::condition_variable m_cv;
-    std::mutex m_mutex;
+    Core::HID::EmulatedController* m_handheld{};
+    Core::HID::EmulatedController* m_player1{};
+    int32_t m_handheld_key{};
+    int32_t m_player1_key{};
+    bool m_home_button_long_sent : 1 = false;
+    bool m_capture_button_long_sent : 1 = false;
+    bool m_power_button_long_sent : 1 = false;
 };
 
 } // namespace Service::AM

src/core/hle/service/am/event_observer.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -15,12 +18,24 @@ enum class UserDataTag : u32 {
 };
 
 EventObserver::EventObserver(Core::System& system, WindowSystem& window_system)
-    : m_system(system), m_context(system, "am:EventObserver"), m_window_system(window_system),
-      m_wakeup_event(m_context), m_wakeup_holder(m_wakeup_event.GetHandle()) {
+    : m_system(system), m_context(system, "am:EventObserver")
+    , m_window_system(window_system)
+    , m_wakeup_event(m_context)
+    , m_wakeup_holder(m_wakeup_event.GetHandle())
+{
     m_window_system.SetEventObserver(this);
     m_wakeup_holder.SetUserData(static_cast<uintptr_t>(UserDataTag::WakeupEvent));
     m_wakeup_holder.LinkToMultiWait(std::addressof(m_multi_wait));
-    m_thread = std::thread([&] { this->ThreadFunc(); });
+    m_thread = std::thread([this] {
+        Common::SetCurrentThreadName("am:EventObserver");
+        while (true) {
+            auto* signaled_holder = this->WaitSignaled();
+            if (!signaled_holder) {
+                break;
+            }
+            this->Process(signaled_holder);
+        }
+    });
 }
 
 EventObserver::~EventObserver() {
@@ -146,17 +161,4 @@ void EventObserver::DestroyAppletProcessHolderLocked(ProcessHolder* holder) {
     delete holder;
 }
 
-void EventObserver::ThreadFunc() {
-    Common::SetCurrentThreadName("am:EventObserver");
-
-    while (true) {
-        auto* signaled_holder = this->WaitSignaled();
-        if (!signaled_holder) {
-            break;
-        }
-
-        this->Process(signaled_holder);
-    }
-}
-
 } // namespace Service::AM

src/core/hle/service/am/event_observer.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -41,9 +44,6 @@ private:
 private:
     void DestroyAppletProcessHolderLocked(ProcessHolder* holder);
 
-private:
-    void ThreadFunc();
-
 private:
     // System reference and context.
     Core::System& m_system;

src/core/hle/service/am/process_creation.cpp

@@ -1,6 +1,10 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <optional>
 #include "core/core.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/nca_metadata.h"
@@ -16,7 +20,7 @@ namespace Service::AM {
 
 namespace {
 
-FileSys::StorageId GetStorageIdForFrontendSlot(
+[[nodiscard]] FileSys::StorageId GetStorageIdForFrontendSlot(
     std::optional<FileSys::ContentProviderUnionSlot> slot) {
     if (!slot.has_value()) {
         return FileSys::StorageId::None;
@@ -36,31 +40,23 @@ FileSys::StorageId GetStorageIdForFrontendSlot(
     }
 }
 
-std::unique_ptr<Process> CreateProcessImpl(std::unique_ptr<Loader::AppLoader>& out_loader,
-                                           Loader::ResultStatus& out_load_result,
-                                           Core::System& system, FileSys::VirtualFile file,
-                                           u64 program_id, u64 program_index) {
+[[nodiscard]] inline std::optional<Process> CreateProcessImpl(std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index) {
     // Get the appropriate loader to parse this NCA.
     out_loader = Loader::GetLoader(system, file, program_id, program_index);
-
     // Ensure we have a loader which can parse the NCA.
-    if (!out_loader) {
-        return nullptr;
+    if (out_loader) {
+        // Try to load the process.
+        auto process = std::make_optional<Process>(system);
+        if (process->Initialize(*out_loader, out_load_result)) {
+            return process;
+        }
     }
-
-    // Try to load the process.
-    auto process = std::make_unique<Process>(system);
-    if (process->Initialize(*out_loader, out_load_result)) {
-        return process;
-    }
-
-    return nullptr;
+    return std::nullopt;
 }
 
 } // Anonymous namespace
 
-std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
-                                       u8 minimum_key_generation, u8 maximum_key_generation) {
+std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation) {
     // Attempt to load program NCA.
     FileSys::VirtualFile nca_raw{};
 
@@ -70,7 +66,7 @@ std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
 
     // Ensure we retrieved a program NCA.
     if (!nca_raw) {
-        return nullptr;
+        return std::nullopt;
     }
 
     // Ensure we have a suitable version.
@@ -79,9 +75,8 @@ std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
         if (nca.GetStatus() == Loader::ResultStatus::Success &&
             (nca.GetKeyGeneration() < minimum_key_generation ||
              nca.GetKeyGeneration() > maximum_key_generation)) {
-            LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id,
-                        nca.GetKeyGeneration());
-            return nullptr;
+            LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id, nca.GetKeyGeneration());
+            return std::nullopt;
         }
     }
 
@@ -90,42 +85,32 @@ std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
     return CreateProcessImpl(loader, status, system, nca_raw, program_id, 0);
 }
 
-std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
-                                                  std::unique_ptr<Loader::AppLoader>& out_loader,
-                                                  Loader::ResultStatus& out_load_result,
-                                                  Core::System& system, FileSys::VirtualFile file,
-                                                  u64 program_id, u64 program_index) {
-    auto process =
-        CreateProcessImpl(out_loader, out_load_result, system, file, program_id, program_index);
-    if (!process) {
-        return nullptr;
+std::optional<Process> CreateApplicationProcess(std::vector<u8>& out_control, std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index) {
+    if (auto process = CreateProcessImpl(out_loader, out_load_result, system, file, program_id, program_index); process) {
+        FileSys::NACP nacp;
+        if (out_loader->ReadControlData(nacp) == Loader::ResultStatus::Success) {
+            out_control = nacp.GetRawBytes();
+        } else {
+            out_control.resize(sizeof(FileSys::RawNACP));
+            std::fill(out_control.begin(), out_control.end(), (u8) 0);
+        }
+
+        auto& storage = system.GetContentProviderUnion();
+        Service::Glue::ApplicationLaunchProperty launch{};
+        launch.title_id = process->GetProgramId();
+
+        FileSys::PatchManager pm{launch.title_id, system.GetFileSystemController(), storage};
+        launch.version = pm.GetGameVersion().value_or(0);
+
+        // TODO(DarkLordZach): When FSController/Game Card Support is added, if
+        // current_process_game_card use correct StorageId
+        launch.base_game_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(launch.title_id, FileSys::ContentRecordType::Program));
+        launch.update_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(FileSys::GetUpdateTitleID(launch.title_id), FileSys::ContentRecordType::Program));
+
+        system.GetARPManager().Register(launch.title_id, launch, out_control);
+        return process;
     }
-
-    FileSys::NACP nacp;
-    if (out_loader->ReadControlData(nacp) == Loader::ResultStatus::Success) {
-        out_control = nacp.GetRawBytes();
-    } else {
-        out_control.resize(sizeof(FileSys::RawNACP));
-        std::fill(out_control.begin(), out_control.end(), (u8) 0);
-    }
-
-    auto& storage = system.GetContentProviderUnion();
-    Service::Glue::ApplicationLaunchProperty launch{};
-    launch.title_id = process->GetProgramId();
-
-    FileSys::PatchManager pm{launch.title_id, system.GetFileSystemController(), storage};
-    launch.version = pm.GetGameVersion().value_or(0);
-
-    // TODO(DarkLordZach): When FSController/Game Card Support is added, if
-    // current_process_game_card use correct StorageId
-    launch.base_game_storage_id = GetStorageIdForFrontendSlot(
-        storage.GetSlotForEntry(launch.title_id, FileSys::ContentRecordType::Program));
-    launch.update_storage_id = GetStorageIdForFrontendSlot(storage.GetSlotForEntry(
-        FileSys::GetUpdateTitleID(launch.title_id), FileSys::ContentRecordType::Program));
-
-    system.GetARPManager().Register(launch.title_id, launch, out_control);
-
-    return process;
+    return std::nullopt;
 }
 
 } // namespace Service::AM

src/core/hle/service/am/process_creation.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -24,12 +27,7 @@ class Process;
 
 namespace Service::AM {
 
-std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
-                                       u8 minimum_key_generation, u8 maximum_key_generation);
-std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
-                                                  std::unique_ptr<Loader::AppLoader>& out_loader,
-                                                  Loader::ResultStatus& out_load_result,
-                                                  Core::System& system, FileSys::VirtualFile file,
-                                                  u64 program_id, u64 program_index);
+std::optional<Process> CreateProcess(Core::System& system, u64 program_id, u8 minimum_key_generation, u8 maximum_key_generation);
+std::optional<Process> CreateApplicationProcess(std::vector<u8>& out_control, std::unique_ptr<Loader::AppLoader>& out_loader, Loader::ResultStatus& out_load_result, Core::System& system, FileSys::VirtualFile file, u64 program_id, u64 program_index);
 
 } // namespace Service::AM

src/core/hle/service/am/service/application_creator.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -21,8 +21,7 @@ namespace Service::AM {
 
 namespace {
 
-Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_application_accessor,
-                              Core::System& system, WindowSystem& window_system, u64 program_id) {
+Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_application_accessor, Core::System& system, WindowSystem& window_system, u64 program_id) {
     FileSys::VirtualFile nca_raw{};
 
     // Get the program NCA from storage.
@@ -35,11 +34,10 @@ Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_applicati
     std::vector<u8> control;
     std::unique_ptr<Loader::AppLoader> loader;
     Loader::ResultStatus result;
-    auto process =
-        CreateApplicationProcess(control, loader, result, system, nca_raw, program_id, 0);
-    R_UNLESS(process != nullptr, ResultUnknown);
+    auto process = CreateApplicationProcess(control, loader, result, system, nca_raw, program_id, 0);
+    R_UNLESS(process != std::nullopt, ResultUnknown);
 
-    const auto applet = std::make_shared<Applet>(system, std::move(process), true);
+    const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), true);
     applet->program_id = program_id;
     applet->applet_id = AppletId::Application;
     applet->type = AppletType::Application;
@@ -47,8 +45,7 @@ Result CreateGuestApplication(SharedPointer<IApplicationAccessor>* out_applicati
 
     window_system.TrackApplet(applet, true);
 
-    *out_application_accessor =
-        std::make_shared<IApplicationAccessor>(system, applet, window_system);
+    *out_application_accessor = std::make_shared<IApplicationAccessor>(system, applet, window_system);
     R_SUCCEED();
 }
 
@@ -90,12 +87,10 @@ Result IApplicationCreator::CreateSystemApplication(
 
     std::vector<u8> control;
     std::unique_ptr<Loader::AppLoader> loader;
+    auto process = CreateProcess(system, application_id, 1, 21);
+    R_UNLESS(process != std::nullopt, ResultUnknown);
 
-    auto process =
-        CreateProcess(system, application_id, 1, 21);
-    R_UNLESS(process != nullptr, ResultUnknown);
-
-    const auto applet = std::make_shared<Applet>(system, std::move(process), true);
+    const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), true);
     applet->program_id = application_id;
     applet->applet_id = AppletId::Starter;
     applet->type = AppletType::LibraryApplet;
@@ -103,8 +98,7 @@ Result IApplicationCreator::CreateSystemApplication(
 
     m_window_system.TrackApplet(applet, true);
 
-    *out_application_accessor =
-        std::make_shared<IApplicationAccessor>(system, applet, m_window_system);
+    *out_application_accessor = std::make_shared<IApplicationAccessor>(system, applet, m_window_system);
     Core::LaunchTimestampCache::SaveLaunchTimestamp(application_id);
     R_SUCCEED();
 }

src/core/hle/service/am/service/library_applet_creator.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -121,26 +121,23 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
     };
 
     auto process = CreateProcess(system, program_id, Firmware1400, Firmware2100);
-    if (!process) {
-        // Couldn't initialize the guest process
-        return {};
+    if (process) {
+        const auto applet = std::make_shared<Applet>(system, std::make_unique<Service::Process>(*std::move(process)), false);
+        applet->program_id = program_id;
+        applet->applet_id = applet_id;
+        applet->type = AppletType::LibraryApplet;
+        applet->library_applet_mode = mode;
+        applet->window_visible = mode != LibraryAppletMode::AllForegroundInitiallyHidden;
+
+        auto broker = std::make_shared<AppletDataBroker>(system);
+        applet->caller_applet = caller_applet;
+        applet->caller_applet_broker = broker;
+        caller_applet->child_applets.push_back(applet);
+        window_system.TrackApplet(applet, false);
+        return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
     }
-
-    const auto applet = std::make_shared<Applet>(system, std::move(process), false);
-    applet->program_id = program_id;
-    applet->applet_id = applet_id;
-    applet->type = AppletType::LibraryApplet;
-    applet->library_applet_mode = mode;
-    applet->window_visible = mode != LibraryAppletMode::AllForegroundInitiallyHidden;
-
-    auto broker = std::make_shared<AppletDataBroker>(system);
-    applet->caller_applet = caller_applet;
-    applet->caller_applet_broker = broker;
-    caller_applet->child_applets.push_back(applet);
-
-    window_system.TrackApplet(applet, false);
-
-    return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
+    // Couldn't initialize the guest process
+    return {};
 }
 
 std::shared_ptr<ILibraryAppletAccessor> CreateFrontendApplet(Core::System& system,

src/core/hle/service/audio/audio_out_manager.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -14,7 +14,9 @@ namespace Service::Audio {
 using namespace AudioCore::AudioOut;
 
 IAudioOutManager::IAudioOutManager(Core::System& system_)
-    : ServiceFramework{system_, "audout:u"}, impl{std::make_unique<Manager>(system_)} {
+    : ServiceFramework{system_, "audout:u"}
+    , impl(system_)
+{
     // clang-format off
     static const FunctionInfo functions[] = {
         {0, D<&IAudioOutManager::ListAudioOuts>, "ListAudioOuts"},

src/core/hle/service/audio/audio_out_manager.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -43,7 +43,7 @@ private:
         AudioCore::AudioOut::AudioOutParameter parameter,
         InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid);
 
-    std::unique_ptr<AudioCore::AudioOut::Manager> impl;
+    std::optional<AudioCore::AudioOut::Manager> impl;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audio_renderer_manager.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -15,7 +18,9 @@ namespace Service::Audio {
 using namespace AudioCore::Renderer;
 
 IAudioRendererManager::IAudioRendererManager(Core::System& system_)
-    : ServiceFramework{system_, "audren:u"}, impl{std::make_unique<Manager>(system_)} {
+    : ServiceFramework{system_, "audren:u"}
+    , impl(system_)
+{
     // clang-format off
     static const FunctionInfo functions[] = {
         {0, D<&IAudioRendererManager::OpenAudioRenderer>, "OpenAudioRenderer"},

src/core/hle/service/audio/audio_renderer_manager.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -30,7 +33,7 @@ private:
     Result GetAudioDeviceServiceWithRevisionInfo(Out<SharedPointer<IAudioDevice>> out_audio_device,
                                                  u32 revision, ClientAppletResourceUserId aruid);
 
-    std::unique_ptr<AudioCore::Renderer::Manager> impl;
+    std::optional<AudioCore::Renderer::Manager> impl;
     u32 num_audio_devices{0};
 };
 

src/core/hle/service/glue/time/time_zone.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -104,7 +107,8 @@ Result TimeZoneService::LoadLocationNameList(
     OutArray<Service::PSC::Time::LocationName, BufferAttr_HipcMapAlias> out_names, u32 index) {
     SCOPE_EXIT {
         LOG_DEBUG(Service_Time, "called. index={} out_count={} out_names[0]={} out_names[1]={}",
-                  index, *out_count, out_names[0], out_names[1]);
+                  index, *out_count, out_names.size() > 0 ? out_names[0] : Service::PSC::Time::LocationName{},
+                  out_names.size() > 1 ? out_names[1] : Service::PSC::Time::LocationName{});
     };
 
     std::scoped_lock l{m_mutex};
@@ -208,7 +212,8 @@ Result TimeZoneService::ToPosixTime(Out<u32> out_count,
     SCOPE_EXIT {
         LOG_DEBUG(Service_Time,
                   "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={}",
-                  calendar_time, *out_count, out_times[0], out_times[1]);
+                  calendar_time, *out_count, out_times.size() > 0 ? out_times[0] : s64{0},
+                  out_times.size() > 1 ? out_times[1] : s64{0});
     };
 
     R_RETURN(m_wrapped_service->ToPosixTime(out_count, out_times, calendar_time, rule));
@@ -220,7 +225,8 @@ Result TimeZoneService::ToPosixTimeWithMyRule(
     SCOPE_EXIT {
         LOG_DEBUG(Service_Time,
                   "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={}",
-                  calendar_time, *out_count, out_times[0], out_times[1]);
+                  calendar_time, *out_count, out_times.size() > 0 ? out_times[0] : s64{0},
+                  out_times.size() > 1 ? out_times[1] : s64{0});
     };
 
     R_RETURN(m_wrapped_service->ToPosixTimeWithMyRule(out_count, out_times, calendar_time));

src/core/hle/service/os/process.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -10,14 +13,6 @@
 
 namespace Service {
 
-Process::Process(Core::System& system)
-    : m_system(system), m_process(), m_main_thread_priority(), m_main_thread_stack_size(),
-      m_process_started() {}
-
-Process::~Process() {
-    this->Finalize();
-}
-
 bool Process::Initialize(Loader::AppLoader& loader, Loader::ResultStatus& out_load_result) {
     // First, ensure we are not holding another process.
     this->Finalize();

src/core/hle/service/os/process.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -22,8 +25,8 @@ namespace Service {
 
 class Process {
 public:
-    explicit Process(Core::System& system);
-    ~Process();
+    inline explicit Process(Core::System& system) noexcept : m_system(system) {}
+    inline ~Process() { this->Finalize(); }
 
     bool Initialize(Loader::AppLoader& loader, Loader::ResultStatus& out_load_result);
     void Finalize();
@@ -50,8 +53,8 @@ public:
 private:
     Core::System& m_system;
     Kernel::KProcess* m_process{};
-    s32 m_main_thread_priority{};
     u64 m_main_thread_stack_size{};
+    s32 m_main_thread_priority{};
     bool m_process_started{};
 };
 

src/core/hle/service/psc/time/time_zone_service.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -148,7 +151,8 @@ Result TimeZoneService::ToPosixTime(Out<u32> out_count,
     SCOPE_EXIT {
         LOG_DEBUG(Service_Time,
                   "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={} ",
-                  calendar_time, *out_count, out_times[0], out_times[1]);
+                  calendar_time, *out_count, out_times.size() > 0 ? out_times[0] : s64{0},
+                  out_times.size() > 1 ? out_times[1] : s64{0});
     };
 
     R_RETURN(
@@ -161,7 +165,8 @@ Result TimeZoneService::ToPosixTimeWithMyRule(Out<u32> out_count,
     SCOPE_EXIT {
         LOG_DEBUG(Service_Time,
                   "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={} ",
-                  calendar_time, *out_count, out_times[0], out_times[1]);
+                  calendar_time, *out_count, out_times.size() > 0 ? out_times[0] : s64{0},
+                  out_times.size() > 1 ? out_times[1] : s64{0});
     };
 
     R_RETURN(

src/core/hle/service/service.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -29,10 +29,13 @@ namespace Service {
     return function_string;
 }
 
-ServiceFrameworkBase::ServiceFrameworkBase(Core::System& system_, const char* service_name_,
-                                           u32 max_sessions_, InvokerFn* handler_invoker_)
-    : SessionRequestHandler(system_.Kernel(), service_name_), system{system_},
-      service_name{service_name_}, handler_invoker{handler_invoker_}, max_sessions{max_sessions_} {}
+ServiceFrameworkBase::ServiceFrameworkBase(Core::System& system_, const char* service_name_, u32 max_sessions_, InvokerFn* handler_invoker_)
+    : SessionRequestHandler(system_.Kernel(), service_name_)
+    , system{system_}
+    , service_name{service_name_}
+    , handler_invoker{handler_invoker_}
+    , max_sessions{max_sessions_}
+{}
 
 ServiceFrameworkBase::~ServiceFrameworkBase() {
     // Wait for other threads to release access before destroying
@@ -50,8 +53,7 @@ void ServiceFrameworkBase::RegisterHandlersBaseTipc(const FunctionInfoBase* func
     // Usually this array is sorted by id already, so hint to insert at the end
     handlers_tipc.reserve(handlers_tipc.size() + n);
     for (std::size_t i = 0; i < n; ++i)
-        handlers_tipc.emplace_hint(handlers_tipc.cend(), functions[i].expected_header,
-                                   functions[i]);
+        handlers_tipc.emplace_hint(handlers_tipc.cend(), functions[i].expected_header, functions[i]);
 }
 
 void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx,

src/core/hle/service/service.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -8,8 +8,7 @@
 
 #include <cstddef>
 #include <mutex>
-#include <string>
-#include <boost/container/flat_map.hpp>
+#include <ankerl/unordered_dense.h>
 #include "common/common_types.h"
 #include "core/hle/service/hle_ipc.h"
 
@@ -78,13 +77,6 @@ protected:
     [[nodiscard]] virtual std::unique_lock<std::mutex> LockService() noexcept {
         return std::unique_lock{lock_service};
     }
-
-    /// System context that the service operates under.
-    Core::System& system;
-
-    /// Identifier string used to connect to the service.
-    std::string service_name;
-
 private:
     template <typename T>
     friend class ServiceFramework;
@@ -106,16 +98,19 @@ private:
     void RegisterHandlersBaseTipc(const FunctionInfoBase* functions, std::size_t n);
     void ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info);
 
-    boost::container::flat_map<u32, FunctionInfoBase> handlers;
-    boost::container::flat_map<u32, FunctionInfoBase> handlers_tipc;
+protected:
+    ankerl::unordered_dense::map<u32, FunctionInfoBase> handlers;
+    ankerl::unordered_dense::map<u32, FunctionInfoBase> handlers_tipc;
     /// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.
     std::mutex lock_service;
+    /// System context that the service operates under.
+    Core::System& system;
+    /// Identifier string used to connect to the service.
+    const char* service_name;
     /// Function used to safely up-cast pointers to the derived class before invoking a handler.
     InvokerFn* handler_invoker;
-
     /// Maximum number of concurrent sessions that this service can handle.
     u32 max_sessions;
-
     /// Flag to store if a port was already create/installed to detect multiple install attempts,
     /// which is not supported.
     bool service_registered = false;
@@ -159,8 +154,7 @@ protected:
      * @param max_sessions_ Maximum number of sessions that can be connected to this service at the
      * same time.
      */
-    explicit ServiceFramework(Core::System& system_, const char* service_name_,
-                              u32 max_sessions_ = ServerSessionCountMax)
+    explicit ServiceFramework(Core::System& system_, const char* service_name_, u32 max_sessions_ = ServerSessionCountMax)
         : ServiceFrameworkBase(system_, service_name_, max_sessions_, Invoker) {}
 
     /// Registers handlers in the service.
@@ -219,7 +213,7 @@ private:
     static void Invoker(ServiceFrameworkBase* object, HandlerFnP<ServiceFrameworkBase> member,
                         HLERequestContext& ctx) {
         // Cast back up to our original types and call the member function
-        (static_cast<Self*>(object)->*static_cast<HandlerFnP<Self>>(member))(ctx);
+        (static_cast<Self*>(object)->*HandlerFnP<Self>(member))(ctx);
     }
 };
 

src/dynarmic/LICENSE.txt

@@ -1,12 +0,0 @@
-Copyright (C) 2017 merryhime <git@mary.rs>
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp

@@ -687,7 +687,7 @@ void A32EmitX64::EmitA32BXWritePC(A32EmitContext& ctx, IR::Inst* inst) {
     auto args = ctx.reg_alloc.GetArgumentInfo(inst);
     auto& arg = args[0];
 
-    const u32 upper_without_t = (ctx.EndLocation().SetSingleStepping(false).UniqueHash() >> 32) & 0xFFFFFFFE;
+    const u64 upper_without_t = (ctx.EndLocation().SetSingleStepping(false).UniqueHash() >> 32) & 0xFFFFFFFE;
 
     // Pseudocode:
     // if (new_pc & 1) {

src/dynarmic/src/dynarmic/backend/x64/emit_x64_data_processing.cpp

@@ -947,7 +947,7 @@ static void EmitAdd(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst, size_t
     const Xbyak::Reg8 overflow = overflow_inst ? ctx.reg_alloc.ScratchGpr(code).cvt8() : Xbyak::Reg8{-1};
 
     if (args[1].IsImmediate() && args[1].GetType() == IR::Type::U32) {
-        const u32 op_arg = args[1].GetImmediateU32();
+        const u64 op_arg = args[1].GetImmediateU64();
         if (carry_in.IsImmediate()) {
             if (carry_in.GetImmediateU1()) {
                 // In range for a valid LEA materialisation

src/dynarmic/src/dynarmic/backend/x64/emit_x64_saturation.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -135,7 +135,7 @@ void EmitX64::EmitSignedSaturation(EmitContext& ctx, IR::Inst* inst) {
 
     const u32 mask = (1u << N) - 1;
     const u32 positive_saturated_value = (1u << (N - 1)) - 1;
-    const u32 negative_saturated_value = 1u << (N - 1);
+    const u64 negative_saturated_value = 1u << (N - 1);
 
     const Xbyak::Reg32 result = ctx.reg_alloc.ScratchGpr(code).cvt32();
     const Xbyak::Reg32 reg_a = ctx.reg_alloc.UseGpr(code, args[0]).cvt32();

src/input_common/drivers/udp_client.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2018 Citra Emulator Project
@@ -12,6 +12,7 @@
 #include "common/logging/log.h"
 #include "common/param_package.h"
 #include "common/settings.h"
+#include "common/thread.h"
 #include "input_common/drivers/udp_client.h"
 #include "input_common/helpers/udp_protocol.h"
 
@@ -135,6 +136,7 @@ private:
 };
 
 static void SocketLoop(Socket* socket) {
+    Common::SetCurrentThreadName("cemuhookWorker");
     socket->StartReceive();
     socket->StartSend(Socket::clock::now());
     socket->Loop();
@@ -330,9 +332,11 @@ void UDPClient::OnPadData(Response::PadData data, std::size_t client) {
 }
 
 void UDPClient::StartCommunication(std::size_t client, const std::string& host, u16 port) {
-    SocketCallback callback{[this](Response::Version version) { OnVersion(version); },
-                            [this](Response::PortInfo info) { OnPortInfo(info); },
-                            [this, client](Response::PadData data) { OnPadData(data, client); }};
+    SocketCallback callback{
+        [this](Response::Version version) { OnVersion(version); },
+        [this](Response::PortInfo info) { OnPortInfo(info); },
+        [this, client](Response::PadData data) { OnPadData(data, client); }
+    };
     LOG_INFO(Input, "Starting communication with UDP input server on {}:{}", host, port);
     clients[client].uuid = GetHostUUID(host);
     clients[client].host = host;
@@ -570,9 +574,7 @@ bool UDPClient::IsStickInverted(const Common::ParamPackage& params) {
     return true;
 }
 
-void TestCommunication(const std::string& host, u16 port,
-                       const std::function<void()>& success_callback,
-                       const std::function<void()>& failure_callback) {
+void TestCommunication(const std::string& host, u16 port, const std::function<void()>& success_callback, const std::function<void()>& failure_callback) {
     std::thread([=] {
         Common::Event success_event;
         SocketCallback callback{
@@ -605,40 +607,38 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
         u16 max_y{};
 
         Status current_status{Status::Initialized};
-        SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {},
-                                [&](Response::PadData data) {
-                                    constexpr u16 CALIBRATION_THRESHOLD = 100;
+        SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, [&](Response::PadData data) {
+            constexpr u16 CALIBRATION_THRESHOLD = 100;
 
-                                    if (current_status == Status::Initialized) {
-                                        // Receiving data means the communication is ready now
-                                        current_status = Status::Ready;
-                                        status_callback(current_status);
-                                    }
-                                    if (data.touch[0].is_active == 0) {
-                                        return;
-                                    }
-                                    LOG_DEBUG(Input, "Current touch: {} {}", data.touch[0].x,
-                                              data.touch[0].y);
-                                    min_x = (std::min)(min_x, static_cast<u16>(data.touch[0].x));
-                                    min_y = (std::min)(min_y, static_cast<u16>(data.touch[0].y));
-                                    if (current_status == Status::Ready) {
-                                        // First touch - min data (min_x/min_y)
-                                        current_status = Status::Stage1Completed;
-                                        status_callback(current_status);
-                                    }
-                                    if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD &&
-                                        data.touch[0].y - min_y > CALIBRATION_THRESHOLD) {
-                                        // Set the current position as max value and finishes
-                                        // configuration
-                                        max_x = data.touch[0].x;
-                                        max_y = data.touch[0].y;
-                                        current_status = Status::Completed;
-                                        data_callback(min_x, min_y, max_x, max_y);
-                                        status_callback(current_status);
+            if (current_status == Status::Initialized) {
+                // Receiving data means the communication is ready now
+                current_status = Status::Ready;
+                status_callback(current_status);
+            }
+            if (data.touch[0].is_active == 0) {
+                return;
+            }
+            LOG_DEBUG(Input, "Current touch: {} {}", data.touch[0].x, data.touch[0].y);
+            min_x = (std::min)(min_x, u16(data.touch[0].x));
+            min_y = (std::min)(min_y, u16(data.touch[0].y));
+            if (current_status == Status::Ready) {
+                // First touch - min data (min_x/min_y)
+                current_status = Status::Stage1Completed;
+                status_callback(current_status);
+            }
+            if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD &&
+                data.touch[0].y - min_y > CALIBRATION_THRESHOLD) {
+                // Set the current position as max value and finishes
+                // configuration
+                max_x = data.touch[0].x;
+                max_y = data.touch[0].y;
+                current_status = Status::Completed;
+                data_callback(min_x, min_y, max_x, max_y);
+                status_callback(current_status);
 
-                                        complete_event.Set();
-                                    }
-                                }};
+                complete_event.Set();
+            }
+        }};
         Socket socket{host, port, std::move(callback)};
         std::thread worker_thread{SocketLoop, &socket};
         complete_event.Wait();

src/qt_common/CMakeLists.txt

@@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+set(CMAKE_AUTOMOC ON)
+
 add_library(qt_common STATIC
     qt_common.h
     qt_common.cpp
@@ -26,7 +28,7 @@ add_library(qt_common STATIC
     util/mod.h util/mod.cpp
 
     abstract/frontend.h abstract/frontend.cpp
-    abstract/qt_progress_dialog.h abstract/qt_progress_dialog.cpp
+    abstract/progress.h abstract/progress.cpp
 
     qt_string_lookup.h
     qt_compat.h
@@ -82,7 +84,7 @@ target_link_libraries(qt_common PRIVATE core Qt6::Core Qt6::Concurrent SimpleIni
 target_link_libraries(qt_common PUBLIC frozen::frozen-headers)
 target_link_libraries(qt_common PRIVATE gamemode::headers frontend_common)
 
-if (NOT APPLE AND ENABLE_OPENGL)
+if (ENABLE_OPENGL)
     target_compile_definitions(qt_common PUBLIC HAS_OPENGL)
 endif()
 
@@ -93,3 +95,5 @@ if (UNIX AND NOT APPLE)
         target_link_libraries(qt_common PRIVATE Qt6::GuiPrivate)
     endif()
 endif()
+
+create_target_directory_groups(qt_common)

src/qt_common/abstract/frontend.cpp

@@ -1,75 +1,27 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include <QLineEdit>
 #include "frontend.h"
-#include "qt_common/qt_common.h"
-
-#ifdef YUZU_QT_WIDGETS
-#include <QFileDialog>
-#endif
-
-#include <QAbstractButton>
-#include <QInputDialog>
 
 namespace QtCommon::Frontend {
 
-StandardButton ShowMessage(Icon icon, const QString& title, const QString& text,
-                           StandardButtons buttons, QObject* parent) {
-#ifdef YUZU_QT_WIDGETS
-    QMessageBox* box = new QMessageBox(icon, title, text, buttons, (QWidget*)parent);
-    return static_cast<QMessageBox::StandardButton>(box->exec());
-#endif
-    // TODO(crueter): If Qt Widgets is disabled...
-    // need a way to reference icon/buttons too
-}
-
 const QString GetOpenFileName(const QString& title, const QString& dir, const QString& filter,
-                              QString* selectedFilter, Options options) {
-#ifdef YUZU_QT_WIDGETS
-    return QFileDialog::getOpenFileName(rootObject, title, dir, filter, selectedFilter, options);
-#endif
+                              QString* selectedFilter) {
+    return QFileDialog::getOpenFileName(rootObject, title, dir, filter, selectedFilter);
 }
 
 const QStringList GetOpenFileNames(const QString& title, const QString& dir, const QString& filter,
-                                   QString* selectedFilter, Options options) {
-#ifdef YUZU_QT_WIDGETS
-    return QFileDialog::getOpenFileNames(rootObject, title, dir, filter, selectedFilter, options);
-#endif
+                                   QString* selectedFilter) {
+    return QFileDialog::getOpenFileNames(rootObject, title, dir, filter, selectedFilter);
 }
 
 const QString GetSaveFileName(const QString& title, const QString& dir, const QString& filter,
-                              QString* selectedFilter, Options options) {
-#ifdef YUZU_QT_WIDGETS
-    return QFileDialog::getSaveFileName(rootObject, title, dir, filter, selectedFilter, options);
-#endif
+                              QString* selectedFilter) {
+    return QFileDialog::getSaveFileName(rootObject, title, dir, filter, selectedFilter);
 }
 
-const QString GetExistingDirectory(const QString& caption, const QString& dir, Options options) {
-#ifdef YUZU_QT_WIDGETS
-    return QFileDialog::getExistingDirectory(rootObject, caption, dir, options);
-#endif
-}
-
-int Choice(const QString& title, const QString& caption, const QStringList& options) {
-    QMessageBox box(rootObject);
-    box.setText(caption);
-    box.setWindowTitle(title);
-
-    for (const QString& opt : options) {
-        box.addButton(opt, QMessageBox::AcceptRole);
-    }
-
-    box.addButton(QMessageBox::Cancel);
-
-    box.exec();
-    auto button = box.clickedButton();
-    return options.indexOf(button->text());
-}
-
-const QString GetTextInput(const QString& title, const QString& caption,
-                           const QString& defaultText) {
-    return QInputDialog::getText(rootObject, title, caption, QLineEdit::Normal, defaultText);
+const QString GetExistingDirectory(const QString& caption, const QString& dir) {
+    return QFileDialog::getExistingDirectory(rootObject, caption, dir);
 }
 
 } // namespace QtCommon::Frontend

src/qt_common/abstract/frontend.h

@@ -7,11 +7,7 @@
 #include <QGuiApplication>
 #include "qt_common/qt_common.h"
 
-#ifdef YUZU_QT_WIDGETS
 #include <QFileDialog>
-#include <QWidget>
-#include <QMessageBox>
-#endif
 
 /**
  * manages common functionality e.g. message boxes and such for Qt/QML
@@ -20,60 +16,39 @@ namespace QtCommon::Frontend {
 
 Q_NAMESPACE
 
-#ifdef YUZU_QT_WIDGETS
-using Options = QFileDialog::Options;
-using Option = QFileDialog::Option;
-
-using StandardButton = QMessageBox::StandardButton;
-using StandardButtons = QMessageBox::StandardButtons;
-
-using Icon = QMessageBox::Icon;
-#else
-enum Option {
-    ShowDirsOnly = 0x00000001,
-    DontResolveSymlinks = 0x00000002,
-    DontConfirmOverwrite = 0x00000004,
-    DontUseNativeDialog = 0x00000008,
-    ReadOnly = 0x00000010,
-    HideNameFilterDetails = 0x00000020,
-    DontUseCustomDirectoryIcons = 0x00000040
-};
-Q_ENUM_NS(Option)
-Q_DECLARE_FLAGS(Options, Option)
-Q_FLAG_NS(Options)
-
 enum StandardButton {
-    // keep this in sync with QDialogButtonBox::StandardButton and QPlatformDialogHelper::StandardButton
-    NoButton           = 0x00000000,
-    Ok                 = 0x00000400,
-    Save               = 0x00000800,
-    SaveAll            = 0x00001000,
-    Open               = 0x00002000,
-    Yes                = 0x00004000,
-    YesToAll           = 0x00008000,
-    No                 = 0x00010000,
-    NoToAll            = 0x00020000,
-    Abort              = 0x00040000,
-    Retry              = 0x00080000,
-    Ignore             = 0x00100000,
-    Close              = 0x00200000,
-    Cancel             = 0x00400000,
-    Discard            = 0x00800000,
-    Help               = 0x01000000,
-    Apply              = 0x02000000,
-    Reset              = 0x04000000,
-    RestoreDefaults    = 0x08000000,
+    // keep this in sync with QDialogButtonBox::StandardButton and
+    // QPlatformDialogHelper::StandardButton
+    NoButton = 0x00000000,
+    Ok = 0x00000400,
+    Save = 0x00000800,
+    SaveAll = 0x00001000,
+    Open = 0x00002000,
+    Yes = 0x00004000,
+    YesToAll = 0x00008000,
+    No = 0x00010000,
+    NoToAll = 0x00020000,
+    Abort = 0x00040000,
+    Retry = 0x00080000,
+    Ignore = 0x00100000,
+    Close = 0x00200000,
+    Cancel = 0x00400000,
+    Discard = 0x00800000,
+    Help = 0x01000000,
+    Apply = 0x02000000,
+    Reset = 0x04000000,
+    RestoreDefaults = 0x08000000,
 
-    FirstButton        = Ok,                // internal
-    LastButton         = RestoreDefaults,   // internal
+    FirstButton = Ok,             // internal
+    LastButton = RestoreDefaults, // internal
 
-    YesAll             = YesToAll,          // obsolete
-    NoAll              = NoToAll,           // obsolete
+    YesAll = YesToAll, // obsolete
+    NoAll = NoToAll,   // obsolete
 
-    Default            = 0x00000100,        // obsolete
-    Escape             = 0x00000200,        // obsolete
-    FlagMask           = 0x00000300,        // obsolete
-    ButtonMask         = ~FlagMask          // obsolete
+    Default = 0x00000100,  // obsolete
+    Escape = 0x00000200,   // obsolete
+    FlagMask = 0x00000300, // obsolete
+    ButtonMask = ~FlagMask // obsolete
 };
 Q_ENUM_NS(StandardButton)
 
@@ -83,7 +58,7 @@ typedef StandardButton Button;
 Q_DECLARE_FLAGS(StandardButtons, StandardButton)
 Q_FLAG_NS(StandardButtons)
 
-enum Icon {
+enum class Icon {
     // keep this in sync with QMessageDialogOptions::StandardIcon
     NoIcon = 0,
     Information = 1,
@@ -93,29 +68,26 @@ enum Icon {
 };
 Q_ENUM_NS(Icon)
 
-#endif
-
-// TODO(crueter) widgets-less impl, choices et al.
-StandardButton ShowMessage(Icon icon,
-                           const QString &title,
-                           const QString &text,
+StandardButton ShowMessage(Icon icon, const QString& title, const QString& text,
                            StandardButtons buttons = StandardButton::NoButton,
-                           QObject *parent = nullptr);
+                           QObject* parent = nullptr);
 
-#define UTIL_OVERRIDES(level) \
-    inline StandardButton level(QObject *parent, \
-                                             const QString &title, \
-                                             const QString &text, \
-                                             StandardButtons buttons = StandardButton::Ok) \
-    { \
-        return ShowMessage(Icon::level, title, text, buttons, parent); \
-    } \
-    inline StandardButton level(const QString title, \
-                                             const QString &text, \
-                                             StandardButtons buttons \
-                                             = StandardButton::Ok) \
-    { \
-        return ShowMessage(Icon::level, title, text, buttons, rootObject); \
+#define UTIL_OVERRIDES(level)                                                                      \
+    inline StandardButton level(QObject* parent, const QString& title, const QString& text,        \
+                                StandardButtons buttons) {                                         \
+        return ShowMessage(Icon::level, title, text, buttons, parent);                             \
+    }                                                                                              \
+    inline StandardButton level(QObject* parent, const QString& title, const QString& text,        \
+                                int buttons = StandardButton::Ok) {                                \
+        return ShowMessage(Icon::level, title, text, StandardButtons(buttons), parent);            \
+    }                                                                                              \
+    inline StandardButton level(const QString title, const QString& text,                          \
+                                StandardButtons buttons) {                                         \
+        return ShowMessage(Icon::level, title, text, buttons, rootObject);                         \
+    }                                                                                              \
+    inline StandardButton level(const QString& title, const QString& text,                         \
+                                int buttons = StandardButton::Ok) {                                \
+        return ShowMessage(Icon::level, title, text, StandardButtons(buttons), rootObject);        \
     }
 
 UTIL_OVERRIDES(Information)
@@ -123,27 +95,17 @@ UTIL_OVERRIDES(Warning)
 UTIL_OVERRIDES(Critical)
 UTIL_OVERRIDES(Question)
 
-const QString GetOpenFileName(const QString &title,
-                              const QString &dir,
-                              const QString &filter,
-                              QString *selectedFilter = nullptr,
-                              Options options = Options());
+const QString GetOpenFileName(const QString& title, const QString& dir, const QString& filter,
+                              QString* selectedFilter = nullptr);
 
-const QStringList GetOpenFileNames(const QString &title,
-                              const QString &dir,
-                              const QString &filter,
-                              QString *selectedFilter = nullptr,
-                              Options options = Options());
+const QStringList GetOpenFileNames(const QString& title, const QString& dir, const QString& filter,
+                                   QString* selectedFilter = nullptr);
 
-const QString GetSaveFileName(const QString &title,
-                              const QString &dir,
-                              const QString &filter,
-                              QString *selectedFilter = nullptr,
-                              Options options = Options());
+const QString GetSaveFileName(const QString& title, const QString& dir, const QString& filter,
+                              QString* selectedFilter = nullptr);
 
-const QString GetExistingDirectory(const QString &caption = QString(),
-                                    const QString &dir = QString(),
-                                    Options options = Option::ShowDirsOnly);
+const QString GetExistingDirectory(const QString& caption = QString(),
+                                   const QString& dir = QString());
 
 int Choice(const QString& title = QString(), const QString& caption = QString(),
            const QStringList& options = {});

src/qt_common/abstract/progress.cpp

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "progress.h"
+
+namespace QtCommon::Frontend {
+
+QtProgressDialog::QtProgressDialog(const QString&, const QString&, int, int, QObject* parent,
+                                   Qt::WindowFlags)
+    : QObject(parent) {}
+
+} // namespace QtCommon::Frontend

src/qt_common/abstract/progress.h

@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <memory>
+#include <QObject>
+
+namespace QtCommon::Frontend {
+
+class QtProgressDialog : public QObject {
+    Q_OBJECT
+public:
+    QtProgressDialog(const QString& labelText, const QString& cancelButtonText, int minimum,
+                     int maximum, QObject* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+
+    virtual ~QtProgressDialog() = default;
+
+    virtual bool wasCanceled() const = 0;
+    virtual void setWindowModality(Qt::WindowModality modality) = 0;
+    virtual void setMinimumDuration(int durationMs) = 0;
+    virtual void setAutoClose(bool autoClose) = 0;
+    virtual void setAutoReset(bool autoReset) = 0;
+
+public slots:
+    virtual void setTitle(QString title) = 0;
+    virtual void setLabelText(QString text) = 0;
+    virtual void setMinimum(int min) = 0;
+    virtual void setMaximum(int max) = 0;
+    virtual void setValue(int value) = 0;
+
+    virtual bool close() = 0;
+    virtual void show() = 0;
+};
+
+std::unique_ptr<QtProgressDialog> newProgressDialog(const QString& labelText,
+                                                    const QString& cancelButtonText, int minimum,
+                                                    int maximum,
+                                                    Qt::WindowFlags f = Qt::WindowFlags());
+
+QtProgressDialog* newProgressDialogPtr(const QString& labelText, const QString& cancelButtonText,
+                                       int minimum, int maximum,
+                                       Qt::WindowFlags f = Qt::WindowFlags());
+
+} // namespace QtCommon::Frontend

src/qt_common/abstract/qt_progress_dialog.cpp

@@ -1,4 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "qt_progress_dialog.h"

src/qt_common/abstract/qt_progress_dialog.h

@@ -1,47 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef QT_PROGRESS_DIALOG_H
-#define QT_PROGRESS_DIALOG_H
-
-#include <QWindow>
-
-#ifdef YUZU_QT_WIDGETS
-#include <QProgressDialog>
-#endif
-
-namespace QtCommon::Frontend {
-#ifdef YUZU_QT_WIDGETS
-
-using QtProgressDialog = QProgressDialog;
-
-// TODO(crueter): QML impl
-#else
-class QtProgressDialog
-{
-public:
-    QtProgressDialog(const QString &labelText,
-                     const QString &cancelButtonText,
-                     int minimum,
-                     int maximum,
-                     QObject *parent = nullptr,
-                     Qt::WindowFlags f = Qt::WindowFlags());
-
-    bool wasCanceled() const;
-    void setWindowModality(Qt::WindowModality modality);
-    void setMinimumDuration(int durationMs);
-    void setAutoClose(bool autoClose);
-    void setAutoReset(bool autoReset);
-
-public slots:
-    void setLabelText(QString &text);
-    void setRange(int min, int max);
-    void setValue(int progress);
-    bool close();
-
-    void show();
-};
-#endif // YUZU_QT_WIDGETS
-
-}
-#endif // QT_PROGRESS_DIALOG_H

src/qt_common/config/qt_config.cpp

@@ -319,7 +319,7 @@ void QtConfig::ReadUIGamelistValues() {
 }
 
 void QtConfig::ReadUILayoutValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::UiGameList));
+    BeginGroup(Settings::TranslateCategory(Settings::Category::UiLayout));
 
     ReadCategory(Settings::Category::UiLayout);
 
@@ -578,10 +578,10 @@ void QtConfig::SaveMultiplayerValues() {
 }
 
 std::vector<Settings::BasicSetting*>& QtConfig::FindRelevantList(Settings::Category category) {
-    auto& map = Settings::values.linkage.by_category;
-    if (map.contains(category)) {
-        return Settings::values.linkage.by_category[category];
-    }
+    auto& list = Settings::values.linkage.by_category[category];
+    if (!list.empty())
+        return list;
+
     return UISettings::values.linkage.by_category[category];
 }
 

src/qt_common/config/shared_translation.cpp

@@ -9,24 +9,23 @@
 
 #include "shared_translation.h"
 
+#include <map>
+#include <memory>
+#include <utility>
 #include <QCoreApplication>
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "common/settings_setting.h"
 #include "common/time_zone.h"
 #include "qt_common/config/uisettings.h"
-#include <map>
-#include <memory>
-#include <utility>
 
 namespace ConfigurationShared {
 
-std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
-{
+std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
     std::unique_ptr<TranslationMap> translations = std::make_unique<TranslationMap>();
     const auto& tr = [parent](const char* text) -> QString { return parent->tr(text); };
 
-#define INSERT(SETTINGS, ID, NAME, TOOLTIP) \
+#define INSERT(SETTINGS, ID, NAME, TOOLTIP)                                                        \
     translations->insert(std::pair{SETTINGS::values.ID.Id(), std::pair{(NAME), (TOOLTIP)}})
 
     // A setting can be ignored by giving it a blank name
@@ -47,10 +46,9 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
     INSERT(Settings, login_share_applet_mode, tr("Login share"), QString());
     INSERT(Settings, wifi_web_auth_applet_mode, tr("Wifi web auth"), QString());
     INSERT(Settings, my_page_applet_mode, tr("My page"), QString());
-    INSERT(Settings,
-        enable_overlay,
-        tr("Enable Overlay Applet"),
-        tr("Enables Horizon\'s built-in overlay applet. Press and hold the home button for 1 second to show it."));
+    INSERT(Settings, enable_overlay, tr("Enable Overlay Applet"),
+           tr("Enables Horizon\'s built-in overlay applet. Press and hold the home button for 1 "
+              "second to show it."));
 
     // Audio
     INSERT(Settings, sink_id, tr("Output Engine:"), QString());
@@ -62,23 +60,16 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
     INSERT(UISettings, mute_when_in_background, tr("Mute audio when in background"), QString());
 
     // Core
-    INSERT(
-        Settings,
-        use_multi_core,
-        tr("Multicore CPU Emulation"),
-        tr("This option increases CPU emulation thread use from 1 to the maximum of 4.\n"
-           "This is mainly a debug option and shouldn't be disabled."));
-    INSERT(
-        Settings,
-        memory_layout_mode,
-        tr("Memory Layout"),
-        tr("Increases the amount of emulated RAM.\nDoesn't affect performance/stability but may allow HD texture "
-           "mods to load."));
+    INSERT(Settings, use_multi_core, tr("Multicore CPU Emulation"),
+           tr("This option increases CPU emulation thread use from 1 to the maximum of 4.\n"
+              "This is mainly a debug option and shouldn't be disabled."));
+    INSERT(Settings, memory_layout_mode, tr("Memory Layout"),
+           tr("Increases the amount of emulated RAM.\nDoesn't affect performance/stability but may "
+              "allow HD texture "
+              "mods to load."));
     INSERT(Settings, use_speed_limit, QString(), QString());
     INSERT(Settings, current_speed_mode, QString(), QString());
-    INSERT(Settings,
-           speed_limit,
-           tr("Limit Speed Percent"),
+    INSERT(Settings, speed_limit, tr("Limit Speed Percent"),
            tr("Controls the game's maximum rendering speed, but it's up to each game if it runs "
               "faster or not.\n200% for a 30 FPS game is 60 FPS, and for a "
               "60 FPS game it will be 120 FPS.\nDisabling it means unlocking the framerate to the "
@@ -91,171 +82,128 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
            tr("When the Slow Speed hotkey is pressed, the speed will be limited to this "
               "percentage."));
 
-    INSERT(Settings,
-           sync_core_speed,
-           tr("Synchronize Core Speed"),
+    INSERT(Settings, sync_core_speed, tr("Synchronize Core Speed"),
            tr("Synchronizes CPU core speed with the game's maximum rendering speed to boost FPS "
               "without affecting game speed (animations, physics, etc.).\n"
               "Can help reduce stuttering at lower framerates."));
 
     // Cpu
-    INSERT(Settings,
-           cpu_accuracy,
-           tr("Accuracy:"),
+    INSERT(Settings, cpu_accuracy, tr("Accuracy:"),
            tr("Change the accuracy of the emulated CPU (for debugging only)."));
     INSERT(Settings, cpu_backend, tr("Backend:"), QString());
 
-    INSERT(Settings,
-           fast_cpu_time,
-           tr("CPU Overclock"),
-           tr("Overclocks the emulated CPU to remove some FPS limiters. Weaker CPUs may see reduced performance, "
-              "and certain games may behave improperly.\nUse Boost (1700MHz) to run at the Switch's highest native "
+    INSERT(Settings, fast_cpu_time, tr("CPU Overclock"),
+           tr("Overclocks the emulated CPU to remove some FPS limiters. Weaker CPUs may see "
+              "reduced performance, "
+              "and certain games may behave improperly.\nUse Boost (1700MHz) to run at the "
+              "Switch's highest native "
               "clock, or Fast (2000MHz) to run at 2x clock."));
 
     INSERT(Settings, use_custom_cpu_ticks, QString(), QString());
-    INSERT(Settings,
-           cpu_ticks,
-           tr("Custom CPU Ticks"),
+    INSERT(Settings, cpu_ticks, tr("Custom CPU Ticks"),
            tr("Set a custom value of CPU ticks. Higher values can increase performance, but may "
               "cause deadlocks. A range of 77-21000 is recommended."));
     INSERT(Settings, cpu_backend, tr("Backend:"), QString());
 
-    INSERT(Settings, vtable_bouncing,
-        tr("Virtual Table Bouncing"),
-        tr("Bounces (by emulating a 0-valued return) any functions that triggers a prefetch abort"));
+    INSERT(Settings, vtable_bouncing, tr("Virtual Table Bouncing"),
+           tr("Bounces (by emulating a 0-valued return) any functions that triggers a prefetch "
+              "abort"));
 
     // Cpu Debug
 
     // Cpu Unsafe
-    INSERT(Settings, cpuopt_unsafe_host_mmu, tr("Enable Host MMU Emulation (fastmem)"),
-           tr("This optimization speeds up memory accesses by the guest program.\nEnabling it causes guest memory reads/writes to be done directly into memory and make use of Host's MMU.\nDisabling this forces all memory accesses to use Software MMU Emulation."));
     INSERT(
-        Settings,
-        cpuopt_unsafe_unfuse_fma,
+        Settings, cpuopt_unsafe_host_mmu, tr("Enable Host MMU Emulation (fastmem)"),
+        tr("This optimization speeds up memory accesses by the guest program.\nEnabling it causes "
+           "guest memory reads/writes to be done directly into memory and make use of Host's "
+           "MMU.\nDisabling this forces all memory accesses to use Software MMU Emulation."));
+    INSERT(
+        Settings, cpuopt_unsafe_unfuse_fma,
         tr("Unfuse FMA (improve performance on CPUs without FMA)"),
         tr("This option improves speed by reducing accuracy of fused-multiply-add instructions on "
            "CPUs without native FMA support."));
     INSERT(
-        Settings,
-        cpuopt_unsafe_reduce_fp_error,
-        tr("Faster FRSQRTE and FRECPE"),
+        Settings, cpuopt_unsafe_reduce_fp_error, tr("Faster FRSQRTE and FRECPE"),
         tr("This option improves the speed of some approximate floating-point functions by using "
            "less accurate native approximations."));
-    INSERT(Settings,
-           cpuopt_unsafe_ignore_standard_fpcr,
+    INSERT(Settings, cpuopt_unsafe_ignore_standard_fpcr,
            tr("Faster ASIMD instructions (32 bits only)"),
            tr("This option improves the speed of 32 bits ASIMD floating-point functions by running "
               "with incorrect rounding modes."));
-    INSERT(Settings,
-           cpuopt_unsafe_inaccurate_nan,
-           tr("Inaccurate NaN handling"),
+    INSERT(Settings, cpuopt_unsafe_inaccurate_nan, tr("Inaccurate NaN handling"),
            tr("This option improves speed by removing NaN checking.\nPlease note this also reduces "
               "accuracy of certain floating-point instructions."));
-    INSERT(Settings,
-           cpuopt_unsafe_fastmem_check,
-           tr("Disable address space checks"),
+    INSERT(Settings, cpuopt_unsafe_fastmem_check, tr("Disable address space checks"),
            tr("This option improves speed by eliminating a safety check before every memory "
               "operation.\nDisabling it may allow arbitrary code execution."));
     INSERT(
-        Settings,
-        cpuopt_unsafe_ignore_global_monitor,
-        tr("Ignore global monitor"),
+        Settings, cpuopt_unsafe_ignore_global_monitor, tr("Ignore global monitor"),
         tr("This option improves speed by relying only on the semantics of cmpxchg to ensure "
            "safety of exclusive access instructions.\nPlease note this may result in deadlocks and "
            "other race conditions."));
 
     // Renderer
-    INSERT(
-        Settings,
-        renderer_backend,
-        tr("API:"),
-        tr("Changes the output graphics API.\nVulkan is recommended."));
-    INSERT(Settings,
-           vulkan_device,
-           tr("Device:"),
+    INSERT(Settings, renderer_backend, tr("API:"),
+           tr("Changes the output graphics API.\nVulkan is recommended."));
+    INSERT(Settings, vulkan_device, tr("Device:"),
            tr("This setting selects the GPU to use (Vulkan only)."));
-    INSERT(Settings,
-           resolution_setup,
-           tr("Resolution:"),
+    INSERT(Settings, resolution_setup, tr("Resolution:"),
            tr("Forces to render at a different resolution.\n"
               "Higher resolutions require more VRAM and bandwidth.\n"
               "Options lower than 1X can cause artifacts."));
     INSERT(Settings, scaling_filter, tr("Window Adapting Filter:"), QString());
-    INSERT(Settings,
-           fsr_sharpening_slider,
-           tr("FSR Sharpness:"),
+    INSERT(Settings, fsr_sharpening_slider, tr("FSR Sharpness:"),
            tr("Determines how sharpened the image will look using FSR's dynamic contrast."));
-    INSERT(Settings,
-           anti_aliasing,
-           tr("Anti-Aliasing Method:"),
+    INSERT(Settings, anti_aliasing, tr("Anti-Aliasing Method:"),
            tr("The anti-aliasing method to use.\nSMAA offers the best quality.\nFXAA "
               "can produce a more stable picture in lower resolutions."));
-    INSERT(Settings,
-           fullscreen_mode,
-           tr("Fullscreen Mode:"),
+    INSERT(Settings, fullscreen_mode, tr("Fullscreen Mode:"),
            tr("The method used to render the window in fullscreen.\nBorderless offers the best "
               "compatibility with the on-screen keyboard that some games request for "
               "input.\nExclusive "
               "fullscreen may offer better performance and better Freesync/Gsync support."));
-    INSERT(Settings,
-           aspect_ratio,
-           tr("Aspect Ratio:"),
+    INSERT(Settings, aspect_ratio, tr("Aspect Ratio:"),
            tr("Stretches the renderer to fit the specified aspect ratio.\nMost games only support "
               "16:9, so modifications are required to get other ratios.\nAlso controls the "
               "aspect ratio of captured screenshots."));
-    INSERT(Settings,
-           use_disk_shader_cache,
-           tr("Use persistent pipeline cache"),
+    INSERT(Settings, use_disk_shader_cache, tr("Use persistent pipeline cache"),
            tr("Allows saving shaders to storage for faster loading on following game "
               "boots.\nDisabling it is only intended for debugging."));
-    INSERT(Settings,
-           optimize_spirv_output,
-           tr("Optimize SPIRV output"),
+    INSERT(Settings, optimize_spirv_output, tr("Optimize SPIRV output"),
            tr("Runs an additional optimization pass over generated SPIRV shaders.\n"
               "Will increase time required for shader compilation.\nMay slightly improve "
               "performance.\nThis feature is experimental."));
-    INSERT(Settings,
-           nvdec_emulation,
-           tr("NVDEC emulation:"),
+    INSERT(Settings, nvdec_emulation, tr("NVDEC emulation:"),
            tr("Specifies how videos should be decoded.\nIt can either use the CPU or the GPU for "
               "decoding, or perform no decoding at all (black screen on videos).\n"
               "In most cases, GPU decoding provides the best performance."));
-    INSERT(Settings,
-           accelerate_astc,
-           tr("ASTC Decoding Method:"),
+    INSERT(Settings, accelerate_astc, tr("ASTC Decoding Method:"),
            tr("This option controls how ASTC textures should be decoded.\n"
               "CPU: Use the CPU for decoding.\n"
               "GPU: Use the GPU's compute shaders to decode ASTC textures (recommended).\n"
               "CPU Asynchronously: Use the CPU to decode ASTC textures on demand. Eliminates"
               "ASTC decoding\nstuttering but may present artifacts."));
-    INSERT(
-        Settings,
-        astc_recompression,
-        tr("ASTC Recompression Method:"),
-        tr("Most GPUs lack support for ASTC textures and must decompress to an"
-            "intermediate format: RGBA8.\n"
-            "BC1/BC3: The intermediate format will be recompressed to BC1 or BC3 format,\n"
-            " saving VRAM but degrading image quality."));
+    INSERT(Settings, astc_recompression, tr("ASTC Recompression Method:"),
+           tr("Most GPUs lack support for ASTC textures and must decompress to an"
+              "intermediate format: RGBA8.\n"
+              "BC1/BC3: The intermediate format will be recompressed to BC1 or BC3 format,\n"
+              " saving VRAM but degrading image quality."));
     INSERT(Settings, frame_pacing_mode, tr("Frame Pacing Mode (Vulkan only)"),
-           tr("Controls how the emulator manages frame pacing to reduce stuttering and make the frame rate smoother and more consistent."));
-    INSERT(Settings,
-           vram_usage_mode,
-           tr("VRAM Usage Mode:"),
-           tr("Selects whether the emulator should prefer to conserve memory or make maximum usage of available video memory for performance.\nAggressive mode may impact performance of other applications such as recording software."));
-    INSERT(Settings,
-           skip_cpu_inner_invalidation,
-           tr("Skip CPU Inner Invalidation"),
+           tr("Controls how the emulator manages frame pacing to reduce stuttering and make the "
+              "frame rate smoother and more consistent."));
+    INSERT(Settings, vram_usage_mode, tr("VRAM Usage Mode:"),
+           tr("Selects whether the emulator should prefer to conserve memory or make maximum usage "
+              "of available video memory for performance.\nAggressive mode may impact performance "
+              "of other applications such as recording software."));
+    INSERT(Settings, skip_cpu_inner_invalidation, tr("Skip CPU Inner Invalidation"),
            tr("Skips certain cache invalidations during memory updates, reducing CPU usage and "
               "improving latency. This may cause soft-crashes."));
-    INSERT(
-        Settings,
-        vsync_mode,
-        tr("VSync Mode:"),
-        tr("FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen "
-           "refresh rate.\nFIFO Relaxed allows tearing as it recovers from a slow down.\n"
-           "Mailbox can have lower latency than FIFO and does not tear but may drop "
-           "frames.\nImmediate (no synchronization) presents whatever is available and can "
-           "exhibit tearing."));
+    INSERT(Settings, vsync_mode, tr("VSync Mode:"),
+           tr("FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen "
+              "refresh rate.\nFIFO Relaxed allows tearing as it recovers from a slow down.\n"
+              "Mailbox can have lower latency than FIFO and does not tear but may drop "
+              "frames.\nImmediate (no synchronization) presents whatever is available and can "
+              "exhibit tearing."));
     INSERT(Settings, bg_red, QString(), QString());
     INSERT(Settings, bg_green, QString(), QString());
     INSERT(Settings, bg_blue, QString(), QString());
@@ -264,103 +212,74 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
     INSERT(Settings, use_asynchronous_gpu_emulation, QString(), QString());
 
     INSERT(Settings, sync_memory_operations, tr("Sync Memory Operations"),
-           tr("Ensures data consistency between compute and memory operations.\nThis option fixes issues in games, but may degrade performance.\nUnreal Engine 4 games often see the most significant changes thereof."));
-    INSERT(Settings,
-           async_presentation,
-           tr("Enable asynchronous presentation (Vulkan only)"),
+           tr("Ensures data consistency between compute and memory operations.\nThis option fixes "
+              "issues in games, but may degrade performance.\nUnreal Engine 4 games often see the "
+              "most significant changes thereof."));
+    INSERT(Settings, async_presentation, tr("Enable asynchronous presentation (Vulkan only)"),
            tr("Slightly improves performance by moving presentation to a separate CPU thread."));
     INSERT(
-        Settings,
-        renderer_force_max_clock,
-        tr("Force maximum clocks (Vulkan only)"),
+        Settings, renderer_force_max_clock, tr("Force maximum clocks (Vulkan only)"),
         tr("Runs work in the background while waiting for graphics commands to keep the GPU from "
            "lowering its clock speed."));
-    INSERT(Settings,
-           max_anisotropy,
-           tr("Anisotropic Filtering:"),
-           tr("Controls the quality of texture rendering at oblique angles.\nSafe to set at 16x on most GPUs."));
-    INSERT(Settings,
-           gpu_accuracy,
-           tr("GPU Mode:"),
-           tr("Controls the GPU emulation mode.\nMost games render fine with Fast or Balanced modes, but Accurate is still "
+    INSERT(Settings, max_anisotropy, tr("Anisotropic Filtering:"),
+           tr("Controls the quality of texture rendering at oblique angles.\nSafe to set at 16x on "
+              "most GPUs."));
+    INSERT(Settings, gpu_accuracy, tr("GPU Mode:"),
+           tr("Controls the GPU emulation mode.\nMost games render fine with Fast or Balanced "
+              "modes, but Accurate is still "
               "required for some.\nParticles tend to only render correctly with Accurate mode."));
-    INSERT(Settings,
-           dma_accuracy,
-           tr("DMA Accuracy:"),
-           tr("Controls the DMA precision accuracy. Safe precision fixes issues in some games but may degrade performance."));
-    INSERT(Settings,
-           use_asynchronous_shaders,
-           tr("Enable asynchronous shader compilation"),
+    INSERT(Settings, dma_accuracy, tr("DMA Accuracy:"),
+           tr("Controls the DMA precision accuracy. Safe precision fixes issues in some games but "
+              "may degrade performance."));
+    INSERT(Settings, use_asynchronous_shaders, tr("Enable asynchronous shader compilation"),
            tr("May reduce shader stutter."));
-    INSERT(Settings,
-           fast_gpu_time,
-           tr("Fast GPU Time"),
+    INSERT(Settings, fast_gpu_time, tr("Fast GPU Time"),
            tr("Overclocks the emulated GPU to increase dynamic resolution and render "
               "distance.\nUse 256 for maximal performance and 512 for maximal graphics fidelity."));
-    INSERT(Settings,
-           gpu_unswizzle_enabled,
-           tr("GPU Unswizzle"),
+    INSERT(Settings, gpu_unswizzle_enabled, tr("GPU Unswizzle"),
            tr("Accelerates BCn 3D texture decoding using GPU compute.\n"
               "Disable if experiencing crashes or graphical glitches."));
-    INSERT(Settings,
-           gpu_unswizzle_texture_size,
-           tr("GPU Unswizzle Max Texture Size"),
+    INSERT(Settings, gpu_unswizzle_texture_size, tr("GPU Unswizzle Max Texture Size"),
            tr("Sets the maximum size (MiB) for GPU-based texture unswizzling.\n"
-              "While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones.\n"
+              "While the GPU is faster for medium and large textures, the CPU may be more "
+              "efficient for very small ones.\n"
               "Adjust this to find the balance between GPU acceleration and CPU overhead."));
-    INSERT(Settings,
-           gpu_unswizzle_stream_size,
-           tr("GPU Unswizzle Stream Size"),
+    INSERT(Settings, gpu_unswizzle_stream_size, tr("GPU Unswizzle Stream Size"),
            tr("Sets the maximum amount of texture data (in MiB) processed per frame.\n"
-              "Higher values can reduce stutter during texture loading but may impact frame consistency."));
-    INSERT(Settings,
-           gpu_unswizzle_chunk_size,
-           tr("GPU Unswizzle Chunk Size"),
+              "Higher values can reduce stutter during texture loading but may impact frame "
+              "consistency."));
+    INSERT(Settings, gpu_unswizzle_chunk_size, tr("GPU Unswizzle Chunk Size"),
            tr("Determines the number of depth slices processed in a single dispatch.\n"
-              "Increasing this can improve throughput on high-end GPUs but may cause TDR or driver timeouts on weaker hardware."));
+              "Increasing this can improve throughput on high-end GPUs but may cause TDR or driver "
+              "timeouts on weaker hardware."));
 
-    INSERT(Settings,
-           use_vulkan_driver_pipeline_cache,
-           tr("Use Vulkan pipeline cache"),
+    INSERT(Settings, use_vulkan_driver_pipeline_cache, tr("Use Vulkan pipeline cache"),
            tr("Enables GPU vendor-specific pipeline cache.\nThis option can improve shader loading "
               "time significantly in cases where the Vulkan driver does not store pipeline cache "
               "files internally."));
+    INSERT(Settings, enable_compute_pipelines, tr("Enable Compute Pipelines (Intel Vulkan Only)"),
+           tr("Required by some games.\nThis setting only exists for Intel "
+              "proprietary drivers and may crash if enabled.\nCompute pipelines are always enabled "
+              "on all other drivers."));
     INSERT(
-        Settings,
-        enable_compute_pipelines,
-        tr("Enable Compute Pipelines (Intel Vulkan Only)"),
-        tr("Required by some games.\nThis setting only exists for Intel "
-           "proprietary drivers and may crash if enabled.\nCompute pipelines are always enabled "
-           "on all other drivers."));
-    INSERT(
-        Settings,
-        use_reactive_flushing,
-        tr("Enable Reactive Flushing"),
+        Settings, use_reactive_flushing, tr("Enable Reactive Flushing"),
         tr("Uses reactive flushing instead of predictive flushing, allowing more accurate memory "
            "syncing."));
-    INSERT(Settings,
-           use_video_framerate,
-           tr("Sync to framerate of video playback"),
+    INSERT(Settings, use_video_framerate, tr("Sync to framerate of video playback"),
            tr("Run the game at normal speed during video playback, even when the framerate is "
               "unlocked."));
-    INSERT(Settings,
-           barrier_feedback_loops,
-           tr("Barrier feedback loops"),
+    INSERT(Settings, barrier_feedback_loops, tr("Barrier feedback loops"),
            tr("Improves rendering of transparency effects in specific games."));
-    INSERT(Settings,
-           enable_buffer_history,
-           tr("Enable buffer history"),
-           tr("Enables access to previous buffer states.\nThis option may improve rendering quality and performance consistency in some games."));
-    INSERT(Settings,
-           fix_bloom_effects,
-           tr("Fix bloom effects"),
-           tr("Removes bloom in Burnout."));
+    INSERT(Settings, enable_buffer_history, tr("Enable buffer history"),
+           tr("Enables access to previous buffer states.\nThis option may improve rendering "
+              "quality and performance consistency in some games."));
+    INSERT(Settings, fix_bloom_effects, tr("Fix bloom effects"), tr("Removes bloom in Burnout."));
 
-    INSERT(Settings,
-           rescale_hack,
-           tr("Enable Legacy Rescale Pass"),
-           tr("May fix rescale issues in some games by relying on behavior from the previous implementation.\n"
-              "Legacy behavior workaround that fixes line artifacts on AMD and Intel GPUs, and grey texture flicker on Nvidia GPUs in Luigis Mansion 3."));
+    INSERT(Settings, rescale_hack, tr("Enable Legacy Rescale Pass"),
+           tr("May fix rescale issues in some games by relying on behavior from the previous "
+              "implementation.\n"
+              "Legacy behavior workaround that fixes line artifacts on AMD and Intel GPUs, and "
+              "grey texture flicker on Nvidia GPUs in Luigis Mansion 3."));
 
     // Renderer (Extensions)
     INSERT(Settings, dyna_state, tr("Extended Dynamic State"),
@@ -368,59 +287,42 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
               "Higher states allow for more features and can increase performance, but may cause "
               "additional graphical issues."));
 
-    INSERT(Settings,
-           vertex_input_dynamic_state,
-           tr("Vertex Input Dynamic State"),
+    INSERT(Settings, vertex_input_dynamic_state, tr("Vertex Input Dynamic State"),
            tr("Enables vertex input dynamic state feature for better quality and performance."));
 
-    INSERT(Settings,
-           provoking_vertex,
-           tr("Provoking Vertex"),
+    INSERT(Settings, provoking_vertex, tr("Provoking Vertex"),
            tr("Improves lighting and vertex handling in some games.\n"
               "Only Vulkan 1.0+ devices support this extension."));
 
-    INSERT(Settings,
-           descriptor_indexing,
-           tr("Descriptor Indexing"),
+    INSERT(Settings, descriptor_indexing, tr("Descriptor Indexing"),
            tr("Improves texture & buffer handling and the Maxwell translation layer.\n"
               "Some Vulkan 1.1+ and all 1.2+ devices support this extension."));
 
-    INSERT(Settings,
-           sample_shading,
-           tr("Sample Shading"),
-           tr("Allows the fragment shader to execute per sample in a multi-sampled fragment "
-              "instead of once per fragment. Improves graphics quality at the cost of performance.\n"
-              "Higher values improve quality but degrade performance."));
+    INSERT(
+        Settings, sample_shading, tr("Sample Shading"),
+        tr("Allows the fragment shader to execute per sample in a multi-sampled fragment "
+           "instead of once per fragment. Improves graphics quality at the cost of performance.\n"
+           "Higher values improve quality but degrade performance."));
 
     // Renderer (Debug)
 
     // System
-    INSERT(Settings,
-           rng_seed,
-           tr("RNG Seed"),
+    INSERT(Settings, rng_seed, tr("RNG Seed"),
            tr("Controls the seed of the random number generator.\nMainly used for speedrunning."));
     INSERT(Settings, rng_seed_enabled, QString(), QString());
     INSERT(Settings, device_name, tr("Device Name"), tr("The name of the console."));
-    INSERT(Settings,
-           custom_rtc,
-           tr("Custom RTC Date:"),
+    INSERT(Settings, custom_rtc, tr("Custom RTC Date:"),
            tr("This option allows to change the clock of the console.\n"
               "Can be used to manipulate time in games."));
     INSERT(Settings, custom_rtc_enabled, QString(), QString());
-    INSERT(Settings,
-           custom_rtc_offset,
-           QStringLiteral(" "),
+    INSERT(Settings, custom_rtc_offset, QStringLiteral(" "),
            tr("The number of seconds from the current unix time"));
-    INSERT(Settings,
-           language_index,
-           tr("Language:"),
+    INSERT(Settings, language_index, tr("Language:"),
            tr("This option can be overridden when region setting is auto-select"));
     INSERT(Settings, region_index, tr("Region:"), tr("The region of the console."));
     INSERT(Settings, time_zone_index, tr("Time Zone:"), tr("The time zone of the console."));
     INSERT(Settings, sound_index, tr("Sound Output Mode:"), QString());
-    INSERT(Settings,
-           use_docked_mode,
-           tr("Console Mode:"),
+    INSERT(Settings, use_docked_mode, tr("Console Mode:"),
            tr("Selects if the console is in Docked or Handheld mode.\nGames will change "
               "their resolution, details and supported controllers and depending on this setting.\n"
               "Setting to Handheld can help improve performance for low end systems."));
@@ -444,31 +346,19 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
     // Ui
 
     // Ui General
-    INSERT(UISettings,
-           select_user_on_boot,
-           tr("Prompt for user profile on boot"),
+    INSERT(UISettings, select_user_on_boot, tr("Prompt for user profile on boot"),
            tr("Useful if multiple people use the same PC."));
-    INSERT(UISettings,
-           pause_when_in_background,
-           tr("Pause when not in focus"),
+    INSERT(UISettings, pause_when_in_background, tr("Pause when not in focus"),
            tr("Pauses emulation when focusing on other windows."));
-    INSERT(UISettings,
-           confirm_before_stopping,
-           tr("Confirm before stopping emulation"),
+    INSERT(UISettings, confirm_before_stopping, tr("Confirm before stopping emulation"),
            tr("Overrides prompts asking to confirm stopping the emulation.\nEnabling "
               "it bypasses such prompts and directly exits the emulation."));
-    INSERT(UISettings,
-           hide_mouse,
-           tr("Hide mouse on inactivity"),
+    INSERT(UISettings, hide_mouse, tr("Hide mouse on inactivity"),
            tr("Hides the mouse after 2.5s of inactivity."));
-    INSERT(UISettings,
-           controller_applet_disabled,
-           tr("Disable controller applet"),
+    INSERT(UISettings, controller_applet_disabled, tr("Disable controller applet"),
            tr("Forcibly disables the use of the controller applet in emulated programs.\n"
-                "When a program attempts to open the controller applet, it is immediately closed."));
-    INSERT(UISettings,
-           check_for_updates,
-           tr("Check for updates"),
+              "When a program attempts to open the controller applet, it is immediately closed."));
+    INSERT(UISettings, check_for_updates, tr("Check for updates"),
            tr("Whether or not to check for updates upon startup."));
 
     // Linux
@@ -489,9 +379,9 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
     return translations;
 }
 
-std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
-{
-    std::unique_ptr<ComboboxTranslationMap> translations = std::make_unique<ComboboxTranslationMap>();
+std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
+    std::unique_ptr<ComboboxTranslationMap> translations =
+        std::make_unique<ComboboxTranslationMap>();
     const auto& tr = [&](const char* text, const char* context = "") {
         return parent->tr(text, context);
     };
@@ -537,15 +427,15 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
                               PAIR(VramUsageMode, Conservative, tr("Conservative")),
                               PAIR(VramUsageMode, Aggressive, tr("Aggressive")),
                           }});
-    translations->insert({Settings::EnumMetadata<Settings::RendererBackend>::Index(), {
-        PAIR(RendererBackend, Vulkan, tr("Vulkan")),
+    translations->insert(
+        {Settings::EnumMetadata<Settings::RendererBackend>::Index(),
+         {PAIR(RendererBackend, Vulkan, tr("Vulkan")),
 #ifdef HAS_OPENGL
-        PAIR(RendererBackend, OpenGL_GLSL, tr("OpenGL GLSL")),
-        PAIR(RendererBackend, OpenGL_GLASM, tr("OpenGL GLASM (Assembly Shaders, NVIDIA Only)")),
-        PAIR(RendererBackend, OpenGL_SPIRV, tr("OpenGL SPIR-V (Experimental, AMD/Mesa Only)")),
+          PAIR(RendererBackend, OpenGL_GLSL, tr("OpenGL GLSL")),
+          PAIR(RendererBackend, OpenGL_GLASM, tr("OpenGL GLASM (Assembly Shaders, NVIDIA Only)")),
+          PAIR(RendererBackend, OpenGL_SPIRV, tr("OpenGL SPIR-V (Experimental, AMD/Mesa Only)")),
 #endif
-        PAIR(RendererBackend, Null, tr("Null"))
-    }});
+          PAIR(RendererBackend, Null, tr("Null"))}});
     translations->insert({Settings::EnumMetadata<Settings::GpuAccuracy>::Index(),
                           {
                               PAIR(GpuAccuracy, Low, tr("Fast")),
@@ -679,58 +569,58 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
     translations->insert(
         {Settings::EnumMetadata<Settings::TimeZone>::Index(),
          {
-          {static_cast<u32>(Settings::TimeZone::Auto),
-           tr("Auto (%1)", "Auto select time zone")
-               .arg(QString::fromStdString(
-                   Settings::GetTimeZoneString(Settings::TimeZone::Auto)))},
-          {static_cast<u32>(Settings::TimeZone::Default),
-           tr("Default (%1)", "Default time zone")
-               .arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
-          PAIR(TimeZone, Cet, tr("CET")),
-          PAIR(TimeZone, Cst6Cdt, tr("CST6CDT")),
-          PAIR(TimeZone, Cuba, tr("Cuba")),
-          PAIR(TimeZone, Eet, tr("EET")),
-          PAIR(TimeZone, Egypt, tr("Egypt")),
-          PAIR(TimeZone, Eire, tr("Eire")),
-          PAIR(TimeZone, Est, tr("EST")),
-          PAIR(TimeZone, Est5Edt, tr("EST5EDT")),
-          PAIR(TimeZone, Gb, tr("GB")),
-          PAIR(TimeZone, GbEire, tr("GB-Eire")),
-          PAIR(TimeZone, Gmt, tr("GMT")),
-          PAIR(TimeZone, GmtPlusZero, tr("GMT+0")),
-          PAIR(TimeZone, GmtMinusZero, tr("GMT-0")),
-          PAIR(TimeZone, GmtZero, tr("GMT0")),
-          PAIR(TimeZone, Greenwich, tr("Greenwich")),
-          PAIR(TimeZone, Hongkong, tr("Hongkong")),
-          PAIR(TimeZone, Hst, tr("HST")),
-          PAIR(TimeZone, Iceland, tr("Iceland")),
-          PAIR(TimeZone, Iran, tr("Iran")),
-          PAIR(TimeZone, Israel, tr("Israel")),
-          PAIR(TimeZone, Jamaica, tr("Jamaica")),
-          PAIR(TimeZone, Japan, tr("Japan")),
-          PAIR(TimeZone, Kwajalein, tr("Kwajalein")),
-          PAIR(TimeZone, Libya, tr("Libya")),
-          PAIR(TimeZone, Met, tr("MET")),
-          PAIR(TimeZone, Mst, tr("MST")),
-          PAIR(TimeZone, Mst7Mdt, tr("MST7MDT")),
-          PAIR(TimeZone, Navajo, tr("Navajo")),
-          PAIR(TimeZone, Nz, tr("NZ")),
-          PAIR(TimeZone, NzChat, tr("NZ-CHAT")),
-          PAIR(TimeZone, Poland, tr("Poland")),
-          PAIR(TimeZone, Portugal, tr("Portugal")),
-          PAIR(TimeZone, Prc, tr("PRC")),
-          PAIR(TimeZone, Pst8Pdt, tr("PST8PDT")),
-          PAIR(TimeZone, Roc, tr("ROC")),
-          PAIR(TimeZone, Rok, tr("ROK")),
-          PAIR(TimeZone, Singapore, tr("Singapore")),
-          PAIR(TimeZone, Turkey, tr("Turkey")),
-          PAIR(TimeZone, Uct, tr("UCT")),
-          PAIR(TimeZone, Universal, tr("Universal")),
-          PAIR(TimeZone, Utc, tr("UTC")),
-          PAIR(TimeZone, WSu, tr("W-SU")),
-          PAIR(TimeZone, Wet, tr("WET")),
-          PAIR(TimeZone, Zulu, tr("Zulu")),
-          }});
+             {static_cast<u32>(Settings::TimeZone::Auto),
+              tr("Auto (%1)", "Auto select time zone")
+                  .arg(QString::fromStdString(
+                      Settings::GetTimeZoneString(Settings::TimeZone::Auto)))},
+             {static_cast<u32>(Settings::TimeZone::Default),
+              tr("Default (%1)", "Default time zone")
+                  .arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
+             PAIR(TimeZone, Cet, tr("CET")),
+             PAIR(TimeZone, Cst6Cdt, tr("CST6CDT")),
+             PAIR(TimeZone, Cuba, tr("Cuba")),
+             PAIR(TimeZone, Eet, tr("EET")),
+             PAIR(TimeZone, Egypt, tr("Egypt")),
+             PAIR(TimeZone, Eire, tr("Eire")),
+             PAIR(TimeZone, Est, tr("EST")),
+             PAIR(TimeZone, Est5Edt, tr("EST5EDT")),
+             PAIR(TimeZone, Gb, tr("GB")),
+             PAIR(TimeZone, GbEire, tr("GB-Eire")),
+             PAIR(TimeZone, Gmt, tr("GMT")),
+             PAIR(TimeZone, GmtPlusZero, tr("GMT+0")),
+             PAIR(TimeZone, GmtMinusZero, tr("GMT-0")),
+             PAIR(TimeZone, GmtZero, tr("GMT0")),
+             PAIR(TimeZone, Greenwich, tr("Greenwich")),
+             PAIR(TimeZone, Hongkong, tr("Hongkong")),
+             PAIR(TimeZone, Hst, tr("HST")),
+             PAIR(TimeZone, Iceland, tr("Iceland")),
+             PAIR(TimeZone, Iran, tr("Iran")),
+             PAIR(TimeZone, Israel, tr("Israel")),
+             PAIR(TimeZone, Jamaica, tr("Jamaica")),
+             PAIR(TimeZone, Japan, tr("Japan")),
+             PAIR(TimeZone, Kwajalein, tr("Kwajalein")),
+             PAIR(TimeZone, Libya, tr("Libya")),
+             PAIR(TimeZone, Met, tr("MET")),
+             PAIR(TimeZone, Mst, tr("MST")),
+             PAIR(TimeZone, Mst7Mdt, tr("MST7MDT")),
+             PAIR(TimeZone, Navajo, tr("Navajo")),
+             PAIR(TimeZone, Nz, tr("NZ")),
+             PAIR(TimeZone, NzChat, tr("NZ-CHAT")),
+             PAIR(TimeZone, Poland, tr("Poland")),
+             PAIR(TimeZone, Portugal, tr("Portugal")),
+             PAIR(TimeZone, Prc, tr("PRC")),
+             PAIR(TimeZone, Pst8Pdt, tr("PST8PDT")),
+             PAIR(TimeZone, Roc, tr("ROC")),
+             PAIR(TimeZone, Rok, tr("ROK")),
+             PAIR(TimeZone, Singapore, tr("Singapore")),
+             PAIR(TimeZone, Turkey, tr("Turkey")),
+             PAIR(TimeZone, Uct, tr("UCT")),
+             PAIR(TimeZone, Universal, tr("Universal")),
+             PAIR(TimeZone, Utc, tr("UTC")),
+             PAIR(TimeZone, WSu, tr("W-SU")),
+             PAIR(TimeZone, Wet, tr("WET")),
+             PAIR(TimeZone, Zulu, tr("Zulu")),
+         }});
     translations->insert({Settings::EnumMetadata<Settings::AudioMode>::Index(),
                           {
                               PAIR(AudioMode, Mono, tr("Mono")),
@@ -803,9 +693,9 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
                           }});
 
     translations->insert({Settings::EnumMetadata<Settings::GameListMode>::Index(),
-                         {
-                             PAIR(GameListMode, TreeView, tr("Tree View")),
-                             PAIR(GameListMode, GridView, tr("Grid View")),
+                          {
+                              PAIR(GameListMode, TreeView, tr("Tree View")),
+                              PAIR(GameListMode, GridView, tr("Grid View")),
                           }});
 
 #undef PAIR

src/qt_common/config/shared_translation.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 Torzu Emulator Project
@@ -13,8 +13,8 @@
 #include <memory>
 #include <utility>
 #include <vector>
-#include <QString>
 #include <QObject>
+#include <QString>
 #include "common/common_types.h"
 #include "common/settings_enums.h"
 
@@ -23,7 +23,7 @@ using TranslationMap = std::map<u32, std::pair<QString, QString>>;
 using ComboboxTranslations = std::vector<std::pair<u32, QString>>;
 using ComboboxTranslationMap = std::map<u32, ComboboxTranslations>;
 
-std::unique_ptr<TranslationMap> InitializeTranslations(QObject *parent);
+std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent);
 
 std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent);
 
@@ -39,15 +39,15 @@ static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map
     {Settings::ScalingFilter::Bilinear,
      QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Bilinear"))},
     {Settings::ScalingFilter::Bicubic, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Bicubic"))},
-    {Settings::ScalingFilter::ZeroTangent, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Zero-Tangent"))},
+    {Settings::ScalingFilter::ZeroTangent,
+     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Zero-Tangent"))},
     {Settings::ScalingFilter::BSpline, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "B-Spline"))},
-    {Settings::ScalingFilter::Mitchell, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Mitchell"))},
-     {Settings::ScalingFilter::Spline1,
-     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Spline-1"))},
+    {Settings::ScalingFilter::Mitchell,
+     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Mitchell"))},
+    {Settings::ScalingFilter::Spline1, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Spline-1"))},
     {Settings::ScalingFilter::Gaussian,
      QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Gaussian"))},
-     {Settings::ScalingFilter::Lanczos,
-     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Lanczos"))},
+    {Settings::ScalingFilter::Lanczos, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Lanczos"))},
     {Settings::ScalingFilter::ScaleForce,
      QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "ScaleForce"))},
     {Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "FSR"))},
@@ -68,9 +68,12 @@ static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map = {
 
 static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map = {
     {Settings::RendererBackend::Vulkan, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Vulkan"))},
-    {Settings::RendererBackend::OpenGL_GLSL, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL GLSL"))},
-    {Settings::RendererBackend::OpenGL_SPIRV, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL SPIRV"))},
-    {Settings::RendererBackend::OpenGL_GLASM, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL GLASM"))},
+    {Settings::RendererBackend::OpenGL_GLSL,
+     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL GLSL"))},
+    {Settings::RendererBackend::OpenGL_SPIRV,
+     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL SPIRV"))},
+    {Settings::RendererBackend::OpenGL_GLASM,
+     QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "OpenGL GLASM"))},
     {Settings::RendererBackend::Null, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Null"))},
 };
 

src/qt_common/config/uisettings.h

@@ -145,14 +145,15 @@ struct Values {
     // Linux/MinGW may support (requires libdl support)
     SwitchableSetting<bool> enable_gamemode{linkage,
 #ifndef _MSC_VER
-        true,
+                                            true,
 #else
-        false,
+                                            false,
 #endif
-        "enable_gamemode", Category::UiGeneral};
+                                            "enable_gamemode", Category::UiGeneral};
 #ifdef __unix__
     SwitchableSetting<bool> gui_force_x11{linkage, false, "gui_force_x11", Category::UiGeneral};
-    Setting<bool> gui_hide_backend_warning{linkage, false, "gui_hide_backend_warning", Category::UiGeneral};
+    Setting<bool> gui_hide_backend_warning{linkage, false, "gui_hide_backend_warning",
+                                           Category::UiGeneral};
 #endif
 
     // Discord RPC
@@ -210,7 +211,8 @@ struct Values {
     Setting<u32> folder_icon_size{linkage, 48, "folder_icon_size", Category::UiGameList};
     Setting<u8> row_1_text_id{linkage, 3, "row_1_text_id", Category::UiGameList};
     Setting<u8> row_2_text_id{linkage, 2, "row_2_text_id", Category::UiGameList};
-    Setting<Settings::GameListMode> game_list_mode{linkage, Settings::GameListMode::TreeView, "game_list_mode", Category::UiGameList};
+    Setting<Settings::GameListMode> game_list_mode{linkage, Settings::GameListMode::TreeView,
+                                                   "game_list_mode", Category::UiGameList};
     Setting<bool> show_game_name{linkage, true, "show_game_name", Category::UiGameList};
 
     std::atomic_bool is_game_list_reload_pending{false};

src/qt_common/discord/discord_impl.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2018 Citra Emulator Project
@@ -70,7 +70,9 @@ std::string DiscordImpl::GetGameString(const std::string& title) {
 }
 
 static constexpr char DEFAULT_DISCORD_TEXT[] = "Eden is an emulator for the Nintendo Switch";
-static constexpr char DEFAULT_DISCORD_IMAGE[] = "https://git.eden-emu.dev/eden-emu/eden/raw/branch/master/dist/qt_themes/default/icons/256x256/eden.png";
+static constexpr char DEFAULT_DISCORD_IMAGE[] =
+    "https://git.eden-emu.dev/eden-emu/eden/raw/branch/master/dist/qt_themes/default/icons/256x256/"
+    "eden.png";
 
 void DiscordImpl::UpdateGameStatus(bool use_default) {
     const std::string url = use_default ? std::string{DEFAULT_DISCORD_IMAGE} : game_url;
@@ -120,7 +122,9 @@ void DiscordImpl::Update() {
         return;
     }
 
-    s64 start_time = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+    s64 start_time = std::chrono::duration_cast<std::chrono::seconds>(
+                         std::chrono::system_clock::now().time_since_epoch())
+                         .count();
     DiscordRichPresence presence{};
     presence.largeImageKey = DEFAULT_DISCORD_IMAGE;
     presence.largeImageText = DEFAULT_DISCORD_TEXT;

src/qt_common/gamemode.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -9,9 +9,9 @@
 #ifdef __unix__
 #include <gamemode_client.h>
 #endif
-#include "qt_common/gamemode.h"
 #include "common/logging/log.h"
 #include "qt_common/config/uisettings.h"
+#include "qt_common/gamemode.h"
 
 namespace Common::FeralGamemode {
 
@@ -49,4 +49,4 @@ void Stop() noexcept {
     }
 }
 
-} // namespace Common::Linux
+} // namespace Common::FeralGamemode