[vk] More identation fix

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
[vk] Fix identation
2026-08-14 21:04:41 +00:00 · 2026-01-26 02:35:00 +01:00 · 2026-01-26 02:35:00 +01:00 · 2026-01-26 02:35:00 +01:00 · 2026-01-26 02:35:00 +01:00
339 changed files with 28412 additions and 37001 deletions
@@ -1,6 +1,6 @@
 #!/bin/sh -e

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

 NUM_JOBS=$(nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 2)
@@ -29,7 +29,6 @@ Options:
    -b, --build-type <TYPE>	Build type (variable: TYPE)
                          	Valid values are: Release, RelWithDebInfo, Debug
                          	Default: Debug
-    -n, --nightly           Create a nightly build.

 Extra arguments are passed to CMake (e.g. -DCMAKE_OPTION_NAME=VALUE)
 Set the CCACHE variable to "true" to enable build caching.
@@ -62,7 +61,6 @@ while true; do
 		-r|--release) DEVEL=false ;;
 		-t|--target) target "$2"; shift ;;
 		-b|--build-type) type "$2"; shift ;;
-        -n|--nightly) NIGHTLY=true ;;
 		-h|--help) usage ;;
 		*) break ;;
 	esac
@@ -103,20 +101,7 @@ cd src/android
 chmod +x ./gradlew

 set -- "$@" -DUSE_CCACHE="${CCACHE}"
-
-nightly() {
-    [ "$NIGHTLY" = "true" ]
-}
-
-if nightly || [ "$DEVEL" != "true" ]; then
-    set -- "$@" -DENABLE_UPDATE_CHECKER=ON
-fi
-
-if nightly; then
-    NIGHTLY=true
-else
-    NIGHTLY=false
-fi
+[ "$DEVEL" != "true" ] && set -- "$@" -DENABLE_UPDATE_CHECKER=ON

 echo "-- building..."

@@ -125,7 +110,6 @@ echo "-- building..."
    -Dorg.gradle.parallel="${CCACHE}" \
    -Dorg.gradle.workers.max="${NUM_JOBS}" \
    -PYUZU_ANDROID_ARGS="$*" \
-    -Pnightly="$NIGHTLY" \
    --info

 if [ -n "${ANDROID_KEYSTORE_B64}" ]; then
@@ -41,8 +41,9 @@ EOF

 while true; do
 	case "$1" in
+		(-uc) UPDATE=true; COMMIT=true ;;
 		(-u|--update) UPDATE=true ;;
-		(-c|--commit) UPDATE=true; COMMIT=true ;;
+		(-c|--commit) COMMIT=true ;;
 		("$0") break ;;
 		("") break ;;
 		(*) usage ;;
@@ -0,0 +1,11 @@
+--- a/libs/context/CMakeLists.txt	2025-09-08 00:42:31.303651800 -0400
+++ b/libs/context/CMakeLists.txt	2025-09-08 00:42:40.592184300 -0400
+@@ -146,7 +146,7 @@
+       set(ASM_LANGUAGE ASM)
+     endif()
+   elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
+-    set(ASM_LANGUAGE ASM_ARMASM)
+    set(ASM_LANGUAGE ASM_MARMASM)
+   else()
+     set(ASM_LANGUAGE ASM_MASM)
+   endif()
@@ -0,0 +1,14 @@
+diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
+index 8210f65..0e59dd7 100644
+--- a/libs/context/CMakeLists.txt
+++ b/libs/context/CMakeLists.txt
+@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
+       set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
+     endif()
+ 
+-  else() # masm
+  # armasm doesn't support most of these options
+  elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
+     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+       set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
+     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -1,25 +0,0 @@
-From ce992811fe8eb5ea7ad37e5b255bfecb0c313928 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@crueter.xyz>
-Date: Sun, 7 Sep 2025 23:43:57 -0400
-Subject: [PATCH] [algorithm] fix missing declaration error
-
-Projects with restrictive error options won't compile without this
-
-Signed-off-by: crueter <crueter@crueter.xyz>
---
- include/jwt/algorithm.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/jwt/algorithm.hpp b/include/jwt/algorithm.hpp
-index 0e3b843..35347fe 100644
--- a/include/jwt/algorithm.hpp
-+++ b/include/jwt/algorithm.hpp
-@@ -63,6 +63,8 @@ using sign_func_t   = sign_result_t (*) (const jwt::string_view key,
- using verify_func_t = verify_result_t (*) (const jwt::string_view key,
-                                            const jwt::string_view head,
-                                            const jwt::string_view jwt_sign);
-+										   
-+verify_result_t is_secret_a_public_key(const jwt::string_view secret);
- 
- namespace algo {
- 
@@ -1,62 +1,52 @@
-From 436fc1978c78edd085d99b33275b24be0ac96aa0 Mon Sep 17 00:00:00 2001
+From e1a946ffb79022d38351a0623f819a5419965c3e Mon Sep 17 00:00:00 2001
 From: crueter <crueter@eden-emu.dev>
-Date: Sun, 1 Feb 2026 16:21:10 -0500
-Subject: [PATCH] Fix build on MinGW
+Date: Fri, 24 Oct 2025 23:41:09 -0700
+Subject: [PATCH] [build] Fix MinGW missing GetAddrInfoExCancel definition

-MinGW doesn't define GetAddrInfoExCancel.
+MinGW does not define GetAddrInfoExCancel in its wstcpi whatever header,
+so to get around this we can just load it with GetProcAddress et al.

 Signed-off-by: crueter <crueter@eden-emu.dev>
 ---
- httplib.h | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
+ httplib.h | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)

 diff --git a/httplib.h b/httplib.h
-index ec8d2a2..5f9a510 100644
+index e15ba44..90a76dc 100644
 --- a/httplib.h
 +++ b/httplib.h
-@@ -203,14 +203,17 @@
+@@ -203,11 +203,13 @@
 #error Sorry, Visual Studio versions prior to 2015 are not supported
 #endif
 
 -#pragma comment(lib, "ws2_32.lib")
 -
- #ifndef _SSIZE_T_DEFINED
 using ssize_t = __int64;
- #define _SSIZE_T_DEFINED
- #endif
 #endif // _MSC_VER
 
 +#if defined(_MSC_VER) || defined(__MINGW32__)
 +#pragma comment(lib, "ws2_32.lib")
 +#endif
-+
 +
 #ifndef S_ISREG
 #define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
 #endif // S_ISREG
-@@ -4528,7 +4531,17 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service,
+@@ -3557,7 +3559,15 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service,
     auto wait_result =
         ::WaitForSingleObject(event, static_cast<DWORD>(timeout_sec * 1000));
     if (wait_result == WAIT_TIMEOUT) {
 +#ifdef __MINGW32__
-+      typedef INT(WSAAPI * PFN_GETADDRINFOEXCANCEL)(HANDLE * CancelHandle);
-+      auto wsdll = LoadLibraryW((wchar_t *)"ws2_32.lib");
-+      PFN_GETADDRINFOEXCANCEL GetAddrInfoExCancel =
-+          (PFN_GETADDRINFOEXCANCEL)GetProcAddress(wsdll, "GetAddrInfoExCancel");
+      typedef INT (WSAAPI *PFN_GETADDRINFOEXCANCEL)(HANDLE *CancelHandle);
+      auto wsdll = LoadLibraryW((wchar_t*) "ws2_32.lib");
+      PFN_GETADDRINFOEXCANCEL GetAddrInfoExCancel = (PFN_GETADDRINFOEXCANCEL) GetProcAddress(wsdll, "GetAddrInfoExCancel");
 +
 +      if (cancel_handle) { GetAddrInfoExCancel(&cancel_handle); }
 +#else
       if (cancel_handle) { ::GetAddrInfoExCancel(&cancel_handle); }
 +#endif
-+
       ::CloseHandle(event);
       return EAI_AGAIN;
     }
-@@ -13952,3 +13965,4 @@ inline SSL_CTX *Client::ssl_context() const {
- } // namespace httplib
- 
- #endif // CPPHTTPLIB_HTTPLIB_H
-+
 -- 
-2.51.2
+2.51.0

@@ -1,28 +0,0 @@
-From cc15da16e533b2a801934eab2dfeaf3c3949a1dc Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Mon, 8 Sep 2025 12:28:55 -0400
-Subject: [PATCH] [cmake] disable NEON runtime check on clang-cl
-
-When enabling runtime NEON checking for clang-cl, the linker would error out with `undefined symbol: __emit`, since clang doesn't actually implement this instruction. Therefore it makes sense to disable the runtime check by default on this platform, until either this is fixed or a clang-cl compatible intrinsic check is added (I don't have enough knowledge of MSVC to do this)
---
- cmake/OpusConfig.cmake | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/OpusConfig.cmake b/cmake/OpusConfig.cmake
-index e9319fbad..d0f459e88 100644
--- a/cmake/OpusConfig.cmake
-+++ b/cmake/OpusConfig.cmake
-@@ -71,7 +71,12 @@ elseif(OPUS_CPU_ARM AND NOT OPUS_DISABLE_INTRINSICS)
-   opus_detect_neon(COMPILER_SUPPORT_NEON)
-   if(COMPILER_SUPPORT_NEON)
-     option(OPUS_USE_NEON "Option to enable NEON" ON)
-    option(OPUS_MAY_HAVE_NEON "Does runtime check for neon support" ON)
-+    if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+      set(NEON_RUNTIME_CHECK_DEFAULT OFF)
-+    else()
-+      set(NEON_RUNTIME_CHECK_DEFAULT ON)
-+    endif()
-+    option(OPUS_MAY_HAVE_NEON "Does runtime check for neon support" ${NEON_RUNTIME_CHECK_DEFAULT})
-     option(OPUS_PRESUME_NEON "Assume target CPU has NEON support" OFF)
-     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-       set(OPUS_PRESUME_NEON ON)
@@ -1,153 +0,0 @@
-From bf455b67b4eaa446ffae5d25410b141b7b1b1082 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Mon, 8 Sep 2025 12:08:20 -0400
-Subject: [PATCH] [cmake] `OPUS_INSTALL` option; only default install if root
- project
-
-Signed-off-by: crueter <crueter@eden-emu.dev>
---
- CMakeLists.txt | 112 ++++++++++++++++++++++++++++---------------------
- 1 file changed, 64 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcf034b19..08b5e16f8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- include(OpusPackageVersion)
- get_package_version(PACKAGE_VERSION PROJECT_VERSION)
- 
-+# root project detection
-+if(DEFINED PROJECT_NAME)
-+  set(root_project OFF)
-+else()
-+  set(root_project ON)
-+endif()
-+
- project(Opus LANGUAGES C VERSION ${PROJECT_VERSION})
- 
- include(OpusFunctions)
-@@ -83,12 +90,16 @@ set(OPUS_DNN_FLOAT_DEBUG_HELP_STR "Run DNN computations as float for debugging p
- option(OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR} OFF)
- add_feature_info(OPUS_DNN_FLOAT_DEBUG OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR})
- 
-+set(OPUS_INSTALL_HELP_STR "Install Opus targets")
-+option(OPUS_INSTALL ${OPUS_INSTALL_HELP_STR} ${root_project})
-+add_feature_info(OPUS_INSTALL OPUS_INSTALL ${OPUS_INSTALL_HELP_STR})
-+
- set(OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR "install pkg-config module.")
-option(OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ON)
-+option(OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ${OPUS_INSTALL})
- add_feature_info(OPUS_INSTALL_PKG_CONFIG_MODULE OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR})
- 
- set(OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR "install CMake package config module.")
-option(OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ON)
-+option(OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ${OPUS_INSTALL})
- add_feature_info(OPUS_INSTALL_CMAKE_CONFIG_MODULE OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR})
- 
- set(OPUS_DRED_HELP_STR "enable DRED.")
-@@ -613,53 +624,58 @@ if(OPUS_BUILD_FRAMEWORK)
-                         OUTPUT_NAME Opus)
- endif()
- 
-install(TARGETS opus
-        EXPORT OpusTargets
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opus)
-
-if(OPUS_INSTALL_PKG_CONFIG_MODULE)
-  set(prefix ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-  set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
-  set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-  set(VERSION ${PACKAGE_VERSION})
-  if(HAVE_LIBM)
-    set(LIBM "-lm")
-+if (OPUS_INSTALL)
-+  install(TARGETS opus
-+          EXPORT OpusTargets
-+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+          FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-+          PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opus)
-+
-+  if(OPUS_INSTALL_PKG_CONFIG_MODULE)
-+    set(prefix ${CMAKE_INSTALL_PREFIX})
-+    set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-+    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
-+    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-+    set(VERSION ${PACKAGE_VERSION})
-+    if(HAVE_LIBM)
-+      set(LIBM "-lm")
-+    endif()
-+    configure_file(opus.pc.in opus.pc)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/opus.pc
-+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+  endif()
-+
-+  if(OPUS_INSTALL_CMAKE_CONFIG_MODULE)
-+    set(CPACK_GENERATOR TGZ)
-+    include(CPack)
-+    set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-+    install(EXPORT OpusTargets
-+            NAMESPACE Opus::
-+            DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-+
-+    include(CMakePackageConfigHelpers)
-+
-+    set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-+    configure_package_config_file(
-+      ${PROJECT_SOURCE_DIR}/cmake/OpusConfig.cmake.in
-+      OpusConfig.cmake
-+      INSTALL_DESTINATION
-+      ${CMAKE_INSTALL_PACKAGEDIR}
-+      PATH_VARS
-+      INCLUDE_INSTALL_DIR
-+      INSTALL_PREFIX
-+      ${CMAKE_INSTALL_PREFIX})
-+
-+    write_basic_package_version_file(OpusConfigVersion.cmake
-+                                    VERSION ${PROJECT_VERSION}
-+                                    COMPATIBILITY SameMajorVersion)
-+
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpusConfig.cmake
-+                  ${CMAKE_CURRENT_BINARY_DIR}/OpusConfigVersion.cmake
-+            DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-   endif()
-  configure_file(opus.pc.in opus.pc)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/opus.pc
-          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-endif()
-
-if(OPUS_INSTALL_CMAKE_CONFIG_MODULE)
-  set(CPACK_GENERATOR TGZ)
-  include(CPack)
-  set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-  install(EXPORT OpusTargets
-          NAMESPACE Opus::
-          DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-
-  include(CMakePackageConfigHelpers)
-
-  set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-  configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/OpusConfig.cmake.in
-                                OpusConfig.cmake
-                                INSTALL_DESTINATION
-                                ${CMAKE_INSTALL_PACKAGEDIR}
-                                PATH_VARS
-                                INCLUDE_INSTALL_DIR
-                                INSTALL_PREFIX
-                                ${CMAKE_INSTALL_PREFIX})
-  write_basic_package_version_file(OpusConfigVersion.cmake
-                                   VERSION ${PROJECT_VERSION}
-                                   COMPATIBILITY SameMajorVersion)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpusConfig.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/OpusConfigVersion.cmake
-          DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
- endif()
- 
- if(OPUS_BUILD_PROGRAMS)
@@ -1,287 +0,0 @@
-From 67bf3d1381b1faf59e87001d6156ba4e21cada14 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Mon, 29 Dec 2025 21:22:36 -0500
-Subject: [PATCH] [cmake] refactor: shared/static handling
-
-This significantly redoes the way shared and static libraries are
-handled. Now, it's controlled by two options: `SPIRV_TOOLS_BUILD_STATIC`
-and `SPIRV_TOOLS_BUILD_SHARED`.
-
-The default configuration (no `BUILD_SHARED_LIBS` set, options left at
-default) is to build shared ONLY if this is the master project, or
-static ONLY if this is a subproject (e.g. FetchContent, CPM.cmake). Also
-I should note that static-only (i.e. no shared) is now a supported
-target, this is done because projects including it as a submodule e.g.
-on Android or Windows may prefer this.
-
-Now the shared/static handling:
- static ON, shared OFF: Only generates `.a` libraries.
- static ON, shared ON: Generates `.a` libraries, but also
-  `libSPIRV-Tools.so`
- static OFF, shared ON: Only generates `.so` libraries.
-
-Notable TODOs:
- SPIRV-Tools-shared.pc seems redundant--how should we handle which one
-  to use in the case of distributions that distribute both types (MSYS2
-  for instance)?
-  * *Note: pkgconfig sucks at this and usually just leaves it up to the
-    user, so the optimal solution may indeed be doing absolutely
-    nothing.* CMake is unaffected :)
- use namespaces in the CMake config files pleaaaaase
-
-This is going to change things a good bit for package maintainers, but
-cest la vie. It's for the greater good, I promise.
-
-Signed-off-by: crueter <crueter@eden-emu.dev>
---
- CMakeLists.txt        | 108 +++++++++++++++++++++++++-----------------
- source/CMakeLists.txt |  62 ++++++++++++------------
- 2 files changed, 94 insertions(+), 76 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d843b4d2f..07201f690f 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,6 +14,15 @@
- 
- cmake_minimum_required(VERSION 3.22.1)
- 
-+# master project detection--useful for FetchContent/submodule inclusion
-+set(master_project OFF)
-+set(subproject ON)
-+
-+if (NOT DEFINED PROJECT_NAME)
-+  set(master_project ON)
-+  set(subproject OFF)
-+endif()
-+
- project(spirv-tools)
- 
- # Avoid a bug in CMake 3.22.1. By default it will set -std=c++11 for
-@@ -135,46 +144,49 @@ if (DEFINED SPIRV_TOOLS_EXTRA_DEFINITIONS)
-   add_definitions(${SPIRV_TOOLS_EXTRA_DEFINITIONS})
- endif()
- 
-# Library build setting definitions:
-#
-# * SPIRV_TOOLS_BUILD_STATIC - ON or OFF - Defaults to ON.
-#   If enabled the following targets will be created:
-#     ${SPIRV_TOOLS}-static - STATIC library.
-#                             Has full public symbol visibility.
-#     ${SPIRV_TOOLS}-shared - SHARED library.
-#                             Has default-hidden symbol visibility.
-#     ${SPIRV_TOOLS}        - will alias to one of above, based on BUILD_SHARED_LIBS.
-#   If disabled the following targets will be created:
-#     ${SPIRV_TOOLS}        - either STATIC or SHARED based on SPIRV_TOOLS_LIBRARY_TYPE.
-#                             Has full public symbol visibility.
-#     ${SPIRV_TOOLS}-shared - SHARED library.
-#                             Has default-hidden symbol visibility.
-#
-# * SPIRV_TOOLS_LIBRARY_TYPE - SHARED or STATIC.
-#   Specifies the library type used for building SPIRV-Tools libraries.
-#   Defaults to SHARED when BUILD_SHARED_LIBS=1, otherwise STATIC.
-#
-# * SPIRV_TOOLS_FULL_VISIBILITY - "${SPIRV_TOOLS}-static" or "${SPIRV_TOOLS}"
-#   Evaluates to the SPIRV_TOOLS target library name that has no hidden symbols.
-#   This is used by internal targets for accessing symbols that are non-public.
-#   Note this target provides no API stability guarantees.
-#
-# Ideally, all of these will go away - see https://github.com/KhronosGroup/SPIRV-Tools/issues/3909.
-option(ENABLE_EXCEPTIONS_ON_MSVC "Build SPIRV-TOOLS with c++ exceptions enabled in MSVC" ON)
-option(SPIRV_TOOLS_BUILD_STATIC "Build ${SPIRV_TOOLS}-static target. ${SPIRV_TOOLS} will alias to ${SPIRV_TOOLS}-static or ${SPIRV_TOOLS}-shared based on BUILD_SHARED_LIBS" ON)
-if(SPIRV_TOOLS_BUILD_STATIC)
-  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-static)
-+# If BUILD_SHARED_LIBS is undefined, set it based on whether we are
-+# the master project or a subproject
-+if (NOT DEFINED BUILD_SHARED_LIBS)
-+  set(BUILD_SHARED_LIBS ${master_project})
-+endif()
-+
-+if (BUILD_SHARED_LIBS)
-+  set(static_default OFF)
-+else()
-+  set(static_default ON)
-+endif()
-+
-+option(SPIRV_TOOLS_BUILD_SHARED "Build ${SPIRV_TOOLS} as a shared library"
-+       ${BUILD_SHARED_LIBS})
-+option(SPIRV_TOOLS_BUILD_STATIC "Build ${SPIRV_TOOLS} as a static library"
-+       ${static_default})
-+
-+# Avoid conflict between the dll import library and
-+# the static library (thanks microsoft)
-+if(CMAKE_STATIC_LIBRARY_PREFIX STREQUAL "" AND
-+   CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL ".lib")
-+    set(SPIRV_TOOLS_STATIC_LIBNAME "${SPIRV_TOOLS}-static")
-+else()
-+    set(SPIRV_TOOLS_STATIC_LIBNAME "${SPIRV_TOOLS}")
-+endif()
-+
-+if (SPIRV_TOOLS_BUILD_STATIC)
-+  # If building a static library at all, always build other libraries as static,
-+  # and link to the static SPIRV-Tools library.
-   set(SPIRV_TOOLS_LIBRARY_TYPE "STATIC")
-else(SPIRV_TOOLS_BUILD_STATIC)
-  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS})
-  if (NOT DEFINED SPIRV_TOOLS_LIBRARY_TYPE)
-      if(BUILD_SHARED_LIBS)
-        set(SPIRV_TOOLS_LIBRARY_TYPE "SHARED")
-      else()
-        set(SPIRV_TOOLS_LIBRARY_TYPE "STATIC")
-      endif()
-  endif()
-endif(SPIRV_TOOLS_BUILD_STATIC)
-+  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-static)
-+elseif (SPIRV_TOOLS_BUILD_SHARED)
-+  # If only building a shared library, link other libraries to the
-+  # shared library. Also, other libraries should be shared
-+  set(SPIRV_TOOLS_LIBRARY_TYPE "SHARED")
-+  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-shared)
-+else()
-+  message(FATAL_ERROR "You must set one of "
-+    "SPIRV_TOOLS_BUILD_STATIC or SPIRV_TOOLS_BUILD_SHARED!")
-+endif()
-+
-+option(ENABLE_EXCEPTIONS_ON_MSVC
-+    "Build SPIRV-TOOLS with C++ exceptions enabled in MSVC" ON)
- 
- function(spvtools_default_compile_options TARGET)
-   target_compile_options(${TARGET} PRIVATE ${SPIRV_WARNINGS})
-@@ -372,7 +384,7 @@ if (NOT "${SPIRV_SKIP_TESTS}")
- endif()
- 
- set(SPIRV_LIBRARIES "-lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link")
-set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared")
-+set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools")
- 
- # Build pkg-config file
- # Use a first-class target so it's regenerated when relevant files are updated.
-@@ -388,7 +400,12 @@ add_custom_command(
-                       -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
-                       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
-         DEPENDS "CHANGES" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake")
-add_custom_command(
-+
-+set(pc_files ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc)
-+
-+# TODO(crueter): remove?
-+if (SPIRV_TOOLS_BUILD_SHARED)
-+  add_custom_command(
-         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
-         COMMAND ${CMAKE_COMMAND}
-                       -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
-@@ -400,9 +417,12 @@ add_custom_command(
-                       -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
-                       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
-         DEPENDS "CHANGES" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake")
-add_custom_target(spirv-tools-pkg-config 
-        ALL 
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc)
-+  set(pc_files ${pc_files} ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc)
-+endif()
-+
-+add_custom_target(spirv-tools-pkg-config
-+        ALL
-+        DEPENDS ${pc_files})
- 
- # Install pkg-config file
- if (ENABLE_SPIRV_TOOLS_INSTALL)
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index bfa1e661bc..fd3712c70c 100644
--- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -337,49 +337,44 @@ function(spirv_tools_default_target_options target)
-   )
-   set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
-   spvtools_check_symbol_exports(${target})
-  add_dependencies(${target} spirv-tools-build-version core_tables extinst_tables)
-+  add_dependencies(${target}
-+    spirv-tools-build-version core_tables extinst_tables)
- endfunction()
- 
-# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
-# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility.
-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
-if (SPIRV_TOOLS_USE_MIMALLOC)
-  target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
-+if (SPIRV_TOOLS_BUILD_SHARED)
-+  add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
-+  if (SPIRV_TOOLS_USE_MIMALLOC)
-+    target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
-+  endif()
-+
-+  set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES
-+    OUTPUT_NAME "${SPIRV_TOOLS}")
-+  spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
-+
-+  target_compile_definitions(${SPIRV_TOOLS}-shared
-+    PRIVATE SPIRV_TOOLS_IMPLEMENTATION
-+    PUBLIC SPIRV_TOOLS_SHAREDLIB)
-+
-+  list(APPEND SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared)
- endif()
-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
-target_compile_definitions(${SPIRV_TOOLS}-shared
-  PRIVATE SPIRV_TOOLS_IMPLEMENTATION
-  PUBLIC SPIRV_TOOLS_SHAREDLIB
-)
- 
- if(SPIRV_TOOLS_BUILD_STATIC)
-   add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
-   if (SPIRV_TOOLS_USE_MIMALLOC AND SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD)
-     target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
-   endif()
-+
-   spirv_tools_default_target_options(${SPIRV_TOOLS}-static)
-  # The static target does not have the '-static' suffix.
-  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}")
-
-  # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static"
-  # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS.
-  if(BUILD_SHARED_LIBS)
-    add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-shared)
-  else()
-    add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
-  endif()
-+  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES
-+    OUTPUT_NAME "${SPIRV_TOOLS_STATIC_LIBNAME}")
- 
-  set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
-else()
-  add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
-  if (SPIRV_TOOLS_USE_MIMALLOC)
-    target_link_libraries(${SPIRV_TOOLS} PRIVATE mimalloc-static)
-  endif()
-  spirv_tools_default_target_options(${SPIRV_TOOLS})
-  set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
-+  list(APPEND SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static)
- endif()
- 
-+# Create the "SPIRV-Tools" target as an alias to either "SPIRV-Tools-static"
-+# or "SPIRV-Tools-shared" depending on the value of SPIRV_TOOLS_BUILD_SHARED.
-+add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS_FULL_VISIBILITY})
-+
- if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-   find_library(LIBRT rt)
-   if(LIBRT)
-@@ -390,14 +385,17 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
- endif()
- 
- if(ENABLE_SPIRV_TOOLS_INSTALL)
-  if (SPIRV_TOOLS_USE_MIMALLOC AND (NOT SPIRV_TOOLS_BUILD_STATIC OR SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD))
-+  if (SPIRV_TOOLS_USE_MIMALLOC AND
-+    (NOT SPIRV_TOOLS_BUILD_STATIC OR SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD))
-     list(APPEND SPIRV_TOOLS_TARGETS mimalloc-static)
-   endif()
-   install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets)
-   export(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake)
- 
-   spvtools_config_package_dir(${SPIRV_TOOLS} PACKAGE_DIR)
-  install(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake DESTINATION ${PACKAGE_DIR})
-+  install(EXPORT ${SPIRV_TOOLS}Targets
-+    FILE ${SPIRV_TOOLS}Target.cmake
-+    DESTINATION ${PACKAGE_DIR})
- 
-   # Special config file for root library compared to other libs.
-   file(WRITE ${CMAKE_BINARY_DIR}/${SPIRV_TOOLS}Config.cmake
@@ -9,7 +9,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")

 set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

 include(DetectPlatform)
 include(DetectArchitecture)
@@ -32,8 +31,8 @@ if (PLATFORM_OPENBSD)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
 elseif (PLATFORM_NETBSD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
 endif()

@@ -42,37 +41,6 @@ if (PLATFORM_NETBSD)
    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()

-cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "PLATFORM_LINUX" OFF)
-if (YUZU_STATIC_ROOM)
-    set(YUZU_ROOM ON)
-    set(YUZU_ROOM_STANDALONE ON)
-
-    # disable e v e r y t h i n g
-    set(ENABLE_QT OFF)
-    set(ENABLE_SDL2 OFF)
-    set(YUZU_CMD OFF)
-    set(ENABLE_CUBEB OFF)
-    set(ENABLE_UPDATE_CHECKER OFF)
-    set(USE_DISCORD_PRESENCE OFF)
-    set(BUILD_TESTING OFF)
-    set(ENABLE_OPENSSL OFF)
-    set(ENABLE_WEB_SERVICE OFF)
-    set(ENABLE_LIBUSB OFF)
-
-    # allow static libs for boost and mbedtls though
-    set(Boost_USE_STATIC_LIBS ON)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    set(MBEDTLS_LIB_SUFFIX "_static")
-    set(YUZU_USE_CPM ON)
-
-    set(zstd_FORCE_BUNDLED ON)
-    set(fmt_FORCE_BUNDLED ON)
-endif()
-
-# common network mbedtls
-# common: xbyak? booost fmt lz4 zstd
-# network: enet boost
-
 # qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
@@ -178,9 +146,7 @@ endif()

 # Disable Warnings as Errors for MSVC
 if (MSVC AND NOT CXX_CLANG)
-    # This was dripping into spirv, being overriden, and causing cl flag override warning
-    # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX-")
-    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} /W3 /WX-")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX-")
 endif()

 # Set bundled sdl2/qt as dependent options.
@@ -229,8 +195,6 @@ option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android"

 option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.g. Snapdragon 865) at the cost of performance" OFF)

-option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build metadata" OFF)
-
 cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
 cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)

@@ -246,12 +210,11 @@ cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib"
 option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)

 set(DEFAULT_ENABLE_OPENSSL ON)
-if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN OR PLATFORM_OPENBSD)
+if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
    # - Windows defaults to the Schannel backend.
    # - macOS defaults to the SecureTransport backend.
    # - Android currently has no SSL backend as the NDK doesn't include any SSL
    #   library; a proper 'native' backend would have to go through Java.
-    # - Solaris and OpenBSD have too old backends
    # But you can force builds for those platforms to use OpenSSL if you have
    # your own copy of it.
    set(DEFAULT_ENABLE_OPENSSL OFF)
@@ -263,9 +226,11 @@ endif()

 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})

-set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
-if (EXT_DEFAULT OR PLATFORM_SUN OR PLATFORM_OPENBSD)
-    set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
+if (ENABLE_OPENSSL)
+    set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
+    if (EXT_DEFAULT OR PLATFORM_SUN)
+        set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
+    endif()
 endif()

 cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL} "ENABLE_OPENSSL" OFF)
@@ -455,6 +420,16 @@ if (YUZU_USE_CPM)
        add_library(lz4::lz4 ALIAS lz4_static)
    endif()

+    # nlohmann
+    AddJsonPackage(nlohmann)
+
+    # zlib
+    AddJsonPackage(zlib)
+
+    if (ZLIB_ADDED)
+        add_library(ZLIB::ZLIB ALIAS zlibstatic)
+    endif()
+
    # zstd
    AddJsonPackage(zstd)

@@ -463,31 +438,19 @@ if (YUZU_USE_CPM)
        add_library(zstd::libzstd ALIAS libzstd_static)
    endif()

-    if (NOT YUZU_STATIC_ROOM)
-        # nlohmann
-        AddJsonPackage(nlohmann)
+    # Opus
+    AddJsonPackage(opus)

-        # zlib
-        AddJsonPackage(zlib)
-
-        if (ZLIB_ADDED)
-            add_library(ZLIB::ZLIB ALIAS zlibstatic)
+    if (Opus_ADDED)
+        if (MSVC AND CXX_CLANG)
+            target_compile_options(opus PRIVATE
+                -Wno-implicit-function-declaration
+            )
        endif()
+    endif()

-        # Opus
-        AddJsonPackage(opus)
-
-        if (Opus_ADDED)
-            if (MSVC AND CXX_CLANG)
-                target_compile_options(opus PRIVATE
-                    -Wno-implicit-function-declaration
-                )
-            endif()
-        endif()
-
-        if (NOT TARGET Opus::opus)
-            add_library(Opus::opus ALIAS opus)
-        endif()
+    if (NOT TARGET Opus::opus)
+        add_library(Opus::opus ALIAS opus)
    endif()
 else()
    # TODO: we can probably just use CPM for this... right?
@@ -574,51 +537,47 @@ message(STATUS "Platform Libraries: ${PLATFORM_LIBRARIES}")
 add_subdirectory(externals)

 # pass targets from externals
+find_package(libusb)
+find_package(VulkanMemoryAllocator)
 find_package(enet)
 find_package(MbedTLS)
+find_package(VulkanUtilityLibraries)
+find_package(SimpleIni)
+find_package(SPIRV-Tools)
+find_package(sirit)
+find_package(gamemode)
+find_package(mcl)
+
+if (ARCHITECTURE_riscv64)
+    find_package(biscuit)
+endif()

 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
    find_package(xbyak)
 endif()

-if (NOT YUZU_STATIC_ROOM)
-    find_package(libusb)
-    find_package(VulkanMemoryAllocator)
-    find_package(VulkanUtilityLibraries)
-    find_package(SimpleIni)
-    find_package(SPIRV-Tools)
-    find_package(sirit)
-    find_package(gamemode)
-    find_package(mcl)
-    find_package(frozen)
+if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
+    find_package(cpp-jwt)
+endif()

-    if (ARCHITECTURE_riscv64)
-        find_package(biscuit)
-    endif()
+if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
+    find_package(oaknut)
+endif()

-    if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
-        find_package(cpp-jwt)
-    endif()
+if (ENABLE_SDL2)
+    find_package(SDL2)
+endif()

-    if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
-        find_package(oaknut)
-    endif()
+if (USE_DISCORD_PRESENCE)
+    find_package(DiscordRPC)
+endif()

-    if (ENABLE_SDL2)
-        find_package(SDL2)
-    endif()
+if (ENABLE_CUBEB)
+    find_package(cubeb)
+endif()

-    if (USE_DISCORD_PRESENCE)
-        find_package(DiscordRPC)
-    endif()
-
-    if (ENABLE_CUBEB)
-        find_package(cubeb)
-    endif()
-
-    if (YUZU_TESTS OR DYNARMIC_TESTS)
-        find_package(Catch2)
-    endif()
+if (YUZU_TESTS OR DYNARMIC_TESTS)
+    find_package(Catch2)
 endif()

 # Qt stuff
@@ -697,14 +656,9 @@ if (ENABLE_QT)
    set(QT_MAJOR_VERSION 6)
    # Qt6 sets cxx_std_17 and we need to undo that
    set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
-
-    ## Qt Externals ##
-
-    # QuaZip
-    AddJsonPackage(quazip)
 endif()

-if (NOT YUZU_STATIC_ROOM AND NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
+if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
    # Use system installed FFmpeg
    find_package(FFmpeg REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})

@@ -41,11 +41,6 @@ function(cpm_utils_message level name message)
    message(${level} "[CPMUtil] ${name}: ${message}")
 endfunction()

-# propagate a variable to parent scope
-macro(Propagate var)
-    set(${var} ${${var}} PARENT_SCOPE)
-endmacro()
-
 function(array_to_list array length out)
    math(EXPR range "${length} - 1")

@@ -77,159 +72,6 @@ function(get_json_element object out member default)
    set("${out}" "${outvar}" PARENT_SCOPE)
 endfunction()

-# Determine whether or not a package has a viable system candidate.
-function(SystemPackageViable JSON_NAME)
-    string(JSON object GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
-
-    parse_object(${object})
-
-    string(REPLACE " " ";" find_args "${find_args}")
-    find_package(${package} ${version} ${find_args} QUIET NO_POLICY_SCOPE)
-
-    set(${pkg}_VIABLE ${${package}_FOUND} PARENT_SCOPE)
-    set(${pkg}_PACKAGE ${package} PARENT_SCOPE)
-endfunction()
-
-# Add several packages such that if one is bundled,
-# all the rest must also be bundled.
-function(AddDependentPackages)
-    set(_some_system OFF)
-    set(_some_bundled OFF)
-
-    foreach(pkg ${ARGN})
-        SystemPackageViable(${pkg})
-
-        if (${pkg}_VIABLE)
-            set(_some_system ON)
-            list(APPEND _system_pkgs ${${pkg}_PACKAGE})
-        else()
-            set(_some_bundled ON)
-            list(APPEND _bundled_pkgs ${${pkg}_PACKAGE})
-        endif()
-    endforeach()
-
-    if (_some_system AND _some_bundled)
-        foreach(pkg ${ARGN})
-            list(APPEND package_names ${${pkg}_PACKAGE})
-        endforeach()
-
-        string(REPLACE ";" ", " package_names "${package_names}")
-        string(REPLACE ";" ", " bundled_names "${_bundled_pkgs}")
-        foreach(sys ${_system_pkgs})
-            list(APPEND system_names ${sys}_FORCE_BUNDLED)
-        endforeach()
-
-        string(REPLACE ";" ", " system_names "${system_names}")
-
-        message(FATAL_ERROR "Partial dependency installation detected "
-            "for the following packages:\n${package_names}\n"
-            "You can solve this in one of two ways:\n"
-            "1. Install the following packages to your system if available:"
-            "\n\t${bundled_names}\n"
-            "2. Set the following variables to ON:"
-            "\n\t${system_names}\n"
-            "This may also be caused by a version mismatch, "
-            "such as one package being newer than the other.")
-    endif()
-
-    foreach(pkg ${ARGN})
-        AddJsonPackage(${pkg})
-    endforeach()
-endfunction()
-
-# json util
-macro(parse_object object)
-    get_json_element("${object}" package package ${JSON_NAME})
-    get_json_element("${object}" repo repo "")
-    get_json_element("${object}" ci ci OFF)
-    get_json_element("${object}" version version "")
-
-    if(ci)
-        get_json_element("${object}" name name "${JSON_NAME}")
-        get_json_element("${object}" extension extension "tar.zst")
-        get_json_element("${object}" min_version min_version "")
-        get_json_element("${object}" raw_disabled disabled_platforms "")
-
-        if(raw_disabled)
-            array_to_list("${raw_disabled}"
-                ${raw_disabled_LENGTH} disabled_platforms)
-        else()
-            set(disabled_platforms "")
-        endif()
-    else()
-        get_json_element("${object}" hash hash "")
-        get_json_element("${object}" hash_suffix hash_suffix "")
-        get_json_element("${object}" sha sha "")
-        get_json_element("${object}" url url "")
-        get_json_element("${object}" key key "")
-        get_json_element("${object}" tag tag "")
-        get_json_element("${object}" artifact artifact "")
-        get_json_element("${object}" git_version git_version "")
-        get_json_element("${object}" git_host git_host "")
-        get_json_element("${object}" source_subdir source_subdir "")
-        get_json_element("${object}" bundled bundled "unset")
-        get_json_element("${object}" find_args find_args "")
-        get_json_element("${object}" raw_patches patches "")
-
-        # okay here comes the fun part: REPLACEMENTS!
-        # first: tag gets %VERSION% replaced if applicable,
-        #   with either git_version (preferred) or version
-        # second: artifact gets %VERSION% and %TAG% replaced
-        #   accordingly (same rules for VERSION)
-
-        if(git_version)
-            set(version_replace ${git_version})
-        else()
-            set(version_replace ${version})
-        endif()
-
-        # TODO(crueter): fmt module for cmake
-        if(tag)
-            string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
-        endif()
-
-        if(artifact)
-            string(REPLACE "%VERSION%" "${version_replace}"
-                artifact ${artifact})
-            string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
-        endif()
-
-        # format patchdir
-        if(raw_patches)
-            math(EXPR range "${raw_patches_LENGTH} - 1")
-
-            foreach(IDX RANGE ${range})
-                string(JSON _patch GET "${raw_patches}" "${IDX}")
-
-                set(full_patch
-                    "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
-                if(NOT EXISTS ${full_patch})
-                    cpm_utils_message(FATAL_ERROR ${JSON_NAME}
-                        "specifies patch ${full_patch} which does not exist")
-                endif()
-
-                list(APPEND patches "${full_patch}")
-            endforeach()
-        endif()
-        # end format patchdir
-
-        # options
-        get_json_element("${object}" raw_options options "")
-
-        if(raw_options)
-            array_to_list("${raw_options}" ${raw_options_LENGTH} options)
-        endif()
-
-        set(options ${options} ${JSON_OPTIONS})
-        # end options
-
-        # system/bundled
-        if(bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
-            set(bundled ${JSON_BUNDLED_PACKAGE})
-        endif()
-    endif()
-endmacro()
-
 # The preferred usage
 function(AddJsonPackage)
    set(oneValueArgs
@@ -238,8 +80,7 @@ function(AddJsonPackage)
        # these are overrides that can be generated at runtime,
        # so can be defined separately from the json
        DOWNLOAD_ONLY
-        BUNDLED_PACKAGE
-        FORCE_BUNDLED_PACKAGE)
+        BUNDLED_PACKAGE)

    set(multiValueArgs OPTIONS)

@@ -270,9 +111,24 @@ function(AddJsonPackage)
        cpm_utils_message(FATAL_ERROR ${JSON_NAME} "Not found in cpmfile")
    endif()

-    parse_object(${object})
+    get_json_element("${object}" package package ${JSON_NAME})
+    get_json_element("${object}" repo repo "")
+    get_json_element("${object}" ci ci OFF)
+    get_json_element("${object}" version version "")

    if(ci)
+        get_json_element("${object}" name name "${JSON_NAME}")
+        get_json_element("${object}" extension extension "tar.zst")
+        get_json_element("${object}" min_version min_version "")
+        get_json_element("${object}" raw_disabled disabled_platforms "")
+
+        if(raw_disabled)
+            array_to_list("${raw_disabled}"
+                ${raw_disabled_LENGTH} disabled_platforms)
+        else()
+            set(disabled_platforms "")
+        endif()
+
        AddCIPackage(
            VERSION ${version}
            NAME ${name}
@@ -282,38 +138,116 @@ function(AddJsonPackage)
            MIN_VERSION ${min_version}
            DISABLED_PLATFORMS ${disabled_platforms})

-    else()
-        if (NOT DEFINED JSON_FORCE_BUNDLED_PACKAGE)
-            set(JSON_FORCE_BUNDLED_PACKAGE OFF)
-        endif()
+        # pass stuff to parent scope
+        set(${package}_ADDED "${${package}_ADDED}"
+            PARENT_SCOPE)
+        set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}"
+            PARENT_SCOPE)
+        set(${package}_BINARY_DIR "${${package}_BINARY_DIR}"
+            PARENT_SCOPE)

-        AddPackage(
-            NAME "${package}"
-            VERSION "${version}"
-            URL "${url}"
-            HASH "${hash}"
-            HASH_SUFFIX "${hash_suffix}"
-            SHA "${sha}"
-            REPO "${repo}"
-            KEY "${key}"
-            PATCHES "${patches}"
-            OPTIONS "${options}"
-            FIND_PACKAGE_ARGUMENTS "${find_args}"
-            BUNDLED_PACKAGE "${bundled}"
-            FORCE_BUNDLED_PACKAGE "${JSON_FORCE_BUNDLED_PACKAGE}"
-            SOURCE_SUBDIR "${source_subdir}"
-
-            GIT_VERSION ${git_version}
-            GIT_HOST ${git_host}
-
-            ARTIFACT ${artifact}
-            TAG ${tag})
+        return()
    endif()

+    get_json_element("${object}" hash hash "")
+    get_json_element("${object}" hash_suffix hash_suffix "")
+    get_json_element("${object}" sha sha "")
+    get_json_element("${object}" url url "")
+    get_json_element("${object}" key key "")
+    get_json_element("${object}" tag tag "")
+    get_json_element("${object}" artifact artifact "")
+    get_json_element("${object}" git_version git_version "")
+    get_json_element("${object}" git_host git_host "")
+    get_json_element("${object}" source_subdir source_subdir "")
+    get_json_element("${object}" bundled bundled "unset")
+    get_json_element("${object}" find_args find_args "")
+    get_json_element("${object}" raw_patches patches "")
+
+    # okay here comes the fun part: REPLACEMENTS!
+    # first: tag gets %VERSION% replaced if applicable,
+    #   with either git_version (preferred) or version
+    # second: artifact gets %VERSION% and %TAG% replaced
+    #   accordingly (same rules for VERSION)
+
+    if(git_version)
+        set(version_replace ${git_version})
+    else()
+        set(version_replace ${version})
+    endif()
+
+    # TODO(crueter): fmt module for cmake
+    if(tag)
+        string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
+    endif()
+
+    if(artifact)
+        string(REPLACE "%VERSION%" "${version_replace}" artifact ${artifact})
+        string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
+    endif()
+
+    # format patchdir
+    if(raw_patches)
+        math(EXPR range "${raw_patches_LENGTH} - 1")
+
+        foreach(IDX RANGE ${range})
+            string(JSON _patch GET "${raw_patches}" "${IDX}")
+
+            set(full_patch
+                "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
+            if(NOT EXISTS ${full_patch})
+                cpm_utils_message(FATAL_ERROR ${JSON_NAME}
+                    "specifies patch ${full_patch} which does not exist")
+            endif()
+
+            list(APPEND patches "${full_patch}")
+        endforeach()
+    endif()
+    # end format patchdir
+
+    # options
+    get_json_element("${object}" raw_options options "")
+
+    if(raw_options)
+        array_to_list("${raw_options}" ${raw_options_LENGTH} options)
+    endif()
+
+    set(options ${options} ${JSON_OPTIONS})
+    # end options
+
+    # system/bundled
+    if(bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
+        set(bundled ${JSON_BUNDLED_PACKAGE})
+    endif()
+
+    AddPackage(
+        NAME "${package}"
+        VERSION "${version}"
+        URL "${url}"
+        HASH "${hash}"
+        HASH_SUFFIX "${hash_suffix}"
+        SHA "${sha}"
+        REPO "${repo}"
+        KEY "${key}"
+        PATCHES "${patches}"
+        OPTIONS "${options}"
+        FIND_PACKAGE_ARGUMENTS "${find_args}"
+        BUNDLED_PACKAGE "${bundled}"
+        SOURCE_SUBDIR "${source_subdir}"
+
+        GIT_VERSION ${git_version}
+        GIT_HOST ${git_host}
+
+        ARTIFACT ${artifact}
+        TAG ${tag})
+
    # pass stuff to parent scope
-    Propagate(${package}_ADDED)
-    Propagate(${package}_SOURCE_DIR)
-    Propagate(${package}_BINARY_DIR)
+    set(${package}_ADDED "${${package}_ADDED}"
+        PARENT_SCOPE)
+    set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}"
+        PARENT_SCOPE)
+    set(${package}_BINARY_DIR "${${package}_BINARY_DIR}"
+        PARENT_SCOPE)
+
 endfunction()

 function(AddPackage)
@@ -409,7 +343,7 @@ function(AddPackage)

            if(DEFINED PKG_ARGS_ARTIFACT)
                set(pkg_url
-                    "${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT}")
+                    ${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT})
            else()
                set(pkg_url
                    ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
@@ -691,8 +625,7 @@ function(AddCIPackage)
    endif()

    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
-        set(ARTIFACT
-            "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")
+        set(ARTIFACT "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")

        AddPackage(
            NAME ${ARTIFACT_PACKAGE}
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
@@ -15,40 +15,27 @@ endfunction()
 get_timestamp(BUILD_DATE)

 if (DEFINED GIT_RELEASE)
-    set(BUILD_VERSION "${GIT_TAG}")
-    set(GIT_REFSPEC "${GIT_RELEASE}")
-    set(IS_DEV_BUILD false)
+  set(BUILD_VERSION "${GIT_TAG}")
+  set(GIT_REFSPEC "${GIT_RELEASE}")
+  set(IS_DEV_BUILD false)
 else()
-    string(SUBSTRING ${GIT_COMMIT} 0 10 BUILD_VERSION)
-    set(BUILD_VERSION "${BUILD_VERSION}-${GIT_REFSPEC}")
-    set(IS_DEV_BUILD true)
-endif()
-
-if (NIGHTLY_BUILD)
-    set(IS_NIGHTLY_BUILD true)
-else()
-    set(IS_NIGHTLY_BUILD false)
+  string(SUBSTRING ${GIT_COMMIT} 0 10 BUILD_VERSION)
+  set(BUILD_VERSION "${BUILD_VERSION}-${GIT_REFSPEC}")
+  set(IS_DEV_BUILD true)
 endif()

 set(GIT_DESC ${BUILD_VERSION})

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

+# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
+set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
+set(BUILD_AUTO_UPDATE_API "http://api.github.com")
+set(BUILD_AUTO_UPDATE_REPO "eden-emulator/Releases")
+
 configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)
@@ -12,12 +12,14 @@
        "repo": "boostorg/boost",
        "tag": "boost-%VERSION%",
        "artifact": "%TAG%-cmake.tar.xz",
-        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
-        "git_version": "1.90.0",
+        "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
+        "git_version": "1.89.0",
        "version": "1.57",
        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
        "patches": [
-            "0001-clang-cl.patch"
+            "0001-clang-cl.patch",
+            "0002-use-marmasm.patch",
+            "0003-armasm-options.patch"
        ]
    },
    "fmt": {
@@ -46,9 +48,9 @@
        "package": "ZLIB",
        "repo": "madler/zlib",
        "tag": "v%VERSION%",
-        "hash": "06eaa3a1eaaeb31f461a2283b03a91ed8eb2406e62cd97ea1c69836324909edeecd93edd03ff0bf593d9dde223e3376149134c5b1fe2e8688c258cadf8cd60ff",
+        "hash": "8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088",
        "version": "1.2",
-        "git_version": "1.3.1.2",
+        "git_version": "1.3.1",
        "options": [
            "ZLIB_BUILD_SHARED OFF",
            "ZLIB_INSTALL OFF"
@@ -67,17 +69,13 @@
    },
    "opus": {
        "package": "Opus",
-        "repo": "xiph/opus",
-        "sha": "a3f0ec02b3",
-        "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
+        "repo": "crueter/opus",
+        "sha": "ab19c44fad",
+        "hash": "d632e8f83c5d3245db404bcb637113f9860bf16331498ba2c8e77979d1febee6b52d8b1da448e7d54eeac373e912cd55e3e300fc6c242244923323280dc43fbe",
        "version": "1.3",
        "find_args": "MODULE",
        "options": [
            "OPUS_PRESUME_NEON ON"
-        ],
-        "patches": [
-            "0001-disable-clang-runtime-neon.patch",
-            "0002-no-install.patch"
        ]
    },
    "boost_headers": {
@@ -101,18 +99,5 @@
        "git_version": "1.4.335.0",
        "artifact": "android-binaries-%VERSION%.zip",
        "hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
-    },
-    "quazip": {
-        "package": "QuaZip-Qt6",
-        "repo": "stachenov/quazip",
-        "sha": "2e95c9001b",
-        "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
-        "version": "1.3",
-        "git_version": "1.5",
-        "options": [
-            "QUAZIP_QT_MAJOR_VERSION 6",
-            "QUAZIP_INSTALL OFF",
-            "QUAZIP_ENABLE_QTEXTCODEC OFF"
-        ]
    }
 }
@@ -6,11 +6,9 @@
 This is a full-fledged guide to build Eden on all supported platforms.

 ## Dependencies
-
 First, you must [install some dependencies](Deps.md).

 ## Clone
-
 Next, you will want to clone Eden via the terminal:

 ```sh
@@ -55,35 +53,30 @@ Hit "Configure Project", then wait for CMake to finish configuring (may take a w

 > [!WARNING]
 >For all systems:
->
 >- *CMake* **MUST** be in your PATH (and also *ninja*, if you are using it as `<GENERATOR>`)
 >- You *MUST* be in the cloned *Eden* directory
 >
 >On Windows:
->
-> - It's recommended to install **[Ninja](https://ninja-build.org/)**
-> - You must load **Visual C++ development environment**, this can be done by running our convenience script:
->   - `tools/windows/load-msvc-env.ps1` (for PowerShell 5+)
->   - `tools/windows/load-msvc-env.sh` (for MSYS2, Git Bash, etc)
+>  - It's recommended to install **[Ninja](https://ninja-build.org/)**
+>  - You must load **Visual C++ development environment**, this can be done by running our convenience script:
+>    - `tools/windows/load-msvc-env.ps1` (for PowerShell 5+)
+>    - `tools/windows/load-msvc-env.sh` (for MSYS2, Git Bash, etc)

 Available `<GENERATOR>`:
-
 - MSYS2: `MSYS Makefiles`
 - MSVC: `Ninja` (preferred) or `Visual Studio 17 2022`
 - macOS: `Ninja` (preferred) or `Xcode`
 - Others: `Ninja` (preferred) or `UNIX Makefiles`

 Available `<BUILD_TYPE>`:
-
 - `Release` (default)
 - `RelWithDebInfo` (debug symbols--compiled executable will be large)
 - `Debug` (if you are using a debugger and annoyed with stuff getting optimized out)

 Caveat for Debug Builds:
-
 - If you're building with CCache, you will need to add the environment variable `CL` with the `/FS` flag ([Reference](https://learn.microsoft.com/pt-br/cpp/build/reference/fs-force-synchronous-pdb-writes?view=msvc-170))

-Also see the root CMakeLists.txt for more build options. Usually the default will provide the best experience, however.
+Also see the [Options](Options.md) page for additional CMake options.

 ```sh
 cmake -S . -B build -G "<GENERATOR>" -DCMAKE_BUILD_TYPE=<BUILD_TYPE> -DYUZU_TESTS=OFF
@@ -102,7 +95,7 @@ cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COM
 <details>
 <summary>Click to Open</summary>

- Clone the Repository:
+* Clone the Repository:

 <img src="https://user-images.githubusercontent.com/42481638/216899046-0d41d7d6-8e4d-4ed2-9587-b57088af5214.png" width="500">
 <img src="https://user-images.githubusercontent.com/42481638/216899061-b2ea274a-e88c-40ae-bf0b-4450b46e9fea.png" width="500">
@@ -112,26 +105,26 @@ cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COM

 ### Building & Setup

- Once Cloned, You will be taken to a prompt like the image below:
+* Once Cloned, You will be taken to a prompt like the image below:

 <img src="https://user-images.githubusercontent.com/42481638/216899092-3fe4cec6-a540-44e3-9e1e-3de9c2fffc2f.png" width="500">

- Set the settings to the image below:
- Change `Build type: Release`
- Change `Name: Release`
- Change `Toolchain Visual Studio`
- Change `Generator: Let CMake decide`
- Change `Build directory: build`
+* Set the settings to the image below:
+* Change `Build type: Release`
+* Change `Name: Release`
+* Change `Toolchain Visual Studio`
+* Change `Generator: Let CMake decide`
+* Change `Build directory: build`

 <img src="https://user-images.githubusercontent.com/42481638/216899164-6cee8482-3d59-428f-b1bc-e6dc793c9b20.png" width="500">

- Click OK; now Clion will build a directory and index your code to allow for IntelliSense. Please be patient.
- Once this process has been completed (No loading bar bottom right), you can now build eden
- In the top right, click on the drop-down menu, select all configurations, then select eden
+* Click OK; now Clion will build a directory and index your code to allow for IntelliSense. Please be patient.
+* Once this process has been completed (No loading bar bottom right), you can now build eden
+* In the top right, click on the drop-down menu, select all configurations, then select eden

 <img src="https://user-images.githubusercontent.com/42481638/216899226-975048e9-bc6d-4ec1-bc2d-bd8a1e15ed04.png" height="500" >

- Now run by clicking the play button or pressing Shift+F10, and eden will auto-launch once built.
+* Now run by clicking the play button or pressing Shift+F10, and eden will auto-launch once built.

 <img src="https://user-images.githubusercontent.com/42481638/216899275-d514ec6a-e563-470e-81e2-3e04f0429b68.png" width="500">
 </details>
@@ -139,7 +132,6 @@ cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COM
 ## Troubleshooting

 If your initial configure failed:
-
 - *Carefully* re-read the [dependencies guide](Deps.md)
 - Clear the CPM cache (`.cache/cpm`) and CMake cache (`<build directory>/CMakeCache.txt`)
 - Evaluate the error and find any related settings
@@ -161,16 +153,20 @@ Simply hit Ctrl+B, or the "hammer" icon in the bottom left. To run, hit the "pla

 If you are using the `UNIX Makefiles` or `Visual Studio 17 2022` as `<GENERATOR>`, you should also add `--parallel` for faster build times.

-```sh
+```
 cmake --build build
 ```

 Your compiled executable will be in:
-
 - `build/bin/eden.exe` for Windows,
 - `build/bin/eden.app/Contents/MacOS/eden` for macOS,
 - and `build/bin/eden` for others.

 ## Scripts

-Take a look at our [CI scripts](https://github.com/Eden-CI/Workflow). You can use `.ci/common/configure.sh` on any POSIX-compliant shell, but you are heavily encouraged to instead write your own based. It's not really that hard, provided you can read CMake.
+Some platforms have convenience scripts provided for building.
+
+- **[Linux](scripts/Linux.md)**
+- **[Windows](scripts/Windows.md)**
+
+macOS scripts will come soon.
@@ -18,7 +18,7 @@
 src/web_service      @AleksandrPopovich
 src/dynarmic         @Lizzie
 src/core             @Lizzie @Maufeat @PavelBARABANOV @MrPurple666 @JPikachu
-src/core/hle         @Maufeat @PavelBARABANOV
+src/core/hle         @Maufeat @PavelBARABANOV @SDK-Chan
 src/core/arm         @Lizzie @MrPurple666
 src/*_room           @AleksandrPopovich
 src/video_core       @CamilleLaVey @MaranBr @Wildcard @weakboson
@@ -1,41 +0,0 @@
-# AddDependentPackage
-
-Use `AddDependentPackage` when you have multiple packages that are required to all be from the system, OR bundled. This is useful in cases where e.g. versions must absolutely match.
-
-## Versioning
-
-Versioning must be handled by the package itself.
-
-## Examples
-
-### Vulkan
-
-`cpmfile.json`
-
-```json
-{
-    "vulkan-headers": {
-        "repo": "KhronosGroup/Vulkan-Headers",
-        "package": "VulkanHeaders",
-        "version": "1.4.317",
-        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    },
-    "vulkan-utility-libraries": {
-        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "package": "VulkanUtilityLibraries",
-        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    }
-}
-```
-
-`CMakeLists.txt`:
-
-```cmake
-AddDependentPackages(vulkan-headers vulkan-utility-libraries)
-```
-
-If Vulkan Headers are installed, but NOT Vulkan Utility Libraries, then CPMUtil will throw an error.
@@ -31,10 +31,6 @@ The core of CPMUtil is the [`AddPackage`](./AddPackage.md) function. [`AddPackag

 [`AddJsonPackage`](./AddJsonPackage.md) is the recommended method of usage for CPMUtil.

-## AddDependentPackage
-
-[`AddDependentPackage`](./AddDependentPackage.md) allows you to add multiple packages such that all of them must be from the system OR bundled.
-
 ## AddQt

 [`AddQt`](./AddQt.md) adds a specific version of Qt to your project.
@@ -85,8 +85,6 @@ If you have `quazip1_qt6_devel`, uninstall it. It may call `Core5Compat` on CMak

 ## OpenBSD

-System boost doesn't have `context` (as of 7.8); so you may need to specify `-DYUZU_USE_CPM=ON -DBoost_FORCE_BUNDLED=ON`.
-
 After configuration, you may need to modify `externals/ffmpeg/CMakeFiles/ffmpeg-build/build.make` to use `-j$(nproc)` instead of just `-j`.

 `-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.
@@ -11,7 +11,6 @@ Simply put, types/classes are named as `PascalCase`, same for methods and functi
 Except for Qt MOC where `functionName` is preferred.

 Template typenames prefer short names like `T`, `I`, `U`, if a longer name is required either `Iterator` or `perform_action` are fine as well. Do not use names like `SS` as systems like solaris define it for registers, in general do not use any of the following for short names:
-
 - `SS`, `DS`, `GS`, `FS`: Segment registers, defined by Solaris `<ucontext.h>`
 - `EAX`, `EBX`, `ECX`, `EDX`, `ESI`, `EDI`, `ESP`, `EBP`, `EIP`: Registers, defined by Solaris.
 - `X`: Defined by some utility headers, avoid.
@@ -28,7 +27,6 @@ Try not using hungarian notation, if you're able.
 Formatting is extremelly lax, the general rule of thumb is: Don't add new lines just to increase line count. The less lines we have to look at, the better. This means also packing densely your code while not making it a clusterfuck. Strike a balance of "this is a short and comprehensible piece of code" and "my eyes are actually happy to see this!". Don't just drop the entire thing in a single line and call it "dense code", that's just spaghetti posing as code. In general, be mindful of what other devs need to look at.

 Do not put if/while/etc braces after lines:
-
 ```c++
 // no dont do this
 // this is more lines of code for no good reason (why braces need their separate lines?)
@@ -107,7 +105,6 @@ device = SDL_OpenAudioDevice(device_name.empty() ? nullptr : device_name.c_str()
 ```

 A note about operators: Use them sparingly, yes, the language is lax on them, but some usages can be... tripping to say the least.
-
 ```c++
 a, b, c; //<-- NOT OK multiple statments with comma operator is definitely a recipe for disaster
 return c ? a : b; //<-- OK ternaries at end of return statments are clear and fine
@@ -277,7 +277,7 @@ For NetBSD +10.1: `pkgin install git cmake boost fmtlib SDL2 catch2 libjwt spirv

 ```sh
 pkg_add -u
-pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl2 libusb1-1.0.29
+pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake llvm-19.1.7p3 qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl2 libusb1-1.0.27
 ```

 [Caveats](./Caveats.md#openbsd).
@@ -82,15 +82,15 @@ You may additionally need the `Qt Extension Pack` extension if building Qt.

 # Build speedup

-If you have an HDD, use ramdisk (build in RAM), approximatedly you need 4GB for a full build with debug symbols:
+If you have an HDD, use ramdisk (build in RAM):
 ```sh
-mkdir /tmp/ramdisk
-chmod 777 /tmp/ramdisk
+sudo mkdir /tmp/ramdisk
+sudo chmod 777 /tmp/ramdisk
 # about 8GB needed
-mount -t tmpfs -o size=4G myramdisk /tmp/ramdisk
+sudo mount -t tmpfs -o size=8G myramdisk /tmp/ramdisk
 cmake -B /tmp/ramdisk
 cmake --build /tmp/ramdisk -- -j32
-umount /tmp/ramdisk
+sudo umount /tmp/ramdisk
 ```

 # Assets and large files
@@ -1,114 +0,0 @@
-# Driver bugs
-
-Non-exhaustive list of known drivers bugs.
-
-See also: [Dolphin emulator](hhttps://github.com/dolphin-emu/dolphin/blob/cdbea8867df3d0a6fc375e78726dae95612fb1fd/Source/Core/VideoCommon/DriverDetails.h#L84) own list of driver bugs (which are also included here).
-
-## Vulkan
-
-| Vendor/GPU | OS | Drivers | Version | Bug |
-|---|---|---|---|---|
-| AMD | All | Proprietary | ? | `VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT` on GCN4 and lower is broken. |
-| AMD | All | Proprietary | ? | GCN4 and earlier have broken `VK_EXT_sampler_filter_minmax`. |
-| AMD | All | Proprietary | ? | If offset + stride * count is greater than the size, then the last attribute will have the wrong value for vertex buffers. |
-| AMD | All | Proprietary | ? | On GCN, 2D mipmapped texture arrays (with width == height) where there are more than 6 layers causes broken corrupt mipmaps. |
-| AMD | All | RADV, MESA | ? | Using LLVM emitter causes corrupt FP16, proprietary drivers unaffected. |
-| AMD | All | Proprietary | ? | Incorrect implementation of VK_EXT_depth_clamp_control causes incorrect depth values to be written to the depth buffer. |
-| AMD | macOS | Proprietary | ? | `gl_HelperInvocation` is actually `!gl_HelperInvocation`. |
-| NVIDIA | All | Proprietary | ? | Drivers for ampere and newer have broken float16 math. |
-| NVIDIA | All | Proprietary | >=510.0.0 | Versions >= 510 do not support MSAA->MSAA image blits. |
-| NVIDIA | All | Proprietary | ? | Shader stencil export not supported. |
-| NVIDIA | All | Proprietary | ? | Doesn't properly support conditional barriers. |
-| NVIDIA | All | Proprietary | ? | GPUs pre-turing doesn't properly work with push descriptors. |
-| NVIDIA | All | All | ? | Calling `vkCmdClearAttachments` with a partial rect, or specifying a render area in a render pass with the load op set to clear can cause the GPU to lock up, or raise a bounds violation. This only occurs on MSAA framebuffers, and it seems when there are multiple clears in a single command buffer. Worked around by back to the slow path (drawing quads) when MSAA is enabled. |
-| Intel | All | Proprietary | <27.20.100.0 | Intel Windows versions before 27.20.100.0 has broken `VK_EXT_vertex_input_dynamic_state`. |
-| Intel | All | Proprietary | ? | Intel proprietary drivers do not support MSAA->MSAA image blits. |
-| Intel | All | Proprietary | 0.405.0<br>until<br>0.405.286 | Intel proprietary drivers 0.405.0 until 0.405.286 have broken compute. |
-| Intel | macOS | Proprietary | ? | Using dynamic sampler indexing locks up the GPU. |
-| Intel | macOS | Proprietary | ? | Using subgroupMax in a shader that can discard results in garbage data. |
-| Intel | All | Mesa | ? | Broken lines in geometry shaders when writing to `gl_ClipDistance` in the vertex shader. |
-| Qualcomm | All | Proprietary | ? | Using too many samplers (on A8XX is `65536`) can cause heap exhaustion, recommended to use 75% of total available samplers. |
-| Qualcomm | All | Proprietary | ? | Qualcomm Adreno GPUs doesn't handle scaled vertex attributes `VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME`. |
-| Qualcomm | All | Proprietary | ? | 64-bit integer extensions (`VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME`) cause nondescriptive crashes and stability issues. |
-| Qualcomm | All | All | ? | Driver requires higher-than-reported binding limits (32). |
-| Qualcomm | All | All | ? | On Adreno, enabling rasterizer discard somehow corrupts the viewport state; a workaround is forcing it to be updated on next use. |
-| Qualcomm | All | Proprietary | ? | Concurrent fence waits are unsupported. |
-| Qualcomm | All | Proprietary | ? | `vkCmdCopyImageToBuffer` allocates a staging image when used to copy from an image with optimal tiling; which results in overall slower performance. |
-| Qualcomm | All | Proprietary | ? | 32-bit depth clears are broken in the Adreno Vulkan driver, and have no effect. |
-| Qualcomm | All | Proprietary | ? | It should be safe to release the resources before actually resetting the VkCommandPool. However, devices running R drivers there was a few months period where the driver had a bug which it incorrectly was accessing objects on the command buffer while it was being reset. If these objects were already destroyed (which is a valid thing to do) it would crash. |
-| Qualcomm | All | Proprietary | ? | On Pixel and Pixel2XL's with Adreno 530 and 540s, setting width and height to 10s reliably triggers what appears to be a driver race condition. |
-| Qualcomm | All | Proprietary | ? | Non-descriptive broken OpPhi SPIRV lowering, originally using OpPhi to choose the result is crashing on Adreno 4xx. Switched to storing the result in a temp variable as glslang does. |
-| Qualcomm | All | Proprietary | ? | See crbug.com/1241134. The bug appears on Adreno 5xx devices with OS PQ3A. It does not repro on the earlier PPR1 version since the extend blend func extension was not present on the older driver. |
-| Mali | Android | Proprietary | ? | Non-descriptive green screen on various locations. |
-| Mali | Android | Proprietary | ? | Cached memory is significantly slower for readbacks than coherent memory in the Mali Vulkan driver, causing high CPU usage in the `__pi___inval_cache_range` kernel function. |
-| Mali | Android | Proprietary | ? | On some old ARM driver versions, dynamic state for stencil write mask doesn't work correctly in the presence of discard or alpha to coverage, if the static state provided when creating the pipeline has a value of 0 (`alphaToCoverageEnable` and `rasterizerDiscardEnable`). |
-| Mali | Android | Proprietary | ? | Failing to submit because of a device loss still needs to wait for the fence to signal before deleting. However, there is an ARM bug (b/359822580) where the driver early outs on the fence wait if in a device lost state and thus we can't wait on it. Instead,  we just wait on the queue to finish. |
-| Mali | Android | Proprietary | ? | With Galaxy S7 we see lots of rendering issues when we suballocate VkImages. |
-| Mali | Android | Proprietary | ? | With Galaxy S7 and S9 we see lots of rendering issues with image filters dropping out when using only primary command buffers. We also see issues on the P30 running Android 28. |
-| Mali | Android | Proprietary | ? | `RGBA_F32` mipmaps appear to be broken on some Mali devices. |
-| Mali | Android | Proprietary | ? | Matrix IR lowering for matrix swizzle, scalar multiplication and unary `(+m)`/`(-m)` present extraneous unexplained bugs with more than 32 matrix temporals. |
-| Apple | All | MoltenVK | ? | Driver breaks when using more than 16 vertex attributes/bindings. |
-| Apple | macOS | Proprietary | >4 | Some driver and Apple Silicon GPU combinations have problems with fragment discard when early depth test is enabled. Discarded fragments may appear corrupted. |
-| Apple | iOS | MoltenVK | ? | Null descriptors cause non-descriptive issues. |
-| Apple | iOS | MoltenVK | ? | Push descriptors cause non-descriptive issues. |
-| Imagination | Android | Proprietary | ? | Some vulkan implementations don't like the 'clear' loadop renderpass if you try to use a framebuffer with a different load/store op than that which it was created with, despite the spec saying they should be compatible. |
-| Intel<br>Qualcomm<br>AMD<br>Apple | All | All<br>MoltenVK (Apple) | ? | Reversed viewport depth range does not work as intended on some Vulkan drivers. The Vulkan spec allows the `minDepth`/`maxDepth` fields in the viewport to be reversed, however the implementation is broken on some drivers. |
-
-AMD: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_AMD_PROPRIETARY`
- OSS: `VK_DRIVER_ID_AMD_OPEN_SOURCE`
- MESA: `VK_DRIVER_ID_MESA_RADV`
-
-NVIDIA: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_NVIDIA_PROPRIETARY`.
- MESA: `VK_DRIVER_ID_MESA_NVK`.
-
-Intel: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS`.
- MESA: `VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA`.
-
-Qualcomm: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_QUALCOMM_PROPRIETARY`.
- MESA: `VK_DRIVER_ID_MESA_TURNIP`.
-
-Mali: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_ARM_PROPRIETARY`.
- MESA: `VK_DRIVER_ID_MESA_PANVK`.
-
-Samsung: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_SAMSUNG_PROPRIETARY`.
-
-Apple: List of driver IDs:
- MoltenVK/MVK: `VK_DRIVER_ID_MOLTENVK`.
- KosmicKrisp: `VK_DRIVER_ID_MESA_KOSMICKRISP`.
- HoneyKrisp: `VK_DRIVER_ID_MESA_HONEYKRISP`.
-
-PowerVR: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_IMAGINATION_PROPRIETARY`.
- MESA: `VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA`.
-
-Software Rasterizers: List of driver IDs:
- SwiftShader: `VK_DRIVER_ID_GOOGLE_SWIFTSHADER`.
- LLVMPipe: `VK_DRIVER_ID_MESA_LLVMPIPE`.
-
-Broadcom: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_BROADCOM_PROPRIETARY`.
- MESA: `VK_DRIVER_ID_MESA_V3DV`.
-
-Verisilicon: List of driver IDs:
- Proprietary: `VK_DRIVER_ID_VERISILICON_PROPRIETARY`.
-
-Other: List of driver IDs:
- SC: `VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN`.
- GGP (Stadia): `VK_DRIVER_ID_GGP_PROPRIETARY`.
- CoreAVI (Cars): `VK_DRIVER_ID_COREAVI_PROPRIETARY`.
- Juice (Remote GPU): `VK_DRIVER_ID_JUICE_PROPRIETARY`.
- Venus (Virtio GPU): `VK_DRIVER_ID_MESA_VENUS`.
- Dozen (Vulkan on DirectX): `VK_DRIVER_ID_MESA_DOZEN`.
-
-## OpenGL
-
-| Vendor/GPU | OS | Drivers | Version | Bug |
-|---|---|---|---|---|
-| All | Android | All | ? | In OpenGL, multi-threaded shader pre-compilation sometimes crashes. |
-| All | All | Mesa | ? | https://github.com/KhronosGroup/glslang/pull/2646 |
@@ -0,0 +1,68 @@
+# CMake Options
+
+To change these options, add `-DOPTION_NAME=NEWVALUE` to the command line.
+
+- On Qt Creator, go to Project -> Current Configuration
+
+Notes:
+- Defaults are marked per-platform.
+- "Non-UNIX" just means Windows/MSVC and Android (yes, macOS is UNIX
+- Android generally doesn't need to change anything; if you do, go to `src/android/app/build.gradle.kts`
+- To set a boolean variable to on, use `ON` for the value; to turn it off, use `OFF`
+- If a variable is mentioned as being e.g. "ON" for a specific platform(s), that means it is defaulted to OFF on others
+- TYPE is always boolean unless otherwise specified
+- Format:
+  * `OPTION_NAME` (TYPE DEFAULT) DESCRIPTION
+
+## Options
+
+- `YUZU_USE_CPM` (ON for non-UNIX) Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched. See the [CPM](CPM.md) and [Deps](Deps.md) docs for more info.
+- `ENABLE_WEB_SERVICE` (ON) Enable multiplayer service
+- `ENABLE_WIFI_SCAN` (OFF) Enable WiFi scanning (requires iw on Linux) - experimental
+- `YUZU_USE_BUNDLED_FFMPEG` (ON for non-UNIX) Download (Windows, Android) or build (UNIX) bundled FFmpeg
+- `ENABLE_CUBEB` (ON) Enables the cubeb audio backend
+- `YUZU_TESTS` (ON) Compile tests - requires Catch2
+- `YUZU_DOWNLOAD_ANDROID_VVL` (ON) Download validation layer binary for Android
+- `YUZU_ENABLE_LTO` (OFF) Enable link-time optimization
+  * Not recommended on Windows
+  * UNIX may be better off appending `-flto=thin` to compiler args
+- `YUZU_DOWNLOAD_TIME_ZONE_DATA` (ON) Always download time zone binaries
+  * Currently, build fails without this
+- `YUZU_USE_FASTER_LD` (ON) Check if a faster linker is available
+  * Only available on UNIX
+- `YUZU_USE_BUNDLED_MOLTENVK` (ON, macOS only) Download bundled MoltenVK lib)
+- `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS)
+- `ENABLE_OPENSSL` (ON for Linux and *BSD) Enable OpenSSL backend for the ssl service
+  * Always enabled if the web service is enabled
+- `YUZU_USE_BUNDLED_OPENSSL` (ON for MSVC) Download bundled OpenSSL build
+  * Always on for Android
+  * Unavailable on OpenBSD
+- `ENABLE_UPDATE_CHECKER` (OFF) Enable update checker for the Qt an Android frontends
+
+The following options are desktop only:
+- `ENABLE_SDL2` (ON) Enable the SDL2 desktop, audio, and input frontend (HIGHLY RECOMMENDED!)
+  * Unavailable on Android
+- `YUZU_USE_EXTERNAL_SDL2` (ON for non-UNIX) Compiles SDL2 from source
+- `YUZU_USE_BUNDLED_SDL2` (ON for MSVC) Download a prebuilt SDL2
+  * Unavailable on OpenBSD
+  * Only enabled if YUZU_USE_CPM and ENABLE_SDL2 are both ON
+- `ENABLE_LIBUSB` (ON) Enable the use of the libusb input frontend (HIGHLY RECOMMENDED)
+- `ENABLE_OPENGL` (ON) Enable the OpenGL graphics frontend
+  * Unavailable on Windows/ARM64 and Android
+- `ENABLE_QT` (ON) Enable the Qt frontend (recommended)
+- `ENABLE_QT_TRANSLATION` (OFF) Enable translations for the Qt frontend
+- `YUZU_USE_BUNDLED_QT` (ON for MSVC) Download bundled Qt binaries
+  * Note that using **system Qt** requires you to include the Qt CMake directory in `CMAKE_PREFIX_PATH`, e.g:
+    * `-DCMAKE_PREFIX_PATH=C:/Qt/6.9.0/msvc2022_64/lib/cmake/Qt6`
+- `YUZU_QT_MIRROR` (string) What mirror to use for downloading the bundled Qt libraries
+- `YUZU_USE_QT_MULTIMEDIA` (OFF) Use QtMultimedia for camera support
+- `YUZU_USE_QT_WEB_ENGINE` (OFF) Use QtWebEngine for web applet implementation (requires the huge QtWebEngine dependency; not recommended)
+- `USE_DISCORD_PRESENCE` (OFF) Enables Discord Rich Presence (Qt frontend only)
+- `YUZU_ROOM` (ON) Enable dedicated room functionality
+- `YUZU_ROOM_STANDALONE` (ON) Enable standalone room executable (eden-room)
+  * Requires `YUZU_ROOM`
+- `YUZU_CMD` (ON) Compile the SDL2 frontend (eden-cli) - requires SDL2
+- `YUZU_CRASH_DUMPS` Compile crash dump (Minidump) support"
+  * Currently only available on Windows and Linux
+
+See `src/dynarmic/CMakeLists.txt` for additional options--usually, these don't need changed
@@ -5,20 +5,13 @@ This contains documentation created by developers. This contains build instructi
 - **[General Build Instructions](Build.md)**
 - **[Cross Compiling](CrossCompile.md)**
 - **[Development Guidelines](Development.md)**
+- **[Coding guidelines](Coding.md)**
 - **[Dependencies](Deps.md)**
 - **[Debug Guidelines](./Debug.md)**
- **[CPM - CMake Package Manager](./CPMUtil)**
+- **[CPM - CMake Package Manager](CPMUtil.md)**
 - **[Platform-Specific Caveats](Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
 - **[User Handbook](./user)**
+- **[Release Policy](./ReleasePolicy.md)**
 - **[Dynarmic](./dynarmic)**
 - **[Cross compilation](./CrossCompile.md)**
- **[Driver Bugs](./DriverBugs.md)**
-
-## Policies
-
-Policies and information on development.
-
- **[AI and LLM Usage](./policies/AI.md)**
- **[Release Policy](./policies/Release.md)**
- **[Coding guidelines](./policies/Coding.md)**
@@ -0,0 +1,25 @@
+# Release Policy
+
+While releases are usually made at the discretion of the team, we feel that establishing a clearer guideline on how those come to be will help expectations when it comes to features and fixes per version.
+
+## Release candidates
+
+Every full release is *preceded* by at least, 3 release candidates. The reasoning is that each week of the month, there will be a release candidate, with the "4th one" being the final full release.
+
+The main expectation is that the release candidates bring both fixes and, sometimes, new features. But not guarantee a regression-free experience.
+
+The criteria for choosing a date for a release candidate is at discretion, or "perceived necesity" at any given time.
+
+## Full release
+
+A full release means there are *no major* leftover regressions, importantly this means that a grand portion of regressions found between release candidates are swept out before declaring a full release. This doesn't mean a full release is regression-free; but we do a best-effort approach to reduce them for end-users.
+
+The main expectation is that users can safely upgrade from a stable build to another, with no major regressions.
+
+## Snapshot/rolling release
+
+While we don't publish rolling releases, we are aware users may compile from source and/or provide binaries to master builds of the project.
+
+This is mostly fine since we keep master very stable from major hiccups. However sometimes bugs do slip between tests or reviews - so users are advised to keep that in mind.
+
+We advise that users also read git logs (`git log --oneline`) before recompiling to get a clearer picture of the changes given into the emulator.
@@ -1,107 +0,0 @@
-# AI Policy
-
-Use at your peril.
-
-AI is a *tool*, not a replacement or catch-all solution. It is generally okay at a few *very specific* use cases:
-
- Automation of tedious changes where you have already made the pattern clear and done the necessary groundwork.
- Conversion of code from one paradigm to another.
-
-For everything else, AI is subpar at best, and actively harmful at worst. In general, you are **heavily** encouraged to not use AI at all.
-
-## Why?
-
-AI is notorious for hallucinating facts out of thin air and sometimes outright lying to users. Additionally, code written by LLMs is often needlessly verbose and horrifically inefficient (not to mention the rather ridiculous level of over-commenting). The end result is often one of three things:
-
- Completely nonfunctional code
- Code that works, but is extraordinarily verbose or not nearly as efficient as it can be
- Code that works well and is written well, but solves a different problem than was intended, or solves the same problem but in a completely incorrect way that will break other things horribly.
-
-Human-written code will, without exception, always be of infinitely higher quality when properly researched and implemented by someone both familiar with the surrounding code and the programming language in use. LLMs may produce a "good enough" result, but this result is often subpar. Keep in mind: all code is held under a standard of excellence. If your code sucks, it will be rejected. AI-generated code just so happens to be a particularly sucky genre of code, and will thus be held to this same standard.
-
-On a lesser-known note, LLM outputs often contain unicode symbols such as emojis or the arrow symbol. Please don't put Unicode symbols in your code. It messes with many an IDE, and the three people viewing your code on Lynx will be very unhappy.
-
-**Learn to code**. It's worth it, we promise!
-
-## Acceptable Use
-
- As stated previously, AI is good in a few *very specific* cases. In these cases, it's usually fine to use AI, as long as you **explicitly provide notice that it was used**.
- Anything directly outside of the realm of the code written in your PR or patch is none of our business.
-  - This primarily covers research.
-  - However, we *still* strongly discourage this for the reasons mentioned above.
- Assistance with cleanups, and minor nitpicks/optimizations.
-  - This is still discouraged, but it's okay to occasionally use LLMs to catch any minor mistakes you made in your code.
- Debugging
-  - In general, LLMs are not good at debugging, but if you solve a bug you're facing with help from an AI, and said fix **works properly**, then that's fine.
-
-## Unacceptable Use
-
-Well, everything else. But here are a few examples:
-
- Commit messages
-  - LLMs are absolutely horrible at this. They are needlessly verbose, almost never catch the actual intent of the commit, and will almost always hallucinate false information about said changes.
-  - See the addendum for an example
- Solving problems
-  - Slapping a few files and a "please fix bug XYZ" into an LLM is a recipe for disaster that will pretty much never work.
- Fully AI-generated code
-  - This shouldn't need explaining. Do not do this under any circumstance, especially if you don't actually understand what's going on.
- Writing code based on pseudo-instructions
-  - If you don't know how to write code, don't. If you've figured out the root cause (preferably without feeding random files into an LLM) and actively know what's going on, provide information to other developers or friends of yours who have knowledge of the language and/or the codebase.
-
-## Addendum: Commit Messages
-
-The patchset for pull request [#3422](https://git.eden-emu.dev/eden-emu/eden/pulls/3422) was fed into several LLMs to generate a commit message. All of them sucked, and not a single one caught on to what the commit actually did. For example:
-
-```txt
-profile_manager: Refactor user deletion to use index instead of UUID
-
-This commit improves the user profile deletion flow in the following ways:
-
-1. **UI layer (ConfigureProfileManager)**:
-   - Replaces UUID-based deletion with index-based deletion
-   - Passes the selected row index from the tree view to the confirmation dialog
-   - Emits deleteUser(int index) signal from ConfigureProfileManagerDeleteDialog
-   - Removes lambda capture and std::function callback in favor of direct signal/slot connection
-
-2. **Delete dialog**:
-   - Changes SetInfo() signature to accept index instead of accept callback
-   - Stores index internally and emits it via deleteUser signal on acceptance
-
-3. **Core ProfileManager**:
-   - Refactors RemoveUser(UUID) → RemoveProfileAtIndex(index)
-   - Removes duplicated stable_partition + save logic from RemoveUser()
-   - Centralizes profile removal and save-file writing in RemoveProfileAtIndex()
-
-4. **Minor follow-up**:
-   - Adds profile_manager.ResetUserSaveFile() call in PopulateUserList() to ensure consistent state when refreshing the user list
-
-These changes eliminate redundant code, reduce the risk of UUID → index mismatch bugs, and make the deletion path more straightforward and maintainable.
-
-Fixes: potential inconsistency when user order changes between UI and backend
-```
-
-This is:
-
- Needlessly verbose (nobody cares about most of these details)
- Doesn't address the actual purpose of the PR (fixing a double-deletion bug in the profile manager)
- Has unicode arrows
- Uses overly corporate and, well, robotic language
-
-As another example:
-
-```txt
-profile(manager/ui): switch to index-based deletion and unify removal logic
-
- Make ConfigureProfileManagerDeleteDialog emit a deleteUser(int) signal instead of taking a callback. Store the target index in the dialog (m_index) and emit it on acceptance.
- Change ConfigureProfileManager to pass an index to SetInfo and to accept an index in DeleteUser. Wire the dialog signal to the new DeleteUser slot.
- Update headers: add the signal and m_index, add TODO to move dialog to a .ui file, and update slot/signature declarations.
- Add ProfileManager::RemoveProfileAtIndex(std::size_t) and refactor RemoveUser(UUID) to call RemoveProfileAtIndex to avoid duplicated removal logic. Ensure the removal path marks saves as needed and writes the user save file.
- Ensure the profile list updates immediately after deletes by calling profile_manager.ResetUserSaveFile() when populating the user list (qlaunch fix).
- Misc: update SPDX copyright year and fix build breakages caused by the API changes.
-
-This consolidates profile removal behavior, fixes potential race conditions in the profile dialog, and removes duplicated removal code.
-```
-
-This has all of the same problems as the other one. Needlessly verbose, doesn't address *what* it actually fixes ("consolidates profile removal behavior"... okay, why? What does it fix?), etc. It even has the bonus of totally hallucinating the addition of a method!
-
-**Don't use AI for commit messages**.
@@ -1,10 +0,0 @@
-# Release Policy
-
-Release when lots of new changes and fixes. Hotfix if more bugs. Release candidate if lot of things to test. Simple as.
-
-## Checklist
-
- [ ] Update Transifex
- [ ] Test for regressions and bugs
- [ ] Write a changelog
- [ ] Ensure all platforms work
@@ -0,0 +1,31 @@
+# Linux Build Scripts
+
+* Provided script: `.ci/linux/build.sh`
+* Must specify arch target, e.g.: `.ci/linux/build.sh amd64`
+* Valid targets:
+  * `native`: Optimize to your native host architecture
+  * `legacy`: x86\_64 generic, only needed for CPUs older than 2013 or so
+  * `amd64`: x86\_64-v3, for CPUs newer than 2013 or so
+  * `steamdeck` / `zen2`: For Steam Deck or Zen >= 2 AMD CPUs (untested on Intel)
+  * `rog-ally` / `allyx` / `zen4`: For ROG Ally X or Zen >= 4 AMD CPUs (untested on Intel)
+  * `aarch64`: For armv8-a CPUs, older than mid-2021 or so
+  * `armv9`: For armv9-a CPUs, newer than mid-2021 or so
+* Extra CMake flags go after the arch target.
+
+### Environment Variables
+
+* `NPROC`: Number of compilation threads (default: all cores)
+* `TARGET`: Set `appimage` to disable standalone `eden-cli` and `eden-room`
+* `BUILD_TYPE`: Build type (default: `Release`)
+
+Boolean flags (set `true` to enable, `false` to disable):
+
+* `DEVEL` (default `FALSE`): Disable Qt update checker
+* `USE_WEBENGINE` (default `FALSE`): Enable Qt WebEngine
+* `USE_MULTIMEDIA` (default `FALSE`): Enable Qt Multimedia
+
+* AppImage packaging script: `.ci/linux/package.sh`
+
+  * Accepts same arch targets as build script
+  * Use `DEVEL=true` to rename app to `Eden Nightly` and disable the update checker
+  * This should generally not be used unless in a tailor-made packaging environment (e.g. Actions/CI)
@@ -0,0 +1,29 @@
+# Windows Build Scripts
+
+* A convenience script for building is provided in `.ci/windows/build.sh`.
+* You must run this with Bash, e.g. Git Bash or the MinGW TTY.
+* To use this script, you must have `windeployqt` installed (usually bundled with Qt) and set the `WINDEPLOYQT` environment variable to its canonical Bash location:
+  * `WINDEPLOYQT="/c/Qt/6.9.1/msvc2022_64/bin/windeployqt6.exe" .ci/windows/build.sh`.
+* You can use `aqtinstall`, more info on <https://github.com/miurahr/aqtinstall> and <https://ddalcino.github.io/aqt-list-server/>
+
+
+* Extra CMake flags should be placed in the arguments of the script.
+
+#### Additional environment variables can be used to control building:
+
+* `BUILD_TYPE` (default `Release`): Sets the build type to use.
+
+* The following environment variables are boolean flags. Set to `true` to enable or `false` to disable:
+
+  * `DEVEL` (default FALSE): Disable Qt update checker
+  * `USE_WEBENGINE` (default FALSE): Enable Qt WebEngine
+  * `USE_MULTIMEDIA` (default FALSE): Enable Qt Multimedia
+  * `BUNDLE_QT` (default FALSE): Use bundled Qt
+
+  * Note that using **system Qt** requires you to include the Qt CMake directory in `CMAKE_PREFIX_PATH`
+    * `.ci/windows/build.sh -DCMAKE_PREFIX_PATH=C:/Qt/6.9.0/msvc2022_64/lib/cmake/Qt6`
+
+* After building, a zip can be packaged via `.ci/windows/package.sh`. You must have 7-zip installed and in your PATH.
+  * The resulting zip will be placed into `artifacts` in the source directory.
+
+
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2016 Citra Emulator Project
@@ -34,6 +34,19 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
    endif()
 endif()

+# Oaknut
+if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
+    AddJsonPackage(oaknut)
+endif()
+
+# biscuit
+if (ARCHITECTURE_riscv64)
+    AddJsonPackage(biscuit)
+endif()
+
+# mcl
+AddJsonPackage(mcl)
+
 # enet
 AddJsonPackage(enet)

@@ -48,47 +61,14 @@ endif()
 # mbedtls
 AddJsonPackage(mbedtls)

-# stb
-add_library(stb stb/stb_dxt.cpp)
-target_include_directories(stb PUBLIC ./stb)
+# VulkanUtilityHeaders - pulls in headers and utility libs
+AddJsonPackage(vulkan-utility-headers)

-if (NOT TARGET stb::headers)
-    add_library(stb::headers ALIAS stb)
+# small hack
+if (NOT VulkanUtilityLibraries_ADDED)
+    find_package(VulkanHeaders 1.3.274 REQUIRED)
 endif()

-# ItaniumDemangle
-if (NOT TARGET LLVM::Demangle)
-    add_library(demangle demangle/ItaniumDemangle.cpp)
-    target_include_directories(demangle PUBLIC ./demangle)
-    if (NOT MSVC)
-        target_compile_options(demangle PRIVATE -Wno-deprecated-declarations) # std::is_pod
-    endif()
-    add_library(LLVM::Demangle ALIAS demangle)
-endif()
-
-if (YUZU_STATIC_ROOM)
-    return()
-endif()
-
-# Oaknut
-if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
-    AddJsonPackage(oaknut)
-endif()
-
-# biscuit
-if (ARCHITECTURE_riscv64)
-    AddJsonPackage(biscuit)
-endif()
-
-# mcl
-AddJsonPackage(mcl)
-
-# Vulkan stuff
-AddDependentPackages(vulkan-headers vulkan-utility-libraries)
-
-# frozen
-AddJsonPackage(frozen)
-
 # DiscordRPC
 if (USE_DISCORD_PRESENCE)
    if (ARCHITECTURE_arm64)
@@ -235,7 +215,7 @@ if (VulkanMemoryAllocator_ADDED)
 endif()

 # httplib
-if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER OR USE_DISCORD_PRESENCE OR ENABLE_OPENSSL)
+if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
    AddJsonPackage(httplib)
 endif()

@@ -263,6 +243,22 @@ endif()
 # TZDB (Time Zone Database)
 add_subdirectory(nx_tzdb)

+if (NOT TARGET LLVM::Demangle)
+    add_library(demangle demangle/ItaniumDemangle.cpp)
+    target_include_directories(demangle PUBLIC ./demangle)
+    if (NOT MSVC)
+        target_compile_options(demangle PRIVATE -Wno-deprecated-declarations) # std::is_pod
+    endif()
+    add_library(LLVM::Demangle ALIAS demangle)
+endif()
+
+add_library(stb stb/stb_dxt.cpp)
+target_include_directories(stb PUBLIC ./stb)
+
+if (NOT TARGET stb::headers)
+    add_library(stb::headers ALIAS stb)
+endif()
+
 add_library(tz tz/tz/tz.cpp)
 target_include_directories(tz PUBLIC ./tz)

@@ -28,8 +28,8 @@
    "httplib": {
        "repo": "yhirose/cpp-httplib",
        "tag": "v%VERSION%",
-        "hash": "a229e24cca4afe78e5c0aa2e482f15108ac34101fd8dbd927365f15e8c37dec4de38c5277d635017d692a5b320e1b929f8bfcc076f52b8e4dcdab8fe53bfdf2e",
-        "git_version": "0.30.1",
+        "hash": "e7a8877d489c97669a8ee536e1498575be921e558ed947253013fe6b67a49d4569eedd01f543caa70183b92d8ac0e8687d662a70d880954412e387317008a239",
+        "git_version": "0.28.0",
        "find_args": "MODULE GLOBAL",
        "patches": [
            "0001-mingw.patch"
@@ -37,15 +37,12 @@
    },
    "cpp-jwt": {
        "version": "1.4",
-        "repo": "arun11299/cpp-jwt",
-        "sha": "7f24eb4c32",
-        "hash": "d11cbd5ddb3197b4c5ca15679bcd76a49963e7b530b7dd132db91e042925efa20dfb2c24ccfbe7ef82a7012af80deff0f72ee25851312ae80381a462df8534b8",
+        "repo": "crueter/cpp-jwt",
+        "sha": "9eaea6328f",
+        "hash": "35b0b2bfb143585c7b2bd6dc6ca7df5ae5c6e2681000b2ebca077b0ac4bc1e6b6afbe1ce8e47f6d2edad12fcc6404f677acc2ad205661d819b8821ce6f4823fd",
        "find_args": "CONFIG",
        "options": [
            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
-        ],
-        "patches": [
-            "0001-fix-missing-decl.patch"
        ]
    },
    "xbyak_sun": {
@@ -118,25 +115,33 @@
        "git_version": "1.3.18",
        "find_args": "MODULE"
    },
+    "vulkan-utility-headers": {
+        "package": "VulkanUtilityLibraries",
+        "repo": "scripts/VulkanUtilityHeaders",
+        "tag": "%VERSION%",
+        "git_version": "1.4.335",
+        "artifact": "VulkanUtilityHeaders.tar.zst",
+        "git_host": "git.crueter.xyz",
+        "hash": "16dac0e6586702580c4279e4cd37ffe3cf909c93eb31b5069da7af36436d47b270a9cbaac953bb66c22ed12ed67ffa096688599267f307dfb62be1bc09f79833"
+    },
    "spirv-tools": {
        "package": "SPIRV-Tools",
-        "repo": "KhronosGroup/SPIRV-Tools",
-        "sha": "0a7e28689a",
-        "hash": "eadfcceb82f4b414528d99962335e4f806101168474028f3cf7691ac40c37f323decf2a42c525e2d5bfa6f14ff132d6c5cf9b87c151490efad01f5e13ade1520",
+        "repo": "crueter/SPIRV-Tools",
+        "sha": "2fa2d44485",
+        "hash": "3124bbddf7bd44f11445edeca6786b5bba9fb314f27dc087d0bbd9951b0936884ece2b9b40b75cfc8e31ab10ba55854e73aa63df835c40423b1c81dd47b1437d",
        "git_version": "2025.4",
        "options": [
            "SPIRV_SKIP_EXECUTABLES ON"
        ],
        "patches": [
-            "0001-netbsd-fix.patch",
-            "0002-allow-static-only.patch"
+            "0001-netbsd-fix.patch"
        ]
    },
    "spirv-headers": {
        "package": "SPIRV-Headers",
        "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "04f10f650d",
-        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
+        "sha": "01e0577914",
+        "hash": "e2b90e95b6f492e640cd27c090d7072f0d03c8fc7382be67cbe176fc8f3fdd78b59f5f0b906198e09808fde645427f409cb9ab8fe4843de7f7dc5b510d454a0a",
        "options": [
            "SPIRV_WERROR OFF"
        ]
@@ -165,9 +170,9 @@
        "package": "Catch2",
        "repo": "catchorg/Catch2",
        "tag": "v%VERSION%",
-        "hash": "acb3f463a7404d6a3bce52e474075cdadf9bb241d93feaf147c182d756e5a2f8bd412f4658ca186d15ab8fed36fc587d79ec311f55642d8e4ded16df9e213656",
+        "hash": "a95495142f915d6e9c2a23e80fe360343e9097680066a2f9d3037a070ba5f81ee5559a0407cc9e972dc2afae325873f1fc7ea07a64012c0f01aac6e549f03e3f",
        "version": "3.0.1",
-        "git_version": "3.12.0",
+        "git_version": "3.11.0",
        "patches": [
            "0001-solaris-isnan-fix.patch"
        ]
@@ -272,26 +277,5 @@
        "tag": "%VERSION%",
        "hash": "dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6",
        "version": "121125"
-    },
-    "vulkan-headers": {
-        "repo": "KhronosGroup/Vulkan-Headers",
-        "package": "VulkanHeaders",
-        "version": "1.4.317",
-        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    },
-    "vulkan-utility-libraries": {
-        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "package": "VulkanUtilityLibraries",
-        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    },
-    "frozen": {
-        "package": "frozen",
-        "repo": "serge-sans-paille/frozen",
-        "sha": "61dce5ae18",
-        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c"
    }
 }
@@ -20,4 +20,4 @@ pkgs.mkShellNoCC {
    # optional components
    discord-rpc gamemode
  ];
-}
+}
@@ -7,7 +7,7 @@
 include_directories(.)

 # Dynarmic
-if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 AND NOT YUZU_STATIC_ROOM)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
    add_subdirectory(dynarmic)
    add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
@@ -20,10 +20,6 @@ if (YUZU_STATIC_BUILD)
    add_compile_definitions(QT_STATICPLUGIN)
 endif()

-if (NIGHTLY_BUILD)
-    add_compile_definitions(NIGHTLY_BUILD)
-endif()
-
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)
    set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
@@ -205,29 +201,19 @@ else()
 endif()

 add_subdirectory(common)
-add_subdirectory(network)
-
-if (YUZU_ROOM)
-    add_subdirectory(dedicated_room)
-endif()
-
-if (YUZU_ROOM_STANDALONE)
-    add_subdirectory(yuzu_room_standalone)
-    set_target_properties(yuzu-room PROPERTIES OUTPUT_NAME "eden-room")
-endif()
-
-if (YUZU_STATIC_ROOM)
-    return()
-endif()
-
 add_subdirectory(core)
 add_subdirectory(audio_core)
 add_subdirectory(video_core)
 add_subdirectory(hid_core)
+add_subdirectory(network)
 add_subdirectory(input_common)
 add_subdirectory(frontend_common)
 add_subdirectory(shader_recompiler)

+if (YUZU_ROOM)
+    add_subdirectory(dedicated_room)
+endif()
+
 if (YUZU_TESTS)
    add_subdirectory(tests)
 endif()
@@ -237,6 +223,11 @@ if (ENABLE_SDL2 AND YUZU_CMD)
    set_target_properties(yuzu-cmd PROPERTIES OUTPUT_NAME "eden-cli")
 endif()

+if (YUZU_ROOM_STANDALONE)
+    add_subdirectory(yuzu_room_standalone)
+    set_target_properties(yuzu-room PROPERTIES OUTPUT_NAME "eden-room")
+endif()
+
 if (ENABLE_QT)
    add_definitions(-DYUZU_QT_WIDGETS)
    add_subdirectory(qt_common)
@@ -5,7 +5,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 // import android.annotation.SuppressLint
-import com.android.build.gradle.api.ApplicationVariant
 import kotlin.collections.setOf
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 import com.github.triplet.gradle.androidpublisher.ReleaseStatus
@@ -38,9 +37,6 @@ android {
    compileSdkVersion = "android-36"
    ndkVersion = "28.2.13676358"

-    val isNightly =
-        providers.gradleProperty("nightly").orNull?.toBooleanStrictOrNull() ?: false
-
    buildFeatures {
        viewBinding = true
    }
@@ -75,7 +71,6 @@ android {
                val extraCMakeArgs =
                    (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex())
                        ?: emptyList()
-
                arguments.addAll(
                    listOf(
                        "-DENABLE_QT=0", // Don't use QT
@@ -94,13 +89,6 @@ android {
                    )
                )

-                if (isNightly) {
-                    arguments.addAll(listOf(
-                        "-DENABLE_UPDATE_CHECKER=ON",
-                        "-DNIGHTLY_BUILD=ON",
-                    ))
-                }
-
                abiFilters("arm64-v8a")
            }
        }
@@ -137,12 +125,7 @@ android {
                signingConfigs.getByName("default")
            }

-            if (isNightly) {
-                applicationIdSuffix = ".nightly"
-                manifestPlaceholders += mapOf("appNameSuffix" to " Nightly")
-            } else {
-                manifestPlaceholders += mapOf("appNameSuffix" to "")
-            }
+            manifestPlaceholders += mapOf("appNameSuffix" to "")

            isMinifyEnabled = true
            isDebuggable = false
@@ -256,15 +239,6 @@ android {
            path = file("${edenDir}/CMakeLists.txt")
        }
    }
-
-    productFlavors.all {
-        val currentName = manifestPlaceholders["appNameBase"] as? String ?: "Eden"
-        val suffix = if (isNightly) " Nightly" else ""
-
-        // apply nightly suffix I/A
-        resValue("string", "app_name_suffixed", "$currentName$suffix")
-        resValue("string", "app_name", "Eden$suffix")
-    }
 }

 idea {
@@ -284,7 +258,7 @@ tasks.register<Delete>("ktlintReset", fun Delete.() {
 val showFormatHelp = {
    logger.lifecycle(
        "If this check fails, please try running \"gradlew ktlintFormat\" for automatic " +
-                "codestyle fixes"
+            "codestyle fixes"
    )
 }
 tasks.getByPath("ktlintKotlinScriptCheck").doFirst { showFormatHelp.invoke() }
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -218,7 +218,7 @@ object NativeLibrary {
    /**
     * Checks for available updates.
     */
-    external fun checkForUpdate(): Array<String>?
+    external fun checkForUpdate(): String?

    /**
     * Return the URL to the release page
@@ -228,18 +228,13 @@ object NativeLibrary {
    /**
     * Return the URL to download the APK for the given version
     */
-    external fun getUpdateApkUrl(tag: String, artifact: String, packageId: String): String
+    external fun getUpdateApkUrl(version: String, packageId: String): String

    /**
     * Returns whether the update checker is enabled through CMAKE options.
     */
    external fun isUpdateCheckerEnabled(): Boolean

-    /**
-     * Returns whether or not this is a nightly build.
-     */
-    external fun isNightlyBuild(): Boolean
-
    /**
     * Returns the build version generated by CMake (BUILD_VERSION).
     */
@@ -614,23 +609,4 @@ object NativeLibrary {
     * Updates the device power state to global variables
     */
    external fun updatePowerState(percentage: Int, isCharging: Boolean, hasBattery: Boolean)
-
-    /**
-     * Profile manager native calls
-     */
-    external fun getAllUsers(): Array<String>?
-    external fun getUserUsername(uuid: String): String?
-    external fun getUserCount(): Long
-    external fun canCreateUser(): Boolean
-    external fun createUser(uuid: String, username: String): Boolean
-    external fun updateUserUsername(uuid: String, username: String): Boolean
-    external fun removeUser(uuid: String): Boolean
-    external fun getCurrentUser(): String?
-    external fun setCurrentUser(uuid: String): Boolean
-    external fun getUserImagePath(uuid: String): String?
-    external fun saveUserImage(uuid: String, imagePath: String): Boolean
-    external fun reloadProfiles()
-    external fun getFirmwareAvatarCount(): Int
-    external fun getFirmwareAvatarImage(index: Int): ByteArray?
-    external fun getDefaultAccountBackupJpeg(): ByteArray
 }
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -10,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding
 import org.yuzu.yuzu_emu.model.Patch
-import org.yuzu.yuzu_emu.model.PatchType
 import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder

@@ -32,12 +31,7 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
            binding.addonSwitch.isChecked = model.enabled

            binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
-                if (PatchType.from(model.type) == PatchType.Update && checked) {
-                    addonViewModel.enableOnlyThisUpdate(model)
-                    notifyDataSetChanged()
-                } else {
-                    model.enabled = checked
-                }
+                model.enabled = checked
            }

            val deleteAction = {
@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.graphics.Bitmap
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.databinding.ItemFirmwareAvatarBinding
-
-class FirmwareAvatarAdapter(
-    private val avatars: List<Bitmap>,
-    private val onAvatarSelected: (Bitmap) -> Unit
-) : RecyclerView.Adapter<FirmwareAvatarAdapter.AvatarViewHolder>() {
-
-    private var selectedPosition = -1
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AvatarViewHolder {
-        val binding = ItemFirmwareAvatarBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
-        return AvatarViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: AvatarViewHolder, position: Int) {
-        holder.bind(avatars[position], position == selectedPosition)
-    }
-
-    override fun getItemCount(): Int = avatars.size
-
-    inner class AvatarViewHolder(
-        private val binding: ItemFirmwareAvatarBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(avatar: Bitmap, isSelected: Boolean) {
-            binding.imageAvatar.setImageBitmap(avatar)
-            binding.root.isChecked = isSelected
-
-            binding.root.setOnClickListener {
-                val previousSelected = selectedPosition
-                selectedPosition = bindingAdapterPosition
-
-                if (previousSelected != -1) {
-                    notifyItemChanged(previousSelected)
-                }
-                notifyItemChanged(selectedPosition)
-
-                onAvatarSelected(avatar)
-            }
-        }
-    }
-}
@@ -1,6 +1,3 @@
-// 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

@@ -10,10 +7,8 @@ import android.net.Uri
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardFolderBinding
 import org.yuzu.yuzu_emu.fragments.GameFolderPropertiesDialogFragment
-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.utils.ViewUtils.marquee
@@ -36,12 +31,6 @@ class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesVie
                path.text = Uri.parse(model.uriString).path
                path.marquee()

-                // Set type indicator, shows below folder name, to see if DLC or Games
-                typeIndicator.text = when (model.type) {
-                    DirectoryType.GAME -> activity.getString(R.string.games)
-                    DirectoryType.EXTERNAL_CONTENT -> activity.getString(R.string.external_content)
-                }
-
                buttonEdit.setOnClickListener {
                    GameFolderPropertiesDialogFragment.newInstance(model)
                        .show(
@@ -1,112 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.graphics.BitmapFactory
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.ListItemProfileBinding
-import org.yuzu.yuzu_emu.model.UserProfile
-import java.io.File
-import org.yuzu.yuzu_emu.NativeLibrary
-
-class ProfileAdapter(
-    private val onProfileClick: (UserProfile) -> Unit,
-    private val onEditClick: (UserProfile) -> Unit,
-    private val onDeleteClick: (UserProfile) -> Unit
-) : RecyclerView.Adapter<ProfileAdapter.ProfileViewHolder>() {
-
-    private var currentUserUUID: String = ""
-
-    private val differ = AsyncListDiffer(this, object : DiffUtil.ItemCallback<UserProfile>() {
-        override fun areItemsTheSame(oldItem: UserProfile, newItem: UserProfile): Boolean {
-            return oldItem.uuid == newItem.uuid
-        }
-
-        override fun areContentsTheSame(oldItem: UserProfile, newItem: UserProfile): Boolean {
-            return oldItem == newItem
-        }
-    })
-
-    fun submitList(list: List<UserProfile>) {
-        differ.submitList(list)
-    }
-
-    fun setCurrentUser(uuid: String) {
-        currentUserUUID = uuid
-        notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProfileViewHolder {
-        val binding = ListItemProfileBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
-        return ProfileViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: ProfileViewHolder, position: Int) {
-        holder.bind(differ.currentList[position])
-    }
-
-    override fun getItemCount(): Int = differ.currentList.size
-
-    inner class ProfileViewHolder(private val binding: ListItemProfileBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(profile: UserProfile) {
-            binding.textUsername.text = profile.username
-            binding.textUuid.text = formatUUID(profile.uuid)
-
-            val imageFile = File(profile.imagePath)
-            if (imageFile.exists()) {
-                val bitmap = BitmapFactory.decodeFile(profile.imagePath)
-                binding.imageAvatar.setImageBitmap(bitmap)
-            } else {
-                    val jpegData = NativeLibrary.getDefaultAccountBackupJpeg()
-                    val bitmap = BitmapFactory.decodeByteArray(jpegData, 0, jpegData.size)
-                    binding.imageAvatar.setImageBitmap(bitmap)
-            }
-
-            if (profile.uuid == currentUserUUID) {
-                binding.checkContainer.visibility = View.VISIBLE
-            } else {
-                binding.checkContainer.visibility = View.GONE
-            }
-
-            binding.root.setOnClickListener {
-                onProfileClick(profile)
-            }
-
-            binding.buttonEdit.setOnClickListener {
-                onEditClick(profile)
-            }
-
-            binding.buttonDelete.setOnClickListener {
-                onDeleteClick(profile)
-            }
-        }
-
-        private fun formatUUID(uuid: String): String {
-            if (uuid.length != 32) return uuid
-            return buildString {
-                append(uuid.substring(0, 8))
-                append("-")
-                append(uuid.substring(8, 12))
-                append("-")
-                append(uuid.substring(12, 16))
-                append("-")
-                append(uuid.substring(16, 20))
-                append("-")
-                append(uuid.substring(20, 32))
-            }
-        }
-    }
-}
@@ -22,6 +22,14 @@ import org.yuzu.yuzu_emu.features.settings.model.AbstractShortSetting
 import org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting

 class QuickSettings(val emulationFragment: EmulationFragment) {
+    // Kinda a crappy workaround to get a title from setting keys
+    // Idk how to do this witthout hardcoding every single one
+    private fun getSettingTitle(settingKey: String): String {
+        return settingKey.replace("_", " ").split(" ")
+            .joinToString(" ") { it.replaceFirstChar { c -> c.uppercase() } }
+
+    }
+
    private fun saveSettings() {
        if (emulationFragment.shouldUseCustom) {
            NativeConfig.savePerGameConfig()
@@ -52,7 +60,6 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
    // settings

    fun addIntSetting(
-        name: Int,
        container: ViewGroup,
        setting: IntSetting,
        namesArrayId: Int,
@@ -66,7 +73,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
        val expandIcon = itemView.findViewById<android.widget.ImageView>(R.id.expand_icon)
        val radioGroup = itemView.findViewById<RadioGroup>(R.id.radio_group)

-        titleView.text = YuzuApplication.appContext.getString(name)
+        titleView.text = getSettingTitle(setting.key)

        val names = emulationFragment.resources.getStringArray(namesArrayId)
        val values = emulationFragment.resources.getIntArray(valuesArrayId)
@@ -108,8 +115,6 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
    }

    fun addBooleanSetting(
-        name: Int,
-
        container: ViewGroup,
        setting: BooleanSetting
    ) {
@@ -120,7 +125,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
        val titleView = itemView.findViewById<TextView>(R.id.switch_title)
        val switchView = itemView.findViewById<com.google.android.material.materialswitch.MaterialSwitch>(R.id.setting_switch)

-        titleView.text = YuzuApplication.appContext.getString(name)
+        titleView.text = getSettingTitle(setting.key)
        switchContainer.visibility = View.VISIBLE
        switchView.isChecked = setting.getBoolean()

@@ -136,7 +141,6 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
    }

    fun addSliderSetting(
-        name: Int,
        container: ViewGroup,
        setting: AbstractSetting,
        minValue: Int = 0,
@@ -152,7 +156,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
        val slider = itemView.findViewById<com.google.android.material.slider.Slider>(R.id.setting_slider)


-        titleView.text = YuzuApplication.appContext.getString(name)
+        titleView.text = getSettingTitle(setting.key)
        sliderContainer.visibility = View.VISIBLE

        slider.valueFrom = minValue.toFloat()
@@ -16,7 +16,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_USE_SPEED_LIMIT("use_speed_limit"),
    USE_CUSTOM_CPU_TICKS("use_custom_cpu_ticks"),
    SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
-    FIX_BLOOM_EFFECTS("fix_bloom_effects"),
    CPUOPT_UNSAFE_HOST_MMU("cpuopt_unsafe_host_mmu"),
    USE_DOCKED_MODE("use_docked_mode"),
    USE_AUTO_STUB("use_auto_stub"),
@@ -24,7 +23,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_FORCE_MAX_CLOCK("force_max_clock"),
    RENDERER_ASYNCHRONOUS_SHADERS("use_asynchronous_shaders"),
    RENDERER_REACTIVE_FLUSHING("use_reactive_flushing"),
-    ENABLE_BUFFER_HISTORY("enable_buffer_history"),
    SYNC_MEMORY_OPERATIONS("sync_memory_operations"),
    BUFFER_REORDER_DISABLE("disable_buffer_reorder"),
    RENDERER_DEBUG("debug"),
@@ -37,9 +35,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    USE_CUSTOM_RTC("custom_rtc_enabled"),
    BLACK_BACKGROUNDS("black_backgrounds"),

-    ENABLE_FOLDER_BUTTON("enable_folder_button"),
-    ENABLE_QLAUNCH_BUTTON("enable_qlaunch_button"),
-
    ENABLE_UPDATE_CHECKS("enable_update_checks"),
    JOYSTICK_REL_CENTER("joystick_rel_center"),
    DPAD_SLIDE("dpad_slide"),
@@ -76,16 +71,8 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    USE_LRU_CACHE("use_lru_cache"),

    DONT_SHOW_DRIVER_SHADER_WARNING("dont_show_driver_shader_warning"),
-    ENABLE_OVERLAY("enable_overlay"),
+    ENABLE_OVERLAY("enable_overlay");

-    // GPU Logging
-    GPU_LOGGING_ENABLED("gpu_logging_enabled"),
-    GPU_LOG_VULKAN_CALLS("gpu_log_vulkan_calls"),
-    GPU_LOG_SHADER_DUMPS("gpu_log_shader_dumps"),
-    GPU_LOG_MEMORY_TRACKING("gpu_log_memory_tracking"),
-    GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug"),
-
-    ENABLE_QUICK_SETTINGS("enable_quick_settings");

 //  external fun isFrameSkippingEnabled(): Boolean
    external fun isFrameInterpolationEnabled(): Boolean
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -9,8 +9,7 @@ package org.yuzu.yuzu_emu.features.settings.model
 import org.yuzu.yuzu_emu.utils.NativeConfig

 enum class ByteSetting(override val key: String) : AbstractByteSetting {
-    AUDIO_VOLUME("volume"),
-    GPU_LOG_LEVEL("gpu_log_level");
+    AUDIO_VOLUME("volume"),;

    override fun getByte(needsGlobal: Boolean): Byte = NativeConfig.getByte(key, needsGlobal)

@@ -67,8 +67,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
    MY_PAGE_APPLET("my_page_applet_mode"),
    INPUT_OVERLAY_AUTO_HIDE("input_overlay_auto_hide"),
    OVERLAY_GRID_SIZE("overlay_grid_size"),
-    DEBUG_KNOBS("debug_knobs"),
-    GPU_LOG_RING_BUFFER_SIZE("gpu_log_ring_buffer_size")
+    DEBUG_KNOBS("debug_knobs")
    ;

    override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)
@@ -60,11 +60,6 @@ abstract class SettingsItem(
                return NativeInput.getStyleIndex(0) != NpadStyleIndex.Handheld
            }

-            // Can't edit enable_qlaunch_button if firmware is not available
-            if (setting.key == BooleanSetting.ENABLE_QLAUNCH_BUTTON.key) {
-                return NativeLibrary.isFirmwareAvailable()
-            }
-
            // Can't edit settings that aren't saveable in per-game config even if they are switchable
            if (NativeConfig.isPerGameConfigLoaded() && !setting.isSaveable) {
                return false
@@ -724,13 +719,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.skip_cpu_inner_invalidation_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.FIX_BLOOM_EFFECTS,
-                    titleId = R.string.fix_bloom_effects,
-                    descriptionId = R.string.fix_bloom_effects_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.CPUOPT_UNSAFE_HOST_MMU,
@@ -745,13 +733,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.renderer_reactive_flushing_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ENABLE_BUFFER_HISTORY,
-                    titleId = R.string.enable_buffer_history,
-                    descriptionId = R.string.enable_buffer_history_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.SYNC_MEMORY_OPERATIONS,
@@ -806,27 +787,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.enable_update_checks_description,
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ENABLE_QUICK_SETTINGS,
-                    titleId = R.string.enable_quick_settings,
-                    descriptionId = R.string.enable_quick_settings_description,
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ENABLE_FOLDER_BUTTON,
-                    titleId = R.string.enable_folder_button,
-                    descriptionId = R.string.enable_folder_button_description,
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ENABLE_QLAUNCH_BUTTON,
-                    titleId = R.string.enable_qlaunch_button,
-                    descriptionId = R.string.enable_qlaunch_button_description,
-                )
-            )
            put(
                SingleChoiceSetting(
                    IntSetting.APP_LANGUAGE,
@@ -869,62 +829,6 @@ abstract class SettingsItem(
                )
            )

-            // GPU Logging settings
-            put(
-                SwitchSetting(
-                    BooleanSetting.GPU_LOGGING_ENABLED,
-                    titleId = R.string.gpu_logging_enabled,
-                    descriptionId = R.string.gpu_logging_enabled_description
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    ByteSetting.GPU_LOG_LEVEL,
-                    titleId = R.string.gpu_log_level,
-                    descriptionId = R.string.gpu_log_level_description,
-                    choicesId = R.array.gpuLogLevelEntries,
-                    valuesId = R.array.gpuLogLevelValues
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.GPU_LOG_VULKAN_CALLS,
-                    titleId = R.string.gpu_log_vulkan_calls,
-                    descriptionId = R.string.gpu_log_vulkan_calls_description
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.GPU_LOG_SHADER_DUMPS,
-                    titleId = R.string.gpu_log_shader_dumps,
-                    descriptionId = R.string.gpu_log_shader_dumps_description
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.GPU_LOG_MEMORY_TRACKING,
-                    titleId = R.string.gpu_log_memory_tracking,
-                    descriptionId = R.string.gpu_log_memory_tracking_description
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.GPU_LOG_DRIVER_DEBUG,
-                    titleId = R.string.gpu_log_driver_debug,
-                    descriptionId = R.string.gpu_log_driver_debug_description
-                )
-            )
-            put(
-                SpinBoxSetting(
-                    IntSetting.GPU_LOG_RING_BUFFER_SIZE,
-                    titleId = R.string.gpu_log_ring_buffer_size,
-                    descriptionId = R.string.gpu_log_ring_buffer_size_description,
-                    valueHint = R.string.gpu_log_ring_buffer_size_hint,
-                    min = 64,
-                    max = 4096
-                )
-            )
-
            val fastmem = object : AbstractBooleanSetting {
                override fun getBoolean(needsGlobal: Boolean): Boolean =
                    BooleanSetting.FASTMEM.getBoolean() &&
@@ -275,13 +275,11 @@ class SettingsFragmentPresenter(
            add(BooleanSetting.RENDERER_USE_DISK_SHADER_CACHE.key)
            add(BooleanSetting.RENDERER_FORCE_MAX_CLOCK.key)
            add(BooleanSetting.RENDERER_REACTIVE_FLUSHING.key)
-            add(BooleanSetting.ENABLE_BUFFER_HISTORY.key)

            add(HeaderSetting(R.string.hacks))

            add(IntSetting.FAST_GPU_TIME.key)
            add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
-            add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
            add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
            add(IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.key)
            add(IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.key)
@@ -1075,8 +1073,6 @@ class SettingsFragmentPresenter(
                add(BooleanSetting.ENABLE_UPDATE_CHECKS.key)
            }

-            add(BooleanSetting.ENABLE_QUICK_SETTINGS.key)
-
            add(HeaderSetting(R.string.theme_and_color))


@@ -1194,13 +1190,6 @@ class SettingsFragmentPresenter(
                    descriptionId = R.string.use_black_backgrounds_description
                )
            )
-
-            add(HeaderSetting(R.string.buttons))
-            add(BooleanSetting.ENABLE_FOLDER_BUTTON.key)
-            add(BooleanSetting.ENABLE_QLAUNCH_BUTTON.key)
-            if (!NativeLibrary.isFirmwareAvailable()) {
-                BooleanSetting.ENABLE_QLAUNCH_BUTTON.setBoolean(false)
-            }
        }
    }

@@ -1230,15 +1219,6 @@ class SettingsFragmentPresenter(
            add(HeaderSetting(R.string.general))

            add(IntSetting.DEBUG_KNOBS.key)
-
-            add(HeaderSetting(R.string.gpu_logging_header))
-            add(BooleanSetting.GPU_LOGGING_ENABLED.key)
-            add(ByteSetting.GPU_LOG_LEVEL.key)
-            add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key)
-            add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
-            add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
-            add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
-            add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
        }
    }

@@ -1,459 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Activity
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.ImageDecoder
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.core.widget.doAfterTextChanged
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-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.adapters.FirmwareAvatarAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentEditUserDialogBinding
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.ProfileUtils
-import org.yuzu.yuzu_emu.model.UserProfile
-import java.io.File
-import java.io.FileOutputStream
-import androidx.core.graphics.scale
-import androidx.core.graphics.createBitmap
-
-class EditUserDialogFragment : Fragment() {
-    private var _binding: FragmentEditUserDialogBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-
-    private var currentUUID: String = ""
-    private var isEditMode = false
-    private var selectedImageUri: Uri? = null
-    private var selectedFirmwareAvatar: Bitmap? = null
-    private var hasCustomImage = false
-    private var revertedToDefault = false
-
-    companion object {
-        private const val ARG_UUID = "uuid"
-        private const val ARG_USERNAME = "username"
-
-        fun newInstance(profile: UserProfile?): EditUserDialogFragment {
-            val fragment = EditUserDialogFragment()
-            profile?.let {
-                val args = Bundle()
-                args.putString(ARG_UUID, it.uuid)
-                args.putString(ARG_USERNAME, it.username)
-                fragment.arguments = args
-            }
-            return fragment
-        }
-    }
-
-    private val imagePickerLauncher = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            result.data?.data?.let { uri ->
-                selectedImageUri = uri
-                loadImage(uri)
-                hasCustomImage = true
-                binding.buttonRevertImage.visibility = View.VISIBLE
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentEditUserDialogBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        val existingUUID = arguments?.getString(ARG_UUID)
-        val existingUsername = arguments?.getString(ARG_USERNAME)
-
-        if (existingUUID != null && existingUsername != null) {
-            isEditMode = true
-            currentUUID = existingUUID
-            binding.toolbarNewUser.title = getString(R.string.profile_edit_user)
-            binding.editUsername.setText(existingUsername)
-            binding.textUuid.text = formatUUID(existingUUID)
-            binding.buttonGenerateUuid.visibility = View.GONE
-
-            val imagePath = NativeLibrary.getUserImagePath(existingUUID)
-            val imageFile = File(imagePath)
-            if (imageFile.exists()) {
-                val bitmap = BitmapFactory.decodeFile(imagePath)
-                binding.imageUserAvatar.setImageBitmap(bitmap)
-                hasCustomImage = true
-                binding.buttonRevertImage.visibility = View.VISIBLE
-            } else {
-                loadDefaultAvatar()
-            }
-        } else {
-            isEditMode = false
-            currentUUID = ProfileUtils.generateRandomUUID()
-            binding.toolbarNewUser.title = getString(R.string.profile_new_user)
-            binding.textUuid.text = formatUUID(currentUUID)
-            loadDefaultAvatar()
-        }
-
-        binding.toolbarNewUser.setNavigationOnClickListener {
-            findNavController().popBackStack()
-        }
-
-        binding.editUsername.doAfterTextChanged {
-            validateInput()
-        }
-
-        binding.buttonGenerateUuid.setOnClickListener {
-            currentUUID = ProfileUtils.generateRandomUUID()
-            binding.textUuid.text = formatUUID(currentUUID)
-        }
-
-        binding.buttonSelectImage.setOnClickListener {
-            selectImage()
-        }
-
-        binding.buttonRevertImage.setOnClickListener {
-            revertToDefaultImage()
-        }
-
-        if (NativeLibrary.isFirmwareAvailable()) {
-            binding.buttonFirmwareAvatars.visibility = View.VISIBLE
-            binding.buttonFirmwareAvatars.setOnClickListener {
-                showFirmwareAvatarPicker()
-            }
-        }
-
-        binding.buttonSave.setOnClickListener {
-            saveUser()
-        }
-
-        binding.buttonCancel.setOnClickListener {
-            findNavController().popBackStack()
-        }
-
-        validateInput()
-        setInsets()
-    }
-
-    private fun showFirmwareAvatarPicker() {
-        val dialogView = LayoutInflater.from(requireContext())
-            .inflate(R.layout.dialog_firmware_avatar_picker, null)
-
-        val gridAvatars = dialogView.findViewById<RecyclerView>(R.id.grid_avatars)
-        val progressLoading = dialogView.findViewById<View>(R.id.progress_loading)
-        val textEmpty = dialogView.findViewById<View>(R.id.text_empty)
-
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.profile_firmware_avatars)
-            .setView(dialogView)
-            .setNegativeButton(android.R.string.cancel, null)
-            .create()
-
-        dialog.show()
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            val avatars = withContext(Dispatchers.IO) {
-                loadFirmwareAvatars()
-            }
-
-            if (avatars.isEmpty()) {
-                progressLoading.visibility = View.GONE
-                textEmpty.visibility = View.VISIBLE
-            } else {
-                progressLoading.visibility = View.GONE
-                gridAvatars.visibility = View.VISIBLE
-
-                val adapter = FirmwareAvatarAdapter(avatars) { selectedAvatar ->
-                    val scaledBitmap = selectedAvatar.scale(256, 256)
-                    binding.imageUserAvatar.setImageBitmap(scaledBitmap)
-                    selectedFirmwareAvatar = scaledBitmap
-                    hasCustomImage = true
-                    binding.buttonRevertImage.visibility = View.VISIBLE
-                    dialog.dismiss()
-                }
-
-                gridAvatars.apply {
-                    layoutManager = GridLayoutManager(requireContext(), 4)
-                    this.adapter = adapter
-                }
-            }
-        }
-    }
-
-    private fun loadFirmwareAvatars(): List<Bitmap> {
-        val avatars = mutableListOf<Bitmap>()
-        val count = NativeLibrary.getFirmwareAvatarCount()
-
-        for (i in 0 until count) {
-            try {
-                val imageData = NativeLibrary.getFirmwareAvatarImage(i) ?: continue
-
-                val argbData = IntArray(256 * 256)
-                for (pixel in 0 until 256 * 256) {
-                    val offset = pixel * 4
-                    val r = imageData[offset].toInt() and 0xFF
-                    val g = imageData[offset + 1].toInt() and 0xFF
-                    val b = imageData[offset + 2].toInt() and 0xFF
-                    val a = imageData[offset + 3].toInt() and 0xFF
-                    argbData[pixel] = (a shl 24) or (r shl 16) or (g shl 8) or b
-                }
-
-                val bitmap = Bitmap.createBitmap(argbData, 256, 256, Bitmap.Config.ARGB_8888)
-                avatars.add(bitmap)
-            } catch (e: Exception) {
-                continue
-            }
-        }
-
-        return avatars
-    }
-
-    private fun formatUUID(uuid: String): String {
-        if (uuid.length != 32) return uuid
-        return buildString {
-            append(uuid.substring(0, 8))
-            append("-")
-            append(uuid.substring(8, 12))
-            append("-")
-            append(uuid.substring(12, 16))
-            append("-")
-            append(uuid.substring(16, 20))
-            append("-")
-            append(uuid.substring(20, 32))
-        }
-    }
-
-    private fun validateInput() {
-        val username = binding.editUsername.text.toString()
-        val isValid = username.isNotEmpty() && username.length <= 32
-        binding.buttonSave.isEnabled = isValid
-    }
-
-    private fun selectImage() {
-        val intent = Intent(Intent.ACTION_PICK).apply {
-            type = "image/*"
-        }
-        imagePickerLauncher.launch(intent)
-    }
-
-    private fun loadImage(uri: Uri) {
-        try {
-            val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                val source = ImageDecoder.createSource(requireContext().contentResolver, uri)
-                ImageDecoder.decodeBitmap(source) { decoder, _, _ ->
-                    decoder.setTargetSampleSize(1)
-                }
-            } else {
-                @Suppress("DEPRECATION")
-                MediaStore.Images.Media.getBitmap(requireContext().contentResolver, uri)
-            }
-
-            val croppedBitmap = centerCropBitmap(bitmap, 256, 256)
-            binding.imageUserAvatar.setImageBitmap(croppedBitmap)
-        } catch (e: Exception) {
-            MaterialAlertDialogBuilder(requireContext())
-                .setTitle(R.string.error)
-                .setMessage(getString(R.string.profile_image_load_error, e.message))
-                .setPositiveButton(android.R.string.ok, null)
-                .show()
-        }
-    }
-
-    private fun loadDefaultAvatar() {
-        val jpegData = NativeLibrary.getDefaultAccountBackupJpeg()
-        val bitmap = BitmapFactory.decodeByteArray(jpegData, 0, jpegData.size)
-        binding.imageUserAvatar.setImageBitmap(bitmap)
-
-        hasCustomImage = false
-        binding.buttonRevertImage.visibility = View.GONE
-    }
-
-    private fun revertToDefaultImage() {
-        selectedImageUri = null
-        selectedFirmwareAvatar = null
-        revertedToDefault = true
-        loadDefaultAvatar()
-    }
-
-    private fun saveUser() {
-        val username = binding.editUsername.text.toString()
-
-        if (isEditMode) {
-            if (NativeLibrary.updateUserUsername(currentUUID, username)) {
-                saveImageIfNeeded()
-                findNavController().popBackStack()
-            } else {
-                showError(getString(R.string.profile_update_failed))
-            }
-        } else {
-            if (NativeLibrary.createUser(currentUUID, username)) {
-                saveImageIfNeeded()
-                findNavController().popBackStack()
-            } else {
-                showError(getString(R.string.profile_create_failed))
-            }
-        }
-    }
-
-    private fun saveImageIfNeeded() {
-        if (revertedToDefault && isEditMode) {
-            val imagePath = NativeLibrary.getUserImagePath(currentUUID)
-            if (imagePath != null) {
-                val imageFile = File(imagePath)
-                if (imageFile.exists()) {
-                    imageFile.delete()
-                }
-            }
-
-            return
-        }
-
-        if (!hasCustomImage) {
-            return
-        }
-
-        try {
-            val bitmapToSave: Bitmap? = when {
-                selectedFirmwareAvatar != null -> selectedFirmwareAvatar
-                selectedImageUri != null -> {
-                    val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                        val source = ImageDecoder.createSource(
-                            requireContext().contentResolver,
-                            selectedImageUri!!
-                        )
-                        ImageDecoder.decodeBitmap(source)
-                    } else {
-                        @Suppress("DEPRECATION")
-                        MediaStore.Images.Media.getBitmap(
-                            requireContext().contentResolver,
-                            selectedImageUri
-                        )
-                    }
-                    centerCropBitmap(bitmap, 256, 256)
-                }
-
-                else -> null
-            }
-
-            if (bitmapToSave == null) {
-                return
-            }
-
-            val tempFile = File(requireContext().cacheDir, "temp_avatar_${currentUUID}.jpg")
-            FileOutputStream(tempFile).use { out ->
-                bitmapToSave.compress(Bitmap.CompressFormat.JPEG, 100, out)
-            }
-
-            NativeLibrary.saveUserImage(currentUUID, tempFile.absolutePath)
-
-            tempFile.delete()
-        } catch (e: Exception) {
-            showError(getString(R.string.profile_image_save_error, e.message))
-        }
-    }
-
-    private fun centerCropBitmap(source: Bitmap, targetWidth: Int, targetHeight: Int): Bitmap {
-        val sourceWidth = source.width
-        val sourceHeight = source.height
-
-        val scale = maxOf(
-            targetWidth.toFloat() / sourceWidth,
-            targetHeight.toFloat() / sourceHeight
-        )
-
-        val scaledWidth = (sourceWidth * scale).toInt()
-        val scaledHeight = (sourceHeight * scale).toInt()
-
-        val scaledBitmap = source.scale(scaledWidth, scaledHeight)
-
-        val x = (scaledWidth - targetWidth) / 2
-        val y = (scaledHeight - targetHeight) / 2
-
-        return Bitmap.createBitmap(scaledBitmap, x, y, targetWidth, targetHeight)
-    }
-
-    private fun showError(message: String) {
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.error)
-            .setMessage(message)
-            .setPositiveButton(android.R.string.ok, null)
-            .show()
-    }
-
-    private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            val leftInset = barInsets.left + cutoutInsets.left
-            val topInset =  cutoutInsets.top
-            val rightInset = barInsets.right + cutoutInsets.right
-            val bottomInset = barInsets.bottom + cutoutInsets.bottom
-
-            binding.appbar.updatePadding(
-                left = leftInset,
-                top = topInset,
-                right = rightInset
-            )
-
-            binding.scrollContent.updatePadding(
-                left = leftInset,
-                right = rightInset
-            )
-
-            binding.buttonContainer.updatePadding(
-                left = leftInset,
-                right = rightInset,
-                bottom = bottomInset
-            )
-
-            windowInsets
-        }
-
-
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
@@ -690,18 +690,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        })
        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)

-        if (!BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean()) {
-            binding.drawerLayout.setDrawerLockMode(
-                DrawerLayout.LOCK_MODE_LOCKED_CLOSED,
-                binding.quickSettingsSheet
-            )
-        }
-
        updateGameTitle()

-        binding.inGameMenu.menu.findItem(R.id.menu_quick_settings)?.isVisible =
-            BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean()
-
        binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {
            val lockMode = IntSetting.LOCK_DRAWER.getInt()
            val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
@@ -759,11 +749,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    true
                }

-            if (BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean())
-                R.id.menu_quick_settings else 0 -> {
-                openQuickSettingsMenu()
-                true
-            }
+                R.id.menu_quick_settings -> {
+                    openQuickSettingsMenu()
+                    true
+                }

                R.id.menu_settings_per_game -> {
                    val action = HomeNavigationDirections.actionGlobalSettingsActivity(
@@ -1056,13 +1045,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }

            quickSettings.addBooleanSetting(
-                R.string.frame_limit_enable,
                container,
                BooleanSetting.RENDERER_USE_SPEED_LIMIT,
            )

            quickSettings.addSliderSetting(
-                R.string.frame_limit_slider,
                container,
                ShortSetting.RENDERER_SPEED_LIMIT,
                minValue = 0,
@@ -1071,7 +1058,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            )

            quickSettings.addBooleanSetting(
-                R.string.use_docked_mode,
                container,
                BooleanSetting.USE_DOCKED_MODE,
            )
@@ -1079,7 +1065,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            quickSettings.addDivider(container)

            quickSettings.addIntSetting(
-                R.string.renderer_accuracy,
                container,
                IntSetting.RENDERER_ACCURACY,
                R.array.rendererAccuracyNames,
@@ -1088,7 +1073,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {


            quickSettings.addIntSetting(
-                R.string.renderer_scaling_filter,
                container,
                IntSetting.RENDERER_SCALING_FILTER,
                R.array.rendererScalingFilterNames,
@@ -1096,7 +1080,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            )

            quickSettings.addSliderSetting(
-                R.string.fsr_sharpness,
                container,
                IntSetting.FSR_SHARPENING_SLIDER,
                minValue = 0,
@@ -1105,7 +1088,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            )

            quickSettings.addIntSetting(
-                R.string.renderer_anti_aliasing,
                container,
                IntSetting.RENDERER_ANTI_ALIASING,
                R.array.rendererAntiAliasingNames,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.fragments
@@ -110,7 +110,7 @@ class FreedrenoSettingsFragment : Fragment() {
        val commonVars = listOf(
            "TU_DEBUG", "FD_MESA_DEBUG", "IR3_SHADER_DEBUG",
            "FD_RD_DUMP", "FD_RD_DUMP_FRAMES", "FD_RD_DUMP_TESTNAME",
-            "TU_BREADCRUMBS", "FD_DEV_FEATURES"
+            "TU_BREADCRUMBS"
        )

        for (varName in commonVars) {
@@ -1,6 +1,3 @@
-// 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

@@ -9,13 +6,11 @@ package org.yuzu.yuzu_emu.fragments
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
-import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.DialogFolderPropertiesBinding
-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.utils.NativeConfig
@@ -30,18 +25,14 @@ class GameFolderPropertiesDialogFragment : DialogFragment() {
        val binding = DialogFolderPropertiesBinding.inflate(layoutInflater)
        val gameDir = requireArguments().parcelable<GameDir>(GAME_DIR)!!

-        // Hide deepScan for external content, do automatically
-        if (gameDir.type == DirectoryType.EXTERNAL_CONTENT) {
-            binding.deepScanSwitch.visibility = View.GONE
-        } else {
-            // Restore checkbox state for game dirs
-            binding.deepScanSwitch.isChecked =
-                savedInstanceState?.getBoolean(DEEP_SCAN) ?: gameDir.deepScan
+        // Restore checkbox state
+        binding.deepScanSwitch.isChecked =
+            savedInstanceState?.getBoolean(DEEP_SCAN) ?: gameDir.deepScan

+        // Ensure that we can get the checkbox state even if the view is destroyed
+        deepScan = binding.deepScanSwitch.isChecked
+        binding.deepScanSwitch.setOnClickListener {
            deepScan = binding.deepScanSwitch.isChecked
-            binding.deepScanSwitch.setOnClickListener {
-                deepScan = binding.deepScanSwitch.isChecked
-            }
        }

        return MaterialAlertDialogBuilder(requireContext())
@@ -50,10 +41,8 @@ class GameFolderPropertiesDialogFragment : DialogFragment() {
            .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
                val folderIndex = gamesViewModel.folders.value.indexOf(gameDir)
                if (folderIndex != -1) {
-                    if (gameDir.type == DirectoryType.GAME) {
-                        gamesViewModel.folders.value[folderIndex].deepScan =
-                            binding.deepScanSwitch.isChecked
-                    }
+                    gamesViewModel.folders.value[folderIndex].deepScan =
+                        binding.deepScanSwitch.isChecked
                    gamesViewModel.updateGameDirs()
                }
            }
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.fragments
@@ -15,14 +15,11 @@ 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
-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
@@ -76,25 +73,7 @@ class GameFoldersFragment : Fragment() {

        val mainActivity = requireActivity() as MainActivity
        binding.buttonAdd.setOnClickListener {
-            // Show a model to choose between Game and External Content
-            val options = arrayOf(
-                getString(R.string.games),
-                getString(R.string.external_content)
-            )
-
-            MaterialAlertDialogBuilder(requireContext())
-                .setTitle(R.string.add_folders)
-                .setItems(options) { _, which ->
-                    when (which) {
-                        0 -> { // Game Folder
-                            mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
-                        }
-                        1 -> { // External Content Folder
-                            mainActivity.getExternalContentDirectory.launch(null)
-                        }
-                    }
-                }
-                .show()
+            mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
        }

        setInsets()
@@ -1,7 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.fragments
@@ -117,17 +114,6 @@ class HomeSettingsFragment : Fragment() {
                    }
                )
            )
-            add(
-                HomeSetting(
-                    R.string.profile_manager,
-                    R.string.profile_manager_description,
-                    R.drawable.ic_account_circle,
-                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_profileManagerFragment)
-                    }
-                )
-            )
            add(
                HomeSetting(
                    R.string.gpu_driver_manager,
@@ -236,14 +222,6 @@ class HomeSettingsFragment : Fragment() {
                    { shareLog() }
                )
            )
-            add(
-                HomeSetting(
-                    R.string.share_gpu_log,
-                    R.string.share_gpu_log_description,
-                    R.drawable.ic_log,
-                    { shareGpuLog() }
-                )
-            )
            add(
                HomeSetting(
                    R.string.open_user_folder,
@@ -430,40 +408,6 @@ class HomeSettingsFragment : Fragment() {
        }
    }

-    private fun shareGpuLog() {
-        val currentLog = DocumentFile.fromSingleUri(
-            mainActivity,
-            DocumentsContract.buildDocumentUri(
-                DocumentProvider.AUTHORITY,
-                "${DocumentProvider.ROOT_ID}/log/eden_gpu.log"
-            )
-        )!!
-        val oldLog = DocumentFile.fromSingleUri(
-            mainActivity,
-            DocumentsContract.buildDocumentUri(
-                DocumentProvider.AUTHORITY,
-                "${DocumentProvider.ROOT_ID}/log/eden_gpu.log.old.txt"
-            )
-        )!!
-
-        val intent = Intent(Intent.ACTION_SEND)
-            .setDataAndType(currentLog.uri, FileUtil.TEXT_PLAIN)
-            .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        if (!Log.gameLaunched && oldLog.exists()) {
-            intent.putExtra(Intent.EXTRA_STREAM, oldLog.uri)
-            startActivity(Intent.createChooser(intent, getText(R.string.share_gpu_log)))
-        } else if (currentLog.exists()) {
-            intent.putExtra(Intent.EXTRA_STREAM, currentLog.uri)
-            startActivity(Intent.createChooser(intent, getText(R.string.share_gpu_log)))
-        } else {
-            Toast.makeText(
-                requireContext(),
-                getText(R.string.share_gpu_log_missing),
-                Toast.LENGTH_SHORT
-            ).show()
-        }
-    }
-
    private fun setInsets() =
        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
@@ -1,190 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.ProfileAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentProfileManagerBinding
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.UserProfile
-import org.yuzu.yuzu_emu.utils.NativeConfig
-
-class ProfileManagerFragment : Fragment() {
-    private var _binding: FragmentProfileManagerBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-    private lateinit var profileAdapter: ProfileAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentProfileManagerBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        binding.toolbarProfiles.setNavigationOnClickListener {
-            findNavController().popBackStack()
-        }
-
-        setupRecyclerView()
-        loadProfiles()
-
-        binding.buttonAddUser.setOnClickListener {
-            if (NativeLibrary.canCreateUser()) {
-                findNavController().navigate(R.id.action_profileManagerFragment_to_newUserDialog)
-            } else {
-                MaterialAlertDialogBuilder(requireContext())
-                    .setTitle(R.string.profile_max_users_title)
-                    .setMessage(R.string.profile_max_users_message)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .show()
-            }
-        }
-
-        setInsets()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        loadProfiles()
-    }
-
-    private fun setupRecyclerView() {
-        profileAdapter = ProfileAdapter(
-            onProfileClick = { profile -> selectProfile(profile) },
-            onEditClick = { profile -> editProfile(profile) },
-            onDeleteClick = { profile -> confirmDeleteProfile(profile) }
-        )
-        binding.listProfiles.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = profileAdapter
-        }
-    }
-
-    private fun loadProfiles() {
-        val profiles = mutableListOf<UserProfile>()
-        val userUUIDs = NativeLibrary.getAllUsers() ?: emptyArray()
-        val currentUserUUID = NativeLibrary.getCurrentUser()
-
-        for (uuid in userUUIDs) {
-            if (uuid.isNotEmpty()) {
-                val username = NativeLibrary.getUserUsername(uuid)
-                if (!username.isNullOrEmpty()) {
-                    val imagePath = NativeLibrary.getUserImagePath(uuid) ?: ""
-                    profiles.add(UserProfile(uuid, username, imagePath))
-                }
-            }
-        }
-
-        profileAdapter.submitList(profiles)
-        profileAdapter.setCurrentUser(currentUserUUID ?: "")
-
-        binding.buttonAddUser.isEnabled = NativeLibrary.canCreateUser()
-    }
-
-    private fun selectProfile(profile: UserProfile) {
-        if (NativeLibrary.setCurrentUser(profile.uuid)) {
-            loadProfiles()
-        }
-    }
-
-
-    private fun editProfile(profile: UserProfile) {
-        val bundle = Bundle().apply {
-            putString("uuid", profile.uuid)
-            putString("username", profile.username)
-        }
-        findNavController().navigate(R.id.action_profileManagerFragment_to_newUserDialog, bundle)
-    }
-
-    private fun confirmDeleteProfile(profile: UserProfile) {
-        val currentUser = NativeLibrary.getCurrentUser()
-        val isCurrentUser = profile.uuid == currentUser
-
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.profile_delete_confirm_title)
-            .setMessage(
-                if (isCurrentUser) {
-                    getString(R.string.profile_delete_current_user_message, profile.username)
-                } else {
-                    getString(R.string.profile_delete_confirm_message, profile.username)
-                }
-            )
-            .setPositiveButton(R.string.profile_delete) { _, _ ->
-                deleteProfile(profile)
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .show()
-    }
-
-    private fun deleteProfile(profile: UserProfile) {
-        val currentUser = NativeLibrary.getCurrentUser()
-        if (!currentUser.isNullOrEmpty() && profile.uuid == currentUser) {
-            val users = NativeLibrary.getAllUsers() ?: emptyArray()
-            for (uuid in users) {
-                if (uuid.isNotEmpty() && uuid != profile.uuid) {
-                    NativeLibrary.setCurrentUser(uuid)
-                    break
-                }
-            }
-        }
-
-        if (NativeLibrary.removeUser(profile.uuid)) {
-            loadProfiles()
-        }
-    }
-
-    private fun setInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            val leftInsets = barInsets.left + cutoutInsets.left
-            val rightInsets = barInsets.right + cutoutInsets.right
-
-            val fabLayoutParams = binding.buttonAddUser.layoutParams as ViewGroup.MarginLayoutParams
-            fabLayoutParams.leftMargin = leftInsets + 24
-            fabLayoutParams.rightMargin = rightInsets + 24
-            fabLayoutParams.bottomMargin = barInsets.bottom + 24
-            binding.buttonAddUser.layoutParams = fabLayoutParams
-
-            windowInsets
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        NativeConfig.saveGlobalConfig()
-        _binding = null
-    }
-}
@@ -1,6 +1,3 @@
-// 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

@@ -51,68 +48,16 @@ class AddonViewModel : ViewModel() {
                        ?: emptyArray()
                    ).toMutableList()
                patchList.sortBy { it.name }
-
-                // Ensure only one update is enabled
-                ensureSingleUpdateEnabled(patchList)
-
-                removeDuplicates(patchList)
-
                _patchList.value = patchList
                isRefreshing.set(false)
            }
        }
    }

-    private fun ensureSingleUpdateEnabled(patchList: MutableList<Patch>) {
-        val updates = patchList.filter { PatchType.from(it.type) == PatchType.Update }
-        if (updates.size <= 1) {
-            return
-        }
-
-        val enabledUpdates = updates.filter { it.enabled }
-
-        if (enabledUpdates.size > 1) {
-            val nandOrSdmcEnabled = enabledUpdates.find {
-                it.name.contains("(NAND)") || it.name.contains("(SDMC)")
-            }
-
-            val updateToKeep = nandOrSdmcEnabled ?: enabledUpdates.first()
-
-            for (patch in patchList) {
-                if (PatchType.from(patch.type) == PatchType.Update) {
-                    patch.enabled = (patch === updateToKeep)
-                }
-            }
-        }
-    }
-
-    private fun removeDuplicates(patchList: MutableList<Patch>) {
-        val seen = mutableSetOf<String>()
-        val iterator = patchList.iterator()
-        while (iterator.hasNext()) {
-            val patch = iterator.next()
-            val key = "${patch.name}|${patch.version}|${patch.type}"
-            if (seen.contains(key)) {
-                iterator.remove()
-            } else {
-                seen.add(key)
-            }
-        }
-    }
-
    fun setAddonToDelete(patch: Patch?) {
        _addonToDelete.value = patch
    }

-    fun enableOnlyThisUpdate(selectedPatch: Patch) {
-        val currentList = _patchList.value
-        for (patch in currentList) {
-            if (PatchType.from(patch.type) == PatchType.Update) {
-                patch.enabled = (patch === selectedPatch)
-            }
-        }
-    }
-
    fun onDeleteAddon(patch: Patch) {
        when (PatchType.from(patch.type)) {
            PatchType.Update -> NativeLibrary.removeUpdate(patch.programId)
@@ -127,27 +72,13 @@ class AddonViewModel : ViewModel() {
            return
        }

-        // Check if there are multiple update versions
-        val updates = _patchList.value.filter { PatchType.from(it.type) == PatchType.Update }
-        val hasMultipleUpdates = updates.size > 1
-
        NativeConfig.setDisabledAddons(
            game!!.programId,
            _patchList.value.mapNotNull {
                if (it.enabled) {
                    null
                } else {
-                    if (PatchType.from(it.type) == PatchType.Update) {
-                        if (it.name.contains("(NAND)") || it.name.contains("(SDMC)")) {
-                            it.name
-                        } else if (hasMultipleUpdates) {
-                            "Update@${it.numericVersion}"
-                        } else {
-                            it.name
-                        }
-                    } else {
-                        it.name
-                    }
+                    it.name
                }
            }.toTypedArray()
        )
@@ -1,6 +1,3 @@
-// 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

@@ -12,14 +9,5 @@ import kotlinx.parcelize.Parcelize
@Parcelize
 data class GameDir(
    val uriString: String,
-    var deepScan: Boolean,
-    val type: DirectoryType = DirectoryType.GAME
-) : Parcelable {
-    // Needed for JNI backward compatability
-    constructor(uriString: String, deepScan: Boolean) : this(uriString, deepScan, DirectoryType.GAME)
-}
-
-enum class DirectoryType {
-    GAME,
-    EXTERNAL_CONTENT
-}
+    var deepScan: Boolean
+) : Parcelable
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.model
@@ -56,7 +56,7 @@ class GamesViewModel : ViewModel() {
        // Ensure keys are loaded so that ROM metadata can be decrypted.
        NativeLibrary.reloadKeys()

-        getGameDirsAndExternalContent()
+        getGameDirs()
        reloadGames(directoriesChanged = false, firstStartup = true)
    }

@@ -144,19 +144,11 @@ class GamesViewModel : ViewModel() {
    fun addFolder(gameDir: GameDir, savedFromGameFragment: Boolean) =
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                when (gameDir.type) {
-                    DirectoryType.GAME -> {
-                        NativeConfig.addGameDir(gameDir)
-                        val isFirstTimeSetup = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-                            .getBoolean(org.yuzu.yuzu_emu.features.settings.model.Settings.PREF_FIRST_APP_LAUNCH, true)
-                        getGameDirsAndExternalContent(!isFirstTimeSetup)
-                    }
-                    DirectoryType.EXTERNAL_CONTENT -> {
-                        addExternalContentDir(gameDir.uriString)
-                        NativeConfig.saveGlobalConfig()
-                        getGameDirsAndExternalContent()
-                    }
-                }
+                NativeConfig.addGameDir(gameDir)
+                val isFirstTimeSetup = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+                    .getBoolean(org.yuzu.yuzu_emu.features.settings.model.Settings.PREF_FIRST_APP_LAUNCH, true)
+
+                getGameDirs(!isFirstTimeSetup)
            }

            if (savedFromGameFragment) {
@@ -176,15 +168,8 @@ class GamesViewModel : ViewModel() {
                val removedDirIndex = gameDirs.indexOf(gameDir)
                if (removedDirIndex != -1) {
                    gameDirs.removeAt(removedDirIndex)
-                    when (gameDir.type) {
-                        DirectoryType.GAME -> {
-                            NativeConfig.setGameDirs(gameDirs.filter { it.type == DirectoryType.GAME }.toTypedArray())
-                        }
-                        DirectoryType.EXTERNAL_CONTENT -> {
-                            removeExternalContentDir(gameDir.uriString)
-                        }
-                    }
-                    getGameDirsAndExternalContent()
+                    NativeConfig.setGameDirs(gameDirs.toTypedArray())
+                    getGameDirs()
                }
            }
        }
@@ -192,16 +177,15 @@ class GamesViewModel : ViewModel() {
    fun updateGameDirs() =
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                val gameDirs = _folders.value.filter { it.type == DirectoryType.GAME }
-                NativeConfig.setGameDirs(gameDirs.toTypedArray())
-                getGameDirsAndExternalContent()
+                NativeConfig.setGameDirs(_folders.value.toTypedArray())
+                getGameDirs()
            }
        }

    fun onOpenGameFoldersFragment() =
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                getGameDirsAndExternalContent()
+                getGameDirs()
            }
        }

@@ -209,36 +193,16 @@ class GamesViewModel : ViewModel() {
        NativeConfig.saveGlobalConfig()
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                getGameDirsAndExternalContent(true)
+                getGameDirs(true)
            }
        }
    }

-    private fun getGameDirsAndExternalContent(reloadList: Boolean = false) {
-        val gameDirs = NativeConfig.getGameDirs().toMutableList()
-        val externalContentDirs = NativeConfig.getExternalContentDirs().map {
-            GameDir(it, false, DirectoryType.EXTERNAL_CONTENT)
-        }
-        gameDirs.addAll(externalContentDirs)
-        _folders.value = gameDirs
+    private fun getGameDirs(reloadList: Boolean = false) {
+        val gameDirs = NativeConfig.getGameDirs()
+        _folders.value = gameDirs.toMutableList()
        if (reloadList) {
            reloadGames(true)
        }
    }
-
-    private fun addExternalContentDir(path: String) {
-        val currentDirs = NativeConfig.getExternalContentDirs().toMutableList()
-        if (!currentDirs.contains(path)) {
-            currentDirs.add(path)
-            NativeConfig.setExternalContentDirs(currentDirs.toTypedArray())
-            NativeConfig.saveGlobalConfig()
-        }
-    }
-
-    private fun removeExternalContentDir(path: String) {
-        val currentDirs = NativeConfig.getExternalContentDirs().toMutableList()
-        currentDirs.remove(path)
-        NativeConfig.setExternalContentDirs(currentDirs.toTypedArray())
-        NativeConfig.saveGlobalConfig()
-    }
 }
@@ -1,6 +1,3 @@
-// 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

@@ -15,6 +12,5 @@ data class Patch(
    val version: String,
    val type: Int,
    val programId: String,
-    val titleId: String,
-    val numericVersion: Long = 0
+    val titleId: String
 )
@@ -1,21 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class UserProfile(
-    val uuid: String,
-    val username: String,
-    val imagePath: String = ""
-) : Parcelable
-
-object ProfileUtils {
-    fun generateRandomUUID(): String {
-        val uuid = java.util.UUID.randomUUID()
-        return uuid.toString().replace("-", "")
-    }
-}
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.ui
@@ -13,7 +13,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.PopupMenu
-import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -28,14 +27,10 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.GameAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.model.AppletInfo
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
@@ -178,16 +173,10 @@ class GamesFragment : Fragment() {

        setupTopView()

-        updateButtonsVisibility()
-
        binding.addDirectory.setOnClickListener {
            getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
        }

-        binding.launchQlaunch?.setOnClickListener {
-            launchQLaunch()
-        }
-
        setInsets()
    }

@@ -456,47 +445,6 @@ class GamesFragment : Fragment() {
        }
    }

-    private fun launchQLaunch() {
-        try {
-            val appletPath = NativeLibrary.getAppletLaunchPath(AppletInfo.QLaunch.entryId)
-            if (appletPath.isEmpty()) {
-                Toast.makeText(
-                    requireContext(),
-                    R.string.applets_error_applet,
-                    Toast.LENGTH_SHORT
-                ).show()
-                return
-            }
-
-            NativeLibrary.setCurrentAppletId(AppletInfo.QLaunch.appletId)
-
-            val qlaunchGame = Game(
-                title = getString(R.string.qlaunch_applet),
-                path = appletPath
-            )
-
-            val action = HomeNavigationDirections.actionGlobalEmulationActivity(qlaunchGame)
-            findNavController().navigate(action)
-        } catch (e: Exception) {
-            Toast.makeText(
-                requireContext(),
-                "Failed to launch QLaunch: ${e.message}",
-                Toast.LENGTH_SHORT
-            ).show()
-        }
-    }
-
-    private fun updateButtonsVisibility() {
-        val showQLaunch = BooleanSetting.ENABLE_QLAUNCH_BUTTON.getBoolean()
-        val showFolder = BooleanSetting.ENABLE_FOLDER_BUTTON.getBoolean()
-        val isFirmwareAvailable = NativeLibrary.isFirmwareAvailable()
-
-        val shouldShowQLaunch = showQLaunch && isFirmwareAvailable
-        binding.launchQlaunch.visibility = if (shouldShowQLaunch) View.VISIBLE else View.GONE
-
-        binding.addDirectory.visibility = if (showFolder) View.VISIBLE else View.GONE
-    }
-
    private fun setInsets() =
        ViewCompat.setOnApplyWindowInsetsListener(
            binding.root
@@ -550,13 +498,6 @@ class GamesFragment : Fragment() {
            mlpFab.rightMargin = rightInset + fabPadding
            binding.addDirectory.layoutParams = mlpFab

-            binding.launchQlaunch?.let { qlaunchButton ->
-                val mlpQLaunch = qlaunchButton.layoutParams as ViewGroup.MarginLayoutParams
-                mlpQLaunch.leftMargin = leftInset + fabPadding
-                mlpQLaunch.bottomMargin = barInsets.bottom + fabPadding
-                qlaunchButton.layoutParams = mlpQLaunch
-            }
-
            val navInsets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
            val gestureInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures())
            val bottomInset = maxOf(navInsets.bottom, gestureInsets.bottom, cutoutInsets.bottom)
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.ui.main
@@ -63,7 +63,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import androidx.documentfile.provider.DocumentFile

 class MainActivity : AppCompatActivity(), ThemeProvider {
    private lateinit var binding: ActivityMainBinding
@@ -184,25 +183,18 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            val latestVersion = NativeLibrary.checkForUpdate()
            if (latestVersion != null) {
                runOnUiThread {
-                    val tag: String = latestVersion[0]
-                    val name: String = latestVersion[1]
-                    showUpdateDialog(tag, name)
+                    showUpdateDialog(latestVersion)
                }
            }
        }.start()
    }

-    private fun showUpdateDialog(tag: String, name: String) {
+    private fun showUpdateDialog(version: String) {
        MaterialAlertDialogBuilder(this)
            .setTitle(R.string.update_available)
-            .setMessage(getString(R.string.update_available_description, name))
+            .setMessage(getString(R.string.update_available_description, version))
            .setPositiveButton(android.R.string.ok) { _, _ ->
-                var artifact = tag
-                // Nightly builds have a slightly different format
-                if (NativeLibrary.isNightlyBuild()) {
-                    artifact = tag.substringAfter('.', tag)
-                }
-                downloadAndInstallUpdate(tag, artifact)
+                downloadAndInstallUpdate(version)
            }
            .setNeutralButton(R.string.cancel) { dialog, _ ->
                dialog.dismiss()
@@ -215,11 +207,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            .show()
    }

-    private fun downloadAndInstallUpdate(version: String, artifact: String) {
+    private fun downloadAndInstallUpdate(version: String) {
        CoroutineScope(Dispatchers.IO).launch {
            val packageId = applicationContext.packageName
-            val apkUrl = NativeLibrary.getUpdateApkUrl(version, artifact, packageId)
-            val apkFile = File(cacheDir, "update-$artifact.apk")
+            val apkUrl = NativeLibrary.getUpdateApkUrl(version, packageId)
+            val apkFile = File(cacheDir, "update-$version.apk")

            withContext(Dispatchers.Main) {
                showDownloadProgressDialog()
@@ -389,13 +381,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            }
        }

-    val getExternalContentDirectory =
-        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
-            if (result != null) {
-                processExternalContentDir(result)
-            }
-        }
-
    fun processGamesDir(result: Uri, calledFromGameFragment: Boolean = false) {
        contentResolver.takePersistableUriPermission(
            result,
@@ -417,27 +402,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            .show(supportFragmentManager, AddGameFolderDialogFragment.TAG)
    }

-    fun processExternalContentDir(result: Uri) {
-        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(
-                applicationContext,
-                R.string.folder_already_added,
-                Toast.LENGTH_SHORT
-            ).show()
-            return
-        }
-
-        val externalContentDir = org.yuzu.yuzu_emu.model.GameDir(uriString, false, org.yuzu.yuzu_emu.model.DirectoryType.EXTERNAL_CONTENT)
-        gamesViewModel.addFolder(externalContentDir, savedFromGameFragment = false)
-    }
-
    val getProdKey = registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
        if (result != null) {
            processKey(result, "keys")
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.utils
@@ -25,7 +25,6 @@ object DirectoryInitialization {
            initializeInternalStorage()
            NativeLibrary.initializeSystem(false)
            NativeConfig.initializeGlobalConfig()
-            NativeLibrary.reloadProfiles()
            migrateSettings()
            areDirectoriesReady = true
        }
@@ -1,9 +1,9 @@
-// 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

+// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 package org.yuzu.yuzu_emu.utils

 import android.content.SharedPreferences
@@ -49,17 +49,6 @@ object GameHelper {
        // Remove previous filesystem provider information so we can get up to date version info
        NativeLibrary.clearFilesystemProvider()

-        // Scan External Content directories and register all NSP/XCI files
-        val externalContentDirs = NativeConfig.getExternalContentDirs()
-        for (externalDir in externalContentDirs) {
-            if (externalDir.isNotEmpty()) {
-                val externalDirUri = externalDir.toUri()
-                if (FileUtil.isTreeUriValid(externalDirUri)) {
-                    scanExternalContentRecursive(FileUtil.listFiles(externalDirUri), 3)
-                }
-            }
-        }
-
        val badDirs = mutableListOf<Int>()
        gameDirs.forEachIndexed { index: Int, gameDir: GameDir ->
            val gameDirUri = gameDir.uriString.toUri()
@@ -99,33 +88,6 @@ object GameHelper {
        return games.toList()
    }

-    // File extensions considered as external content, buuut should
-    // be done better imo.
-    private val externalContentExtensions = setOf("nsp", "xci")
-
-    private fun scanExternalContentRecursive(
-        files: Array<MinimalDocumentFile>,
-        depth: Int
-    ) {
-        if (depth <= 0) {
-            return
-        }
-
-        files.forEach {
-            if (it.isDirectory) {
-                scanExternalContentRecursive(
-                    FileUtil.listFiles(it.uri),
-                    depth - 1
-                )
-            } else {
-                val extension = FileUtil.getExtension(it.uri).lowercase()
-                if (externalContentExtensions.contains(extension)) {
-                    NativeLibrary.addFileToFilesystemProvider(it.uri.toString())
-                }
-            }
-        }
-    }
-
    private fun addGamesRecursive(
        games: MutableList<Game>,
        files: Array<MinimalDocumentFile>,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -204,12 +204,4 @@ object NativeConfig {
    external fun getSdmcDir(): String
    @Synchronized
    external fun setSdmcDir(path: String)
-
-    /**
-     * External Content Provider
-     */
-    @Synchronized
-    external fun getExternalContentDirs(): Array<String>
-    @Synchronized
-    external fun setExternalContentDirs(dirs: Array<String>)
 }
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.utils
@@ -144,15 +144,6 @@ object FreedrenoPresets {
        )
    )

-    val DEV_FEATURES_UBWC_HINT = FreedrenoPreset(
-        name = "Dev - UBWC Flag Hint",
-        description = "Enable TP UBWC flag hint for development",
-        icon = "ic_dev_features",
-        variables = mapOf(
-            "FD_DEV_FEATURES" to "enable_tp_ubwc_flag_hint=1"
-        )
-    )
-
    val PERFORMANCE_DEFAULT = FreedrenoPreset(
        name = "Performance - Default",
        description = "Clear all debug options for performance",
@@ -168,7 +159,6 @@ object FreedrenoPresets {
        CAPTURE_FRAMES,
        SHADER_DEBUG,
        GPU_HANG_TRACE,
-        DEV_FEATURES_UBWC_HINT,
        PERFORMANCE_DEFAULT
    )
 }
@@ -1,9 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include <common/fs/path_util.h>
 #include <common/logging/log.h>
-#include <common/settings.h>
 #include <input_common/main.h>
 #include "android_config.h"
 #include "android_settings.h"
@@ -70,18 +69,6 @@ void AndroidConfig::ReadPathValues() {
    }
    EndArray();

-    // Read external content directories
-    Settings::values.external_content_dirs.clear();
-    const int external_dirs_size = BeginArray(std::string("external_content_dirs"));
-    for (int i = 0; i < external_dirs_size; ++i) {
-        SetArrayIndex(i);
-        std::string dir_path = ReadStringSetting(std::string("path"));
-        if (!dir_path.empty()) {
-            Settings::values.external_content_dirs.push_back(dir_path);
-        }
-    }
-    EndArray();
-
    const auto nand_dir_setting = ReadStringSetting(std::string("nand_directory"));
    if (!nand_dir_setting.empty()) {
        Common::FS::SetEdenPath(Common::FS::EdenPath::NANDDir, nand_dir_setting);
@@ -254,14 +241,6 @@ void AndroidConfig::SavePathValues() {
    }
    EndArray();

-    // Save external content directories
-    BeginArray(std::string("external_content_dirs"));
-    for (size_t i = 0; i < Settings::values.external_content_dirs.size(); ++i) {
-        SetArrayIndex(i);
-        WriteStringSetting(std::string("path"), Settings::values.external_content_dirs[i]);
-    }
-    EndArray();
-
    // Save custom NAND directory
    const auto nand_path = Common::FS::GetEdenPathString(Common::FS::EdenPath::NANDDir);
    WriteStringSetting(std::string("nand_directory"), nand_path,
@@ -65,10 +65,6 @@ namespace AndroidSettings {
        Settings::Setting<s32> app_language{linkage, 0, "app_language", Settings::Category::Android};
        Settings::Setting<bool> enable_update_checks{linkage, true, "enable_update_checks",
                                                  Settings::Category::Android};
-        Settings::Setting<bool> enable_folder_button{linkage, true, "enable_folder_button",
-                                                  Settings::Category::Android};
-        Settings::Setting<bool> enable_qlaunch_button{linkage, false, "enable_qlaunch_button",
-                                                  Settings::Category::Android};

        // Input/performance overlay settings
        std::vector<OverlayControlData> overlay_control_data;
@@ -202,14 +198,9 @@ namespace AndroidSettings {
                                                    Settings::Specialization::Default, true, true,
                                                    &show_soc_overlay};

-        // MISC
        Settings::Setting<bool> dont_show_driver_shader_warning{linkage, false,
                                                                "dont_show_driver_shader_warning",
                                                                Settings::Category::Android, Settings::Specialization::Default, true, true};
-        Settings::Setting<bool> enable_quick_settings{linkage, true,
-                                                        "enable_quick_settings",
-                                                        Settings::Category::Android, Settings::Specialization::Default, true,
-                                                      false};
    };

    extern Values values;
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -49,17 +49,12 @@
 #include "common/settings.h"
 #include "common/string_util.h"
 #include "frontend_common/play_time_manager.h"
-#include "core/constants.h"
 #include "core/core.h"
 #include "core/cpu_manager.h"
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/card_image.h"
 #include "core/file_sys/content_archive.h"
-#include "core/file_sys/control_metadata.h"
 #include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/romfs.h"
-#include "core/file_sys/nca_metadata.h"
-#include "core/file_sys/romfs.h"
 #include "core/file_sys/submission_package.h"
 #include "core/file_sys/vfs/vfs.h"
 #include "core/file_sys/vfs/vfs_real.h"
@@ -215,109 +210,6 @@ void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath)
        return;
    }

-    const auto extension = Common::ToLower(filepath.substr(filepath.find_last_of('.') + 1));
-
-    if (extension == "nsp") {
-        auto nsp = std::make_shared<FileSys::NSP>(file);
-        if (nsp->GetStatus() == Loader::ResultStatus::Success) {
-            std::map<u64, u32> nsp_versions;
-            std::map<u64, std::string> nsp_version_strings;
-
-            for (const auto& [title_id, nca_map] : nsp->GetNCAs()) {
-                for (const auto& [type_pair, nca] : nca_map) {
-                    const auto& [title_type, content_type] = type_pair;
-
-                    if (content_type == FileSys::ContentRecordType::Meta) {
-                        const auto meta_nca = std::make_shared<FileSys::NCA>(nca->GetBaseFile());
-                        if (meta_nca->GetStatus() == Loader::ResultStatus::Success) {
-                            const auto section0 = meta_nca->GetSubdirectories();
-                            if (!section0.empty()) {
-                                for (const auto& meta_file : section0[0]->GetFiles()) {
-                                    if (meta_file->GetExtension() == "cnmt") {
-                                        FileSys::CNMT cnmt(meta_file);
-                                        nsp_versions[cnmt.GetTitleID()] = cnmt.GetTitleVersion();
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if (content_type == FileSys::ContentRecordType::Control &&
-                        title_type == FileSys::TitleType::Update) {
-                        auto romfs = nca->GetRomFS();
-                        if (romfs) {
-                            auto extracted = FileSys::ExtractRomFS(romfs);
-                            if (extracted) {
-                                auto nacp_file = extracted->GetFile("control.nacp");
-                                if (!nacp_file) {
-                                    nacp_file = extracted->GetFile("Control.nacp");
-                                }
-                                if (nacp_file) {
-                                    FileSys::NACP nacp(nacp_file);
-                                    auto ver_str = nacp.GetVersionString();
-                                    if (!ver_str.empty()) {
-                                        nsp_version_strings[title_id] = ver_str;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (const auto& [title_id, nca_map] : nsp->GetNCAs()) {
-                for (const auto& [type_pair, nca] : nca_map) {
-                    const auto& [title_type, content_type] = type_pair;
-
-                    if (title_type == FileSys::TitleType::Update) {
-                        u32 version = 0;
-                        auto ver_it = nsp_versions.find(title_id);
-                        if (ver_it != nsp_versions.end()) {
-                            version = ver_it->second;
-                        }
-
-                        std::string version_string;
-                        auto str_it = nsp_version_strings.find(title_id);
-                        if (str_it != nsp_version_strings.end()) {
-                            version_string = str_it->second;
-                        }
-
-                        m_manual_provider->AddEntryWithVersion(
-                            title_type, content_type, title_id, version, version_string,
-                            nca->GetBaseFile());
-
-                        LOG_DEBUG(Frontend, "Added NSP update entry - TitleID: {:016X}, Version: {}, VersionStr: {}",
-                                  title_id, version, version_string);
-                    } else {
-                        // Use regular AddEntry for non-updates
-                        m_manual_provider->AddEntry(title_type, content_type, title_id,
-                                                    nca->GetBaseFile());
-                        LOG_DEBUG(Frontend, "Added NSP entry - TitleID: {:016X}, TitleType: {}, ContentType: {}",
-                                  title_id, static_cast<int>(title_type), static_cast<int>(content_type));
-                    }
-                }
-            }
-            return;
-        }
-    }
-
-    // Handle XCI files
-    if (extension == "xci") {
-        FileSys::XCI xci{file};
-        if (xci.GetStatus() == Loader::ResultStatus::Success) {
-            const auto nsp = xci.GetSecurePartitionNSP();
-            if (nsp) {
-                for (const auto& title : nsp->GetNCAs()) {
-                    for (const auto& entry : title.second) {
-                        m_manual_provider->AddEntry(entry.first.first, entry.first.second, title.first,
-                                                    entry.second->GetBaseFile());
-                    }
-                }
-            }
-            return;
-        }
-    }
-
    auto loader = Loader::GetLoader(m_system, file);
    if (!loader) {
        return;
@@ -334,6 +226,17 @@ void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath)
        m_manual_provider->AddEntry(FileSys::TitleType::Application,
                                    FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()),
                                    program_id, file);
+    } else if (res2 == Loader::ResultStatus::Success &&
+               (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) {
+        const auto nsp = file_type == Loader::FileType::NSP
+                             ? std::make_shared<FileSys::NSP>(file)
+                             : FileSys::XCI{file}.GetSecurePartitionNSP();
+        for (const auto& title : nsp->GetNCAs()) {
+            for (const auto& entry : title.second) {
+                m_manual_provider->AddEntry(entry.first.first, entry.first.second, title.first,
+                                            entry.second->GetBaseFile());
+            }
+        }
    }
 }

@@ -1428,8 +1331,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
            Common::Android::ToJString(env, patch.name),
            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));
+            Common::Android::ToJString(env, std::to_string(patch.title_id)));
        env->SetObjectArrayElement(jpatchArray, i, jpatch);
        ++i;
    }
@@ -1693,6 +1595,7 @@ JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_updatePowerState(
    g_has_battery.store(hasBattery, std::memory_order_relaxed);
 }

+//  return #ifdef ENABLE_UPDATE_CHECKER
 JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isUpdateCheckerEnabled(
        JNIEnv* env,
        jobject obj) {
@@ -1703,39 +1606,22 @@ JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isUpdateChecker
 #endif
    }

-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isNightlyBuild(
-    JNIEnv* env,
-    jobject obj) {
-#ifdef NIGHTLY_BUILD
-    return JNI_TRUE;
-#else
-    return JNI_FALSE;
-#endif
-}
-
 #ifdef ENABLE_UPDATE_CHECKER

-
-JNIEXPORT jobjectArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_checkForUpdate(
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_checkForUpdate(
        JNIEnv* env,
        jobject obj) {
-    std::optional<UpdateChecker::Update> release = UpdateChecker::GetUpdate();
-    if (!release) return nullptr;
+    const bool is_prerelease = ((strstr(Common::g_build_version, "pre-alpha") != nullptr) ||
+                                (strstr(Common::g_build_version, "alpha") != nullptr) ||
+                                (strstr(Common::g_build_version, "beta") != nullptr) ||
+                                (strstr(Common::g_build_version, "rc") != nullptr));
+    const std::optional<std::string> latest_release_tag =
+        UpdateChecker::GetLatestRelease(is_prerelease);

-    const std::string tag = release->tag;
-    const std::string name = release->name;
-
-    jobjectArray result = env->NewObjectArray(2, env->FindClass("java/lang/String"), nullptr);
-
-    const jstring jtag = env->NewStringUTF(tag.c_str());
-    const jstring jname = env->NewStringUTF(name.c_str());
-
-    env->SetObjectArrayElement(result, 0, jtag);
-    env->SetObjectArrayElement(result, 1, jname);
-    env->DeleteLocalRef(jtag);
-    env->DeleteLocalRef(jname);
-
-    return result;
+    if (latest_release_tag && latest_release_tag.value() != Common::g_build_version) {
+        return env->NewStringUTF(latest_release_tag.value().c_str());
+    }
+    return nullptr;
 }

 JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl(
@@ -1754,11 +1640,9 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl(
 JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateApkUrl(
        JNIEnv* env,
        jobject obj,
-        jstring tag,
-        jstring artifact,
+        jstring version,
        jstring packageId) {
-    const char* version_str = env->GetStringUTFChars(tag, nullptr);
-    const char* artifact_str = env->GetStringUTFChars(artifact, nullptr);
+    const char* version_str = env->GetStringUTFChars(version, nullptr);
    const char* package_id_str = env->GetStringUTFChars(packageId, nullptr);

    std::string variant;
@@ -1769,22 +1653,17 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateApkUrl(
    } else if (package_id.find("com.miHoYo.Yuanshen") != std::string::npos) {
        variant = "optimized";
    } else {
-#ifdef ARCHITECTURE_arm64
        variant = "standard";
-#else
-        variant = "chromeos";
-#endif
    }

-    const std::string apk_filename = fmt::format("Eden-Android-{}-{}.apk", artifact_str, variant);
+    const std::string apk_filename = fmt::format("Eden-Android-{}-{}.apk", version_str, variant);
    const std::string url = fmt::format("{}/{}/releases/download/{}/{}",
        std::string{Common::g_build_auto_update_website},
        std::string{Common::g_build_auto_update_repo},
        version_str,
        apk_filename);

-    env->ReleaseStringUTFChars(tag, version_str);
-    env->ReleaseStringUTFChars(artifact, artifact_str);
+    env->ReleaseStringUTFChars(version, version_str);
    env->ReleaseStringUTFChars(packageId, package_id_str);
    return env->NewStringUTF(url.c_str());
 }
@@ -1796,388 +1675,4 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getBuildVersion(
    return env->NewStringUTF(Common::g_build_version);
 }

-JNIEXPORT jobjectArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getAllUsers(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-
-    manager.ResetUserSaveFile();
-
-    if (manager.GetUserCount() == 0) {
-        manager.CreateNewUser(Common::UUID::MakeRandom(), "Eden");
-        manager.WriteUserSaveFile();
-    }
-
-    const auto& users = manager.GetAllUsers();
-
-    jclass string_class = env->FindClass("java/lang/String");
-    if (!string_class) {
-        return env->NewObjectArray(0, env->FindClass("java/lang/Object"), nullptr);
-    }
-
-    jsize valid_count = 0;
-    for (const auto& user : users) {
-        if (user.IsValid()) {
-            valid_count++;
-        }
-    }
-
-    jobjectArray result = env->NewObjectArray(valid_count, string_class, nullptr);
-    if (!result) {
-        return env->NewObjectArray(0, string_class, nullptr);
-    }
-
-    // fill array sequentially with only valid users
-    jsize array_index = 0;
-    for (const auto& user : users) {
-        if (user.IsValid()) {
-            jstring uuid_str = env->NewStringUTF(user.FormattedString().c_str());
-            if (uuid_str) {
-                env->SetObjectArrayElement(result, array_index++, uuid_str);
-            }
-        }
-    }
-
-    return result;
-}
-
-JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserUsername(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto uuid = Common::UUID{uuid_string};
-
-    Service::Account::ProfileBase profile{};
-    if (!manager.GetProfileBase(uuid, profile)) {
-        jstring result = env->NewStringUTF("");
-        return result ? result : env->NewStringUTF("");
-    }
-
-    const auto text = Common::StringFromFixedZeroTerminatedBuffer(
-        reinterpret_cast<const char*>(profile.username.data()), profile.username.size());
-    jstring result = env->NewStringUTF(text.c_str());
-    return result ? result : env->NewStringUTF("");
-}
-
-JNIEXPORT jlong JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserCount(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    return static_cast<jlong>(manager.GetUserCount());
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_canCreateUser(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    return manager.CanSystemRegisterUser();
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_createUser(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid,
-        jstring jusername) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto username = Common::Android::GetJString(env, jusername);
-    const auto uuid = Common::UUID{uuid_string};
-
-    const auto result = manager.CreateNewUser(uuid, username);
-    if (result.IsSuccess()) {
-        manager.WriteUserSaveFile();
-        return true;
-    }
-    return false;
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_updateUserUsername(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid,
-        jstring jusername) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto username = Common::Android::GetJString(env, jusername);
-    const auto uuid = Common::UUID{uuid_string};
-
-    Service::Account::ProfileBase profile{};
-    if (!manager.GetProfileBase(uuid, profile)) {
-        return false;
-    }
-
-    std::fill(profile.username.begin(), profile.username.end(), '\0');
-    std::copy(username.begin(), username.end(), profile.username.begin());
-
-    if (manager.SetProfileBase(uuid, profile)) {
-        manager.WriteUserSaveFile();
-        return true;
-    }
-    return false;
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUser(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto uuid = Common::UUID{uuid_string};
-
-    const auto user_index = manager.GetUserIndex(uuid);
-    if (!user_index) {
-        return false;
-    }
-
-    if (Settings::values.current_user.GetValue() == static_cast<s32>(*user_index)) {
-        Settings::values.current_user = 0;
-    }
-
-    if (manager.RemoveUser(uuid)) {
-        manager.WriteUserSaveFile();
-        manager.ResetUserSaveFile();
-        return true;
-    }
-    return false;
-}
-
-JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getCurrentUser(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto user_id = manager.GetUser(Settings::values.current_user.GetValue());
-    if (!user_id) {
-        jstring result = env->NewStringUTF("");
-        return result ? result : env->NewStringUTF("");
-    }
-    jstring result = env->NewStringUTF(user_id->FormattedString().c_str());
-    return result ? result : env->NewStringUTF("");
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setCurrentUser(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto uuid = Common::UUID{uuid_string};
-
-    const auto index = manager.GetUserIndex(uuid);
-    if (index) {
-        Settings::values.current_user = static_cast<s32>(*index);
-        return true;
-    }
-    return false;
-}
-
-JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserImagePath(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid) {
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto uuid = Common::UUID{uuid_string};
-
-    const auto path = Common::FS::GetEdenPath(Common::FS::EdenPath::NANDDir) /
-        fmt::format("system/save/8000000000000010/su/avators/{}.jpg", uuid.FormattedString());
-
-    jstring result = Common::Android::ToJString(env, Common::FS::PathToUTF8String(path));
-    return result ? result : env->NewStringUTF("");
-}
-
-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_saveUserImage(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jstring juuid,
-        jstring jimagePath) {
-    const auto uuid_string = Common::Android::GetJString(env, juuid);
-    const auto uuid = Common::UUID{uuid_string};
-    const auto image_source = Common::Android::GetJString(env, jimagePath);
-
-    const auto dest_path = Common::FS::GetEdenPath(Common::FS::EdenPath::NANDDir) /
-        fmt::format("system/save/8000000000000010/su/avators/{}.jpg", uuid.FormattedString());
-
-    const auto dest_dir = dest_path.parent_path();
-    if (!Common::FS::CreateDirs(dest_dir)) {
-        return false;
-    }
-
-    try {
-        std::filesystem::copy_file(image_source, dest_path,
-            std::filesystem::copy_options::overwrite_existing);
-        return true;
-    } catch (const std::filesystem::filesystem_error& e) {
-        LOG_ERROR(Common_Filesystem, "Failed to copy image file: {}", e.what());
-        return false;
-    }
-}
-
-JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadProfiles(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    auto& manager = EmulationSession::GetInstance().System().GetProfileManager();
-    manager.ResetUserSaveFile();
-
-    // create a default user if non exist
-    if (manager.GetUserCount() == 0) {
-        manager.CreateNewUser(Common::UUID::MakeRandom(), "Eden");
-        manager.WriteUserSaveFile();
-    }
-
-    LOG_INFO(Service_ACC, "Profile manager reloaded, user count: {}", manager.GetUserCount());
-}
-
-//  for firmware avatar images
-static std::vector<uint8_t> DecompressYaz0(const FileSys::VirtualFile& file) {
-    if (!file) {
-        return std::vector<uint8_t>();
-    }
-
-    uint32_t magic{};
-    file->ReadObject(&magic, 0);
-    if (magic != Common::MakeMagic('Y', 'a', 'z', '0')) {
-        return std::vector<uint8_t>();
-    }
-
-    uint32_t decoded_length{};
-    file->ReadObject(&decoded_length, 4);
-    decoded_length = Common::swap32(decoded_length);
-
-    std::size_t input_size = file->GetSize() - 16;
-    std::vector<uint8_t> input(input_size);
-    file->ReadBytes(input.data(), input_size, 16);
-
-    uint32_t input_offset{};
-    uint32_t output_offset{};
-    std::vector<uint8_t> output(decoded_length);
-
-    uint16_t mask{};
-    uint8_t header{};
-
-    while (output_offset < decoded_length) {
-        if ((mask >>= 1) == 0) {
-            if (input_offset >= input.size()) break;
-            header = input[input_offset++];
-            mask = 0x80;
-        }
-
-        if ((header & mask) != 0) {
-            if (output_offset >= output.size() || input_offset >= input.size()) {
-                break;
-            }
-            output[output_offset++] = input[input_offset++];
-        } else {
-            if (input_offset + 1 >= input.size()) break;
-            uint8_t byte1 = input[input_offset++];
-            uint8_t byte2 = input[input_offset++];
-
-            uint32_t dist = ((byte1 & 0xF) << 8) | byte2;
-            uint32_t position = output_offset - (dist + 1);
-
-            uint32_t length = byte1 >> 4;
-            if (length == 0) {
-                if (input_offset >= input.size()) break;
-                length = static_cast<uint32_t>(input[input_offset++]) + 0x12;
-            } else {
-                length += 2;
-            }
-
-            for (uint32_t i = 0; i < length && output_offset < decoded_length; ++i) {
-                output[output_offset++] = output[position++];
-            }
-        }
-    }
-
-    return output;
-}
-
-static FileSys::VirtualDir GetFirmwareAvatarDirectory() {
-    constexpr u64 AvatarImageDataId = 0x010000000000080AULL;
-
-    auto* bis_system = EmulationSession::GetInstance().System().GetFileSystemController().GetSystemNANDContents();
-    if (!bis_system) {
-        return nullptr;
-    }
-
-    const auto nca = bis_system->GetEntry(AvatarImageDataId, FileSys::ContentRecordType::Data);
-    if (!nca) {
-        return nullptr;
-    }
-
-    const auto romfs = nca->GetRomFS();
-    if (!romfs) {
-        return nullptr;
-    }
-
-    const auto extracted = FileSys::ExtractRomFS(romfs);
-    if (!extracted) {
-        return nullptr;
-    }
-
-    return extracted->GetSubdirectory("chara");
-}
-
-JNIEXPORT jint JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getFirmwareAvatarCount(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    const auto chara_dir = GetFirmwareAvatarDirectory();
-    if (!chara_dir) {
-        return 0;
-    }
-
-    int count = 0;
-    for (const auto& item : chara_dir->GetFiles()) {
-        if (item->GetExtension() == "szs") {
-            count++;
-        }
-    }
-    return count;
-}
-
-JNIEXPORT jbyteArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getFirmwareAvatarImage(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj,
-        jint index) {
-    const auto chara_dir = GetFirmwareAvatarDirectory();
-    if (!chara_dir) {
-        return nullptr;
-    }
-
-    int current_index = 0;
-    for (const auto& item : chara_dir->GetFiles()) {
-        if (item->GetExtension() != "szs") {
-            continue;
-        }
-
-        if (current_index == index) {
-            auto image_data = DecompressYaz0(item);
-            if (image_data.empty()) {
-                return nullptr;
-            }
-
-            jbyteArray result = env->NewByteArray(image_data.size());
-            if (result) {
-                env->SetByteArrayRegion(result, 0, image_data.size(),
-                    reinterpret_cast<const jbyte*>(image_data.data()));
-            }
-            return result;
-        }
-        current_index++;
-    }
-
-    return nullptr;
-}
-
-JNIEXPORT jbyteArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getDefaultAccountBackupJpeg(
-        JNIEnv* env,
-        [[maybe_unused]] jobject obj) {
-    jbyteArray result = env->NewByteArray(Core::Constants::ACCOUNT_BACKUP_JPEG.size());
-    if (result) {
-        env->SetByteArrayRegion(result, 0, Core::Constants::ACCOUNT_BACKUP_JPEG.size(),
-            reinterpret_cast<const jbyte*>(Core::Constants::ACCOUNT_BACKUP_JPEG.data()));
-    }
-    return result;
-}
-
 } // extern "C"
@@ -1,19 +1,18 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include <string>

 #include <jni.h>
+#include <common/fs/path_util.h>

 #include "android_config.h"
 #include "android_settings.h"
 #include "common/android/android_common.h"
 #include "common/android/id_cache.h"
-#include "common/fs/path_util.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "frontend_common/config.h"
-#include "frontend_common/settings_generator.h"
 #include "native.h"

 std::unique_ptr<AndroidConfig> global_config;
@@ -38,7 +37,6 @@ extern "C" {

 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializeGlobalConfig(JNIEnv* env, jobject obj) {
    global_config = std::make_unique<AndroidConfig>();
-    FrontendCommon::GenerateSettings();
 }

 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadGlobalConfig(JNIEnv* env, jobject obj) {
@@ -583,26 +581,4 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_setSdmcDir(JNIEnv* env, jobject
    Common::FS::SetEdenPath(Common::FS::EdenPath::SDMCDir, path);
 }

-jobjectArray Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getExternalContentDirs(JNIEnv* env,
-                                                                               jobject obj) {
-    const auto& dirs = Settings::values.external_content_dirs;
-    jobjectArray jdirsArray =
-        env->NewObjectArray(dirs.size(), Common::Android::GetStringClass(),
-                            Common::Android::ToJString(env, ""));
-    for (size_t i = 0; i < dirs.size(); ++i) {
-        env->SetObjectArrayElement(jdirsArray, i, Common::Android::ToJString(env, dirs[i]));
-    }
-    return jdirsArray;
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_setExternalContentDirs(JNIEnv* env, jobject obj,
-                                                                       jobjectArray jdirs) {
-    Settings::values.external_content_dirs.clear();
-    const int size = env->GetArrayLength(jdirs);
-    for (int i = 0; i < size; ++i) {
-        auto jdir = static_cast<jstring>(env->GetObjectArrayElement(jdirs, i));
-        Settings::values.external_content_dirs.push_back(Common::Android::GetJString(env, jdir));
-    }
-}
-
 } // extern "C"
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 /**
@@ -258,11 +258,6 @@ Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_setFreedrenoEnv(
    }

    LOG_INFO(Frontend, "[Freedreno] Set {}={}", var_name, value);
-
-    if (var_name == "FD_DEV_FEATURES") {
-        LOG_INFO(Frontend, "[Freedreno] FD_DEV_FEATURES enabled: {}", value);
-    }
-
    return JNI_TRUE;
 }

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3s-3,-1.34 -3,-3S10.34,5 12,5zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22c0.03,-1.99 4,-3.08 6,-3.08c1.99,0 5.97,1.09 6,3.08C16.71,17.92 14.5,19.2 12,19.2z" />
-</vector>
@@ -220,23 +220,6 @@
        android:textColor="?attr/colorOnPrimary"
        app:backgroundTint="?attr/colorPrimary"
        app:iconTint="?attr/colorOnPrimary"
-        app:rippleColor="#99FFFFFF"
-        />
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/launch_qlaunch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:contentDescription="Launch QLaunch"
-        android:text="@string/qlaunch_applet"
-        app:icon="@drawable/ic_home"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:textColor="?attr/colorOnPrimary"
-        app:backgroundTint="?attr/colorPrimary"
-        app:iconTint="?attr/colorOnPrimary"
-        app:rippleColor="#99FFFFFF"
        />

 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -11,7 +11,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:orientation="horizontal"
        android:padding="16dp"
        android:layout_gravity="center_vertical">

@@ -23,25 +23,12 @@
            android:layout_gravity="center_vertical|start"
            android:requiresFadingEdge="horizontal"
            android:textAlignment="viewStart"
-            app:layout_constraintBottom_toTopOf="@+id/type_indicator"
+            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toStartOf="@+id/button_layout"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:text="@string/select_gpu_driver_default" />

-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/type_indicator"
-            style="@style/TextAppearance.Material3.LabelSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/button_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/path"
-            tools:text="Games" />
-
        <LinearLayout
            android:id="@+id/button_layout"
            android:layout_width="wrap_content"
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="300dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/grid_avatars"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false" />
-
-        <ProgressBar
-            android:id="@+id/progress_loading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <TextView
-            android:id="@+id/text_empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/profile_firmware_avatars_unavailable"
-            android:textAppearance="?attr/textAppearanceBodyMedium"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:gravity="center"
-            android:padding="16dp"
-            android:visibility="gone" />
-
-    </FrameLayout>
-
-</LinearLayout>
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_new_user"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:title="@string/profile_new_user"
-            app:navigationIcon="@drawable/ic_back"
-            app:titleCentered="false" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scroll_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="88dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingHorizontal="24dp"
-            android:paddingVertical="16dp">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="128dp"
-                android:layout_height="128dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="24dp"
-                style="@style/Widget.Material3.CardView.Elevated"
-                app:cardCornerRadius="64dp"
-                app:cardElevation="4dp">
-
-                <ImageView
-                    android:id="@+id/image_user_avatar"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:contentDescription="@string/profile_avatar"
-                    tools:src="@drawable/ic_account_circle" />
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:layout_marginBottom="24dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_select_image"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/profile_select_image"
-                        style="@style/Widget.Material3.Button.TonalButton"
-                        app:icon="@drawable/ic_add"
-                        android:layout_marginEnd="4dp" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_firmware_avatars"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/profile_firmware_avatars"
-                        style="@style/Widget.Material3.Button.TonalButton"
-                        app:icon="@drawable/ic_account_circle"
-                        android:layout_marginStart="4dp"
-                        android:visibility="gone" />
-
-                </LinearLayout>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_revert_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/profile_revert_image"
-                    style="@style/Widget.Material3.Button.TextButton"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:hint="@string/profile_username">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/edit_username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="text"
-                    android:maxLength="32"
-                    android:maxLines="1"
-                    android:minHeight="48dp" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                style="@style/Widget.Material3.CardView.Filled"
-                app:cardCornerRadius="16dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/profile_uuid"
-                        android:textAppearance="?attr/textAppearanceLabelMedium"
-                        android:textColor="?attr/colorOnSurfaceVariant"
-                        android:layout_marginBottom="8dp" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
-
-                        <TextView
-                            android:id="@+id/text_uuid"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textAppearance="?attr/textAppearanceBodyMedium"
-                            android:fontFamily="monospace"
-                            android:textIsSelectable="true"
-                            tools:text="12345678-1234-1234-1234-123456789012" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/button_generate_uuid"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/profile_generate"
-                            style="@style/Widget.Material3.Button.TextButton"
-                            app:icon="@drawable/ic_refresh"
-                            app:iconGravity="textStart" />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/profile_uuid_description"
-                        android:textAppearance="?attr/textAppearanceBodySmall"
-                        android:textColor="?attr/colorOnSurfaceVariant"
-                        android:layout_marginTop="8dp" />
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/button_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        style="@style/Widget.Material3.CardView.Elevated"
-        app:cardCornerRadius="0dp"
-        app:cardElevation="8dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:id="@+id/button_container"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="16dp"
-            android:paddingBottom="24dp">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_cancel"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginEnd="8dp"
-                android:text="@android:string/cancel"
-                style="@style/Widget.Material3.Button.TonalButton" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_save"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="8dp"
-                android:text="@string/save"
-                style="@style/Widget.Material3.Button" />
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Caio Oliveira	027a7275e1	[vk] More identation fix Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>	2026-01-26 02:35:00 +01:00
Caio Oliveira	1f09d9053b	[vk] Fix identation Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>	2026-01-26 02:35:00 +01:00
wildcard	e0c49d1035	Update src/video_core/renderer_vulkan/vk_descriptor_pool.h license fix	2026-01-26 02:35:00 +01:00
wildcard	9f054cb738	[Vulkan] Phase 1: Descriptor Set caching wip	2026-01-26 02:35:00 +01:00