Android #70

2023-09-14 00:57:22 +00:00
88 changed files with 624 additions and 1952 deletions
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -174,9 +174,6 @@ target_include_directories(stb PUBLIC ./stb)
 add_library(bc_decoder bc_decoder/bc_decoder.cpp)
 target_include_directories(bc_decoder PUBLIC ./bc_decoder)

-add_library(renderdoc INTERFACE)
-target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
-
 if (ANDROID)
   if (ARCHITECTURE_arm64)
       add_subdirectory(libadrenotools)
--- a/externals/renderdoc/renderdoc_app.h
+++ b/externals/renderdoc/renderdoc_app.h
@@ -1,744 +0,0 @@
-// SPDX-FileCopyrightText: Baldur Karlsson
-// SPDX-License-Identifier: MIT
-
-/******************************************************************************
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2023 Baldur Karlsson
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- ******************************************************************************/
-
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Documentation for the API is available at https://renderdoc.org/docs/in_application_api.html
-//
-
-#if !defined(RENDERDOC_NO_STDINT)
-#include <stdint.h>
-#endif
-
-#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
-#define RENDERDOC_CC __cdecl
-#elif defined(__linux__)
-#define RENDERDOC_CC
-#elif defined(__APPLE__)
-#define RENDERDOC_CC
-#else
-#error "Unknown platform"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// Constants not used directly in below API
-
-// This is a GUID/magic value used for when applications pass a path where shader debug
-// information can be found to match up with a stripped shader.
-// the define can be used like so: const GUID RENDERDOC_ShaderDebugMagicValue =
-// RENDERDOC_ShaderDebugMagicValue_value
-#define RENDERDOC_ShaderDebugMagicValue_struct                                \
-  {                                                                           \
-    0xeab25520, 0x6670, 0x4865, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
-  }
-
-// as an alternative when you want a byte array (assuming x86 endianness):
-#define RENDERDOC_ShaderDebugMagicValue_bytearray                                                 \
-  {                                                                                               \
-    0x20, 0x55, 0xb2, 0xea, 0x70, 0x66, 0x65, 0x48, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
-  }
-
-// truncated version when only a uint64_t is available (e.g. Vulkan tags):
-#define RENDERDOC_ShaderDebugMagicValue_truncated 0x48656670eab25520ULL
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc capture options
-//
-
-typedef enum RENDERDOC_CaptureOption
-{
-  // Allow the application to enable vsync
-  //
-  // Default - enabled
-  //
-  // 1 - The application can enable or disable vsync at will
-  // 0 - vsync is force disabled
-  eRENDERDOC_Option_AllowVSync = 0,
-
-  // Allow the application to enable fullscreen
-  //
-  // Default - enabled
-  //
-  // 1 - The application can enable or disable fullscreen at will
-  // 0 - fullscreen is force disabled
-  eRENDERDOC_Option_AllowFullscreen = 1,
-
-  // Record API debugging events and messages
-  //
-  // Default - disabled
-  //
-  // 1 - Enable built-in API debugging features and records the results into
-  //     the capture, which is matched up with events on replay
-  // 0 - no API debugging is forcibly enabled
-  eRENDERDOC_Option_APIValidation = 2,
-  eRENDERDOC_Option_DebugDeviceMode = 2,    // deprecated name of this enum
-
-  // Capture CPU callstacks for API events
-  //
-  // Default - disabled
-  //
-  // 1 - Enables capturing of callstacks
-  // 0 - no callstacks are captured
-  eRENDERDOC_Option_CaptureCallstacks = 3,
-
-  // When capturing CPU callstacks, only capture them from actions.
-  // This option does nothing without the above option being enabled
-  //
-  // Default - disabled
-  //
-  // 1 - Only captures callstacks for actions.
-  //     Ignored if CaptureCallstacks is disabled
-  // 0 - Callstacks, if enabled, are captured for every event.
-  eRENDERDOC_Option_CaptureCallstacksOnlyDraws = 4,
-  eRENDERDOC_Option_CaptureCallstacksOnlyActions = 4,
-
-  // Specify a delay in seconds to wait for a debugger to attach, after
-  // creating or injecting into a process, before continuing to allow it to run.
-  //
-  // 0 indicates no delay, and the process will run immediately after injection
-  //
-  // Default - 0 seconds
-  //
-  eRENDERDOC_Option_DelayForDebugger = 5,
-
-  // Verify buffer access. This includes checking the memory returned by a Map() call to
-  // detect any out-of-bounds modification, as well as initialising buffers with undefined contents
-  // to a marker value to catch use of uninitialised memory.
-  //
-  // NOTE: This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
-  // not do the same kind of interception & checking and undefined contents are really undefined.
-  //
-  // Default - disabled
-  //
-  // 1 - Verify buffer access
-  // 0 - No verification is performed, and overwriting bounds may cause crashes or corruption in
-  //     RenderDoc.
-  eRENDERDOC_Option_VerifyBufferAccess = 6,
-
-  // The old name for eRENDERDOC_Option_VerifyBufferAccess was eRENDERDOC_Option_VerifyMapWrites.
-  // This option now controls the filling of uninitialised buffers with 0xdddddddd which was
-  // previously always enabled
-  eRENDERDOC_Option_VerifyMapWrites = eRENDERDOC_Option_VerifyBufferAccess,
-
-  // Hooks any system API calls that create child processes, and injects
-  // RenderDoc into them recursively with the same options.
-  //
-  // Default - disabled
-  //
-  // 1 - Hooks into spawned child processes
-  // 0 - Child processes are not hooked by RenderDoc
-  eRENDERDOC_Option_HookIntoChildren = 7,
-
-  // By default RenderDoc only includes resources in the final capture necessary
-  // for that frame, this allows you to override that behaviour.
-  //
-  // Default - disabled
-  //
-  // 1 - all live resources at the time of capture are included in the capture
-  //     and available for inspection
-  // 0 - only the resources referenced by the captured frame are included
-  eRENDERDOC_Option_RefAllResources = 8,
-
-  // **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
-  // getting it will be ignored, to allow compatibility with older versions.
-  // In v1.1 the option acts as if it's always enabled.
-  //
-  // By default RenderDoc skips saving initial states for resources where the
-  // previous contents don't appear to be used, assuming that writes before
-  // reads indicate previous contents aren't used.
-  //
-  // Default - disabled
-  //
-  // 1 - initial contents at the start of each captured frame are saved, even if
-  //     they are later overwritten or cleared before being used.
-  // 0 - unless a read is detected, initial contents will not be saved and will
-  //     appear as black or empty data.
-  eRENDERDOC_Option_SaveAllInitials = 9,
-
-  // In APIs that allow for the recording of command lists to be replayed later,
-  // RenderDoc may choose to not capture command lists before a frame capture is
-  // triggered, to reduce overheads. This means any command lists recorded once
-  // and replayed many times will not be available and may cause a failure to
-  // capture.
-  //
-  // NOTE: This is only true for APIs where multithreading is difficult or
-  // discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
-  // and always capture all command lists since the API is heavily oriented
-  // around it and the overheads have been reduced by API design.
-  //
-  // 1 - All command lists are captured from the start of the application
-  // 0 - Command lists are only captured if their recording begins during
-  //     the period when a frame capture is in progress.
-  eRENDERDOC_Option_CaptureAllCmdLists = 10,
-
-  // Mute API debugging output when the API validation mode option is enabled
-  //
-  // Default - enabled
-  //
-  // 1 - Mute any API debug messages from being displayed or passed through
-  // 0 - API debugging is displayed as normal
-  eRENDERDOC_Option_DebugOutputMute = 11,
-
-  // Option to allow vendor extensions to be used even when they may be
-  // incompatible with RenderDoc and cause corrupted replays or crashes.
-  //
-  // Default - inactive
-  //
-  // No values are documented, this option should only be used when absolutely
-  // necessary as directed by a RenderDoc developer.
-  eRENDERDOC_Option_AllowUnsupportedVendorExtensions = 12,
-
-  // Define a soft memory limit which some APIs may aim to keep overhead under where
-  // possible. Anything above this limit will where possible be saved directly to disk during
-  // capture.
-  // This will cause increased disk space use (which may cause a capture to fail if disk space is
-  // exhausted) as well as slower capture times.
-  //
-  // Not all memory allocations may be deferred like this so it is not a guarantee of a memory
-  // limit.
-  //
-  // Units are in MBs, suggested values would range from 200MB to 1000MB.
-  //
-  // Default - 0 Megabytes
-  eRENDERDOC_Option_SoftMemoryLimit = 13,
-} RENDERDOC_CaptureOption;
-
-// Sets an option that controls how RenderDoc behaves on capture.
-//
-// Returns 1 if the option and value are valid
-// Returns 0 if either is invalid and the option is unchanged
-typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionU32)(RENDERDOC_CaptureOption opt, uint32_t val);
-typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionF32)(RENDERDOC_CaptureOption opt, float val);
-
-// Gets the current value of an option as a uint32_t
-//
-// If the option is invalid, 0xffffffff is returned
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionU32)(RENDERDOC_CaptureOption opt);
-
-// Gets the current value of an option as a float
-//
-// If the option is invalid, -FLT_MAX is returned
-typedef float(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionF32)(RENDERDOC_CaptureOption opt);
-
-typedef enum RENDERDOC_InputButton
-{
-  // '0' - '9' matches ASCII values
-  eRENDERDOC_Key_0 = 0x30,
-  eRENDERDOC_Key_1 = 0x31,
-  eRENDERDOC_Key_2 = 0x32,
-  eRENDERDOC_Key_3 = 0x33,
-  eRENDERDOC_Key_4 = 0x34,
-  eRENDERDOC_Key_5 = 0x35,
-  eRENDERDOC_Key_6 = 0x36,
-  eRENDERDOC_Key_7 = 0x37,
-  eRENDERDOC_Key_8 = 0x38,
-  eRENDERDOC_Key_9 = 0x39,
-
-  // 'A' - 'Z' matches ASCII values
-  eRENDERDOC_Key_A = 0x41,
-  eRENDERDOC_Key_B = 0x42,
-  eRENDERDOC_Key_C = 0x43,
-  eRENDERDOC_Key_D = 0x44,
-  eRENDERDOC_Key_E = 0x45,
-  eRENDERDOC_Key_F = 0x46,
-  eRENDERDOC_Key_G = 0x47,
-  eRENDERDOC_Key_H = 0x48,
-  eRENDERDOC_Key_I = 0x49,
-  eRENDERDOC_Key_J = 0x4A,
-  eRENDERDOC_Key_K = 0x4B,
-  eRENDERDOC_Key_L = 0x4C,
-  eRENDERDOC_Key_M = 0x4D,
-  eRENDERDOC_Key_N = 0x4E,
-  eRENDERDOC_Key_O = 0x4F,
-  eRENDERDOC_Key_P = 0x50,
-  eRENDERDOC_Key_Q = 0x51,
-  eRENDERDOC_Key_R = 0x52,
-  eRENDERDOC_Key_S = 0x53,
-  eRENDERDOC_Key_T = 0x54,
-  eRENDERDOC_Key_U = 0x55,
-  eRENDERDOC_Key_V = 0x56,
-  eRENDERDOC_Key_W = 0x57,
-  eRENDERDOC_Key_X = 0x58,
-  eRENDERDOC_Key_Y = 0x59,
-  eRENDERDOC_Key_Z = 0x5A,
-
-  // leave the rest of the ASCII range free
-  // in case we want to use it later
-  eRENDERDOC_Key_NonPrintable = 0x100,
-
-  eRENDERDOC_Key_Divide,
-  eRENDERDOC_Key_Multiply,
-  eRENDERDOC_Key_Subtract,
-  eRENDERDOC_Key_Plus,
-
-  eRENDERDOC_Key_F1,
-  eRENDERDOC_Key_F2,
-  eRENDERDOC_Key_F3,
-  eRENDERDOC_Key_F4,
-  eRENDERDOC_Key_F5,
-  eRENDERDOC_Key_F6,
-  eRENDERDOC_Key_F7,
-  eRENDERDOC_Key_F8,
-  eRENDERDOC_Key_F9,
-  eRENDERDOC_Key_F10,
-  eRENDERDOC_Key_F11,
-  eRENDERDOC_Key_F12,
-
-  eRENDERDOC_Key_Home,
-  eRENDERDOC_Key_End,
-  eRENDERDOC_Key_Insert,
-  eRENDERDOC_Key_Delete,
-  eRENDERDOC_Key_PageUp,
-  eRENDERDOC_Key_PageDn,
-
-  eRENDERDOC_Key_Backspace,
-  eRENDERDOC_Key_Tab,
-  eRENDERDOC_Key_PrtScrn,
-  eRENDERDOC_Key_Pause,
-
-  eRENDERDOC_Key_Max,
-} RENDERDOC_InputButton;
-
-// Sets which key or keys can be used to toggle focus between multiple windows
-//
-// If keys is NULL or num is 0, toggle keys will be disabled
-typedef void(RENDERDOC_CC *pRENDERDOC_SetFocusToggleKeys)(RENDERDOC_InputButton *keys, int num);
-
-// Sets which key or keys can be used to capture the next frame
-//
-// If keys is NULL or num is 0, captures keys will be disabled
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureKeys)(RENDERDOC_InputButton *keys, int num);
-
-typedef enum RENDERDOC_OverlayBits
-{
-  // This single bit controls whether the overlay is enabled or disabled globally
-  eRENDERDOC_Overlay_Enabled = 0x1,
-
-  // Show the average framerate over several seconds as well as min/max
-  eRENDERDOC_Overlay_FrameRate = 0x2,
-
-  // Show the current frame number
-  eRENDERDOC_Overlay_FrameNumber = 0x4,
-
-  // Show a list of recent captures, and how many captures have been made
-  eRENDERDOC_Overlay_CaptureList = 0x8,
-
-  // Default values for the overlay mask
-  eRENDERDOC_Overlay_Default = (eRENDERDOC_Overlay_Enabled | eRENDERDOC_Overlay_FrameRate |
-                                eRENDERDOC_Overlay_FrameNumber | eRENDERDOC_Overlay_CaptureList),
-
-  // Enable all bits
-  eRENDERDOC_Overlay_All = ~0U,
-
-  // Disable all bits
-  eRENDERDOC_Overlay_None = 0,
-} RENDERDOC_OverlayBits;
-
-// returns the overlay bits that have been set
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
-// sets the overlay bits with an and & or mask
-typedef void(RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
-
-// this function will attempt to remove RenderDoc's hooks in the application.
-//
-// Note: that this can only work correctly if done immediately after
-// the module is loaded, before any API work happens. RenderDoc will remove its
-// injected hooks and shut down. Behaviour is undefined if this is called
-// after any API functions have been called, and there is still no guarantee of
-// success.
-typedef void(RENDERDOC_CC *pRENDERDOC_RemoveHooks)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.4.1 headers.
-typedef pRENDERDOC_RemoveHooks pRENDERDOC_Shutdown;
-
-// This function will unload RenderDoc's crash handler.
-//
-// If you use your own crash handler and don't want RenderDoc's handler to
-// intercede, you can call this function to unload it and any unhandled
-// exceptions will pass to the next handler.
-typedef void(RENDERDOC_CC *pRENDERDOC_UnloadCrashHandler)();
-
-// Sets the capture file path template
-//
-// pathtemplate is a UTF-8 string that gives a template for how captures will be named
-// and where they will be saved.
-//
-// Any extension is stripped off the path, and captures are saved in the directory
-// specified, and named with the filename and the frame number appended. If the
-// directory does not exist it will be created, including any parent directories.
-//
-// If pathtemplate is NULL, the template will remain unchanged
-//
-// Example:
-//
-// SetCaptureFilePathTemplate("my_captures/example");
-//
-// Capture #1 -> my_captures/example_frame123.rdc
-// Capture #2 -> my_captures/example_frame456.rdc
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFilePathTemplate)(const char *pathtemplate);
-
-// returns the current capture path template, see SetCaptureFileTemplate above, as a UTF-8 string
-typedef const char *(RENDERDOC_CC *pRENDERDOC_GetCaptureFilePathTemplate)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.1.2 headers.
-typedef pRENDERDOC_SetCaptureFilePathTemplate pRENDERDOC_SetLogFilePathTemplate;
-typedef pRENDERDOC_GetCaptureFilePathTemplate pRENDERDOC_GetLogFilePathTemplate;
-
-// returns the number of captures that have been made
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetNumCaptures)();
-
-// This function returns the details of a capture, by index. New captures are added
-// to the end of the list.
-//
-// filename will be filled with the absolute path to the capture file, as a UTF-8 string
-// pathlength will be written with the length in bytes of the filename string
-// timestamp will be written with the time of the capture, in seconds since the Unix epoch
-//
-// Any of the parameters can be NULL and they'll be skipped.
-//
-// The function will return 1 if the capture index is valid, or 0 if the index is invalid
-// If the index is invalid, the values will be unchanged
-//
-// Note: when captures are deleted in the UI they will remain in this list, so the
-// capture path may not exist anymore.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCapture)(uint32_t idx, char *filename,
-                                                      uint32_t *pathlength, uint64_t *timestamp);
-
-// Sets the comments associated with a capture file. These comments are displayed in the
-// UI program when opening.
-//
-// filePath should be a path to the capture file to add comments to. If set to NULL or ""
-// the most recent capture file created made will be used instead.
-// comments should be a NULL-terminated UTF-8 string to add as comments.
-//
-// Any existing comments will be overwritten.
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFileComments)(const char *filePath,
-                                                              const char *comments);
-
-// returns 1 if the RenderDoc UI is connected to this application, 0 otherwise
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsTargetControlConnected)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.1.1 headers.
-// This was renamed to IsTargetControlConnected in API 1.1.1, the old typedef is kept here for
-// backwards compatibility with old code, it is castable either way since it's ABI compatible
-// as the same function pointer type.
-typedef pRENDERDOC_IsTargetControlConnected pRENDERDOC_IsRemoteAccessConnected;
-
-// This function will launch the Replay UI associated with the RenderDoc library injected
-// into the running application.
-//
-// if connectTargetControl is 1, the Replay UI will be launched with a command line parameter
-// to connect to this application
-// cmdline is the rest of the command line, as a UTF-8 string. E.g. a captures to open
-// if cmdline is NULL, the command line will be empty.
-//
-// returns the PID of the replay UI if successful, 0 if not successful.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectTargetControl,
-                                                          const char *cmdline);
-
-// RenderDoc can return a higher version than requested if it's backwards compatible,
-// this function returns the actual version returned. If a parameter is NULL, it will be
-// ignored and the others will be filled out.
-typedef void(RENDERDOC_CC *pRENDERDOC_GetAPIVersion)(int *major, int *minor, int *patch);
-
-// Requests that the replay UI show itself (if hidden or not the current top window). This can be
-// used in conjunction with IsTargetControlConnected and LaunchReplayUI to intelligently handle
-// showing the UI after making a capture.
-//
-// This will return 1 if the request was successfully passed on, though it's not guaranteed that
-// the UI will be on top in all cases depending on OS rules. It will return 0 if there is no current
-// target control connection to make such a request, or if there was another error
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_ShowReplayUI)();
-
-//////////////////////////////////////////////////////////////////////////
-// Capturing functions
-//
-
-// A device pointer is a pointer to the API's root handle.
-//
-// This would be an ID3D11Device, HGLRC/GLXContext, ID3D12Device, etc
-typedef void *RENDERDOC_DevicePointer;
-
-// A window handle is the OS's native window handle
-//
-// This would be an HWND, GLXDrawable, etc
-typedef void *RENDERDOC_WindowHandle;
-
-// A helper macro for Vulkan, where the device handle cannot be used directly.
-//
-// Passing the VkInstance to this macro will return the RENDERDOC_DevicePointer to use.
-//
-// Specifically, the value needed is the dispatch table pointer, which sits as the first
-// pointer-sized object in the memory pointed to by the VkInstance. Thus we cast to a void** and
-// indirect once.
-#define RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(inst) (*((void **)(inst)))
-
-// This sets the RenderDoc in-app overlay in the API/window pair as 'active' and it will
-// respond to keypresses. Neither parameter can be NULL
-typedef void(RENDERDOC_CC *pRENDERDOC_SetActiveWindow)(RENDERDOC_DevicePointer device,
-                                                       RENDERDOC_WindowHandle wndHandle);
-
-// capture the next frame on whichever window and API is currently considered active
-typedef void(RENDERDOC_CC *pRENDERDOC_TriggerCapture)();
-
-// capture the next N frames on whichever window and API is currently considered active
-typedef void(RENDERDOC_CC *pRENDERDOC_TriggerMultiFrameCapture)(uint32_t numFrames);
-
-// When choosing either a device pointer or a window handle to capture, you can pass NULL.
-// Passing NULL specifies a 'wildcard' match against anything. This allows you to specify
-// any API rendering to a specific window, or a specific API instance rendering to any window,
-// or in the simplest case of one window and one API, you can just pass NULL for both.
-//
-// In either case, if there are two or more possible matching (device,window) pairs it
-// is undefined which one will be captured.
-//
-// Note: for headless rendering you can pass NULL for the window handle and either specify
-// a device pointer or leave it NULL as above.
-
-// Immediately starts capturing API calls on the specified device pointer and window handle.
-//
-// If there is no matching thing to capture (e.g. no supported API has been initialised),
-// this will do nothing.
-//
-// The results are undefined (including crashes) if two captures are started overlapping,
-// even on separate devices and/oror windows.
-typedef void(RENDERDOC_CC *pRENDERDOC_StartFrameCapture)(RENDERDOC_DevicePointer device,
-                                                         RENDERDOC_WindowHandle wndHandle);
-
-// Returns whether or not a frame capture is currently ongoing anywhere.
-//
-// This will return 1 if a capture is ongoing, and 0 if there is no capture running
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsFrameCapturing)();
-
-// Ends capturing immediately.
-//
-// This will return 1 if the capture succeeded, and 0 if there was an error capturing.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(RENDERDOC_DevicePointer device,
-                                                           RENDERDOC_WindowHandle wndHandle);
-
-// Ends capturing immediately and discard any data stored without saving to disk.
-//
-// This will return 1 if the capture was discarded, and 0 if there was an error or no capture
-// was in progress
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_DiscardFrameCapture)(RENDERDOC_DevicePointer device,
-                                                               RENDERDOC_WindowHandle wndHandle);
-
-// Only valid to be called between a call to StartFrameCapture and EndFrameCapture. Gives a custom
-// title to the capture produced which will be displayed in the UI.
-//
-// If multiple captures are ongoing, this title will be applied to the first capture to end after
-// this call. The second capture to end will have no title, unless this function is called again.
-//
-// Calling this function has no effect if no capture is currently running, and if it is called
-// multiple times only the last title will be used.
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureTitle)(const char *title);
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc API versions
-//
-
-// RenderDoc uses semantic versioning (http://semver.org/).
-//
-// MAJOR version is incremented when incompatible API changes happen.
-// MINOR version is incremented when functionality is added in a backwards-compatible manner.
-// PATCH version is incremented when backwards-compatible bug fixes happen.
-//
-// Note that this means the API returned can be higher than the one you might have requested.
-// e.g. if you are running against a newer RenderDoc that supports 1.0.1, it will be returned
-// instead of 1.0.0. You can check this with the GetAPIVersion entry point
-typedef enum RENDERDOC_Version
-{
-  eRENDERDOC_API_Version_1_0_0 = 10000,    // RENDERDOC_API_1_0_0 = 1 00 00
-  eRENDERDOC_API_Version_1_0_1 = 10001,    // RENDERDOC_API_1_0_1 = 1 00 01
-  eRENDERDOC_API_Version_1_0_2 = 10002,    // RENDERDOC_API_1_0_2 = 1 00 02
-  eRENDERDOC_API_Version_1_1_0 = 10100,    // RENDERDOC_API_1_1_0 = 1 01 00
-  eRENDERDOC_API_Version_1_1_1 = 10101,    // RENDERDOC_API_1_1_1 = 1 01 01
-  eRENDERDOC_API_Version_1_1_2 = 10102,    // RENDERDOC_API_1_1_2 = 1 01 02
-  eRENDERDOC_API_Version_1_2_0 = 10200,    // RENDERDOC_API_1_2_0 = 1 02 00
-  eRENDERDOC_API_Version_1_3_0 = 10300,    // RENDERDOC_API_1_3_0 = 1 03 00
-  eRENDERDOC_API_Version_1_4_0 = 10400,    // RENDERDOC_API_1_4_0 = 1 04 00
-  eRENDERDOC_API_Version_1_4_1 = 10401,    // RENDERDOC_API_1_4_1 = 1 04 01
-  eRENDERDOC_API_Version_1_4_2 = 10402,    // RENDERDOC_API_1_4_2 = 1 04 02
-  eRENDERDOC_API_Version_1_5_0 = 10500,    // RENDERDOC_API_1_5_0 = 1 05 00
-  eRENDERDOC_API_Version_1_6_0 = 10600,    // RENDERDOC_API_1_6_0 = 1 06 00
-} RENDERDOC_Version;
-
-// API version changelog:
-//
-// 1.0.0 - initial release
-// 1.0.1 - Bugfix: IsFrameCapturing() was returning false for captures that were triggered
-//         by keypress or TriggerCapture, instead of Start/EndFrameCapture.
-// 1.0.2 - Refactor: Renamed eRENDERDOC_Option_DebugDeviceMode to eRENDERDOC_Option_APIValidation
-// 1.1.0 - Add feature: TriggerMultiFrameCapture(). Backwards compatible with 1.0.x since the new
-//         function pointer is added to the end of the struct, the original layout is identical
-// 1.1.1 - Refactor: Renamed remote access to target control (to better disambiguate from remote
-//         replay/remote server concept in replay UI)
-// 1.1.2 - Refactor: Renamed "log file" in function names to just capture, to clarify that these
-//         are captures and not debug logging files. This is the first API version in the v1.0
-//         branch.
-// 1.2.0 - Added feature: SetCaptureFileComments() to add comments to a capture file that will be
-//         displayed in the UI program on load.
-// 1.3.0 - Added feature: New capture option eRENDERDOC_Option_AllowUnsupportedVendorExtensions
-//         which allows users to opt-in to allowing unsupported vendor extensions to function.
-//         Should be used at the user's own risk.
-//         Refactor: Renamed eRENDERDOC_Option_VerifyMapWrites to
-//         eRENDERDOC_Option_VerifyBufferAccess, which now also controls initialisation to
-//         0xdddddddd of uninitialised buffer contents.
-// 1.4.0 - Added feature: DiscardFrameCapture() to discard a frame capture in progress and stop
-//         capturing without saving anything to disk.
-// 1.4.1 - Refactor: Renamed Shutdown to RemoveHooks to better clarify what is happening
-// 1.4.2 - Refactor: Renamed 'draws' to 'actions' in callstack capture option.
-// 1.5.0 - Added feature: ShowReplayUI() to request that the replay UI show itself if connected
-// 1.6.0 - Added feature: SetCaptureTitle() which can be used to set a title for a
-//         capture made with StartFrameCapture() or EndFrameCapture()
-
-typedef struct RENDERDOC_API_1_6_0
-{
-  pRENDERDOC_GetAPIVersion GetAPIVersion;
-
-  pRENDERDOC_SetCaptureOptionU32 SetCaptureOptionU32;
-  pRENDERDOC_SetCaptureOptionF32 SetCaptureOptionF32;
-
-  pRENDERDOC_GetCaptureOptionU32 GetCaptureOptionU32;
-  pRENDERDOC_GetCaptureOptionF32 GetCaptureOptionF32;
-
-  pRENDERDOC_SetFocusToggleKeys SetFocusToggleKeys;
-  pRENDERDOC_SetCaptureKeys SetCaptureKeys;
-
-  pRENDERDOC_GetOverlayBits GetOverlayBits;
-  pRENDERDOC_MaskOverlayBits MaskOverlayBits;
-
-  // Shutdown was renamed to RemoveHooks in 1.4.1.
-  // These unions allow old code to continue compiling without changes
-  union
-  {
-    pRENDERDOC_Shutdown Shutdown;
-    pRENDERDOC_RemoveHooks RemoveHooks;
-  };
-  pRENDERDOC_UnloadCrashHandler UnloadCrashHandler;
-
-  // Get/SetLogFilePathTemplate was renamed to Get/SetCaptureFilePathTemplate in 1.1.2.
-  // These unions allow old code to continue compiling without changes
-  union
-  {
-    // deprecated name
-    pRENDERDOC_SetLogFilePathTemplate SetLogFilePathTemplate;
-    // current name
-    pRENDERDOC_SetCaptureFilePathTemplate SetCaptureFilePathTemplate;
-  };
-  union
-  {
-    // deprecated name
-    pRENDERDOC_GetLogFilePathTemplate GetLogFilePathTemplate;
-    // current name
-    pRENDERDOC_GetCaptureFilePathTemplate GetCaptureFilePathTemplate;
-  };
-
-  pRENDERDOC_GetNumCaptures GetNumCaptures;
-  pRENDERDOC_GetCapture GetCapture;
-
-  pRENDERDOC_TriggerCapture TriggerCapture;
-
-  // IsRemoteAccessConnected was renamed to IsTargetControlConnected in 1.1.1.
-  // This union allows old code to continue compiling without changes
-  union
-  {
-    // deprecated name
-    pRENDERDOC_IsRemoteAccessConnected IsRemoteAccessConnected;
-    // current name
-    pRENDERDOC_IsTargetControlConnected IsTargetControlConnected;
-  };
-  pRENDERDOC_LaunchReplayUI LaunchReplayUI;
-
-  pRENDERDOC_SetActiveWindow SetActiveWindow;
-
-  pRENDERDOC_StartFrameCapture StartFrameCapture;
-  pRENDERDOC_IsFrameCapturing IsFrameCapturing;
-  pRENDERDOC_EndFrameCapture EndFrameCapture;
-
-  // new function in 1.1.0
-  pRENDERDOC_TriggerMultiFrameCapture TriggerMultiFrameCapture;
-
-  // new function in 1.2.0
-  pRENDERDOC_SetCaptureFileComments SetCaptureFileComments;
-
-  // new function in 1.4.0
-  pRENDERDOC_DiscardFrameCapture DiscardFrameCapture;
-
-  // new function in 1.5.0
-  pRENDERDOC_ShowReplayUI ShowReplayUI;
-
-  // new function in 1.6.0
-  pRENDERDOC_SetCaptureTitle SetCaptureTitle;
-} RENDERDOC_API_1_6_0;
-
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_2_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_3_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_5_0;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc API entry point
-//
-// This entry point can be obtained via GetProcAddress/dlsym if RenderDoc is available.
-//
-// The name is the same as the typedef - "RENDERDOC_GetAPI"
-//
-// This function is not thread safe, and should not be called on multiple threads at once.
-// Ideally, call this once as early as possible in your application's startup, before doing
-// any API work, since some configuration functionality etc has to be done also before
-// initialising any APIs.
-//
-// Parameters:
-//   version is a single value from the RENDERDOC_Version above.
-//
-//   outAPIPointers will be filled out with a pointer to the corresponding struct of function
-//   pointers.
-//
-// Returns:
-//   1 - if the outAPIPointers has been filled with a pointer to the API struct requested
-//   0 - if the requested version is not supported or the arguments are invalid.
-//
-typedef int(RENDERDOC_CC *pRENDERDOC_GetAPI)(RENDERDOC_Version version, void **outAPIPointers);
-
-#ifdef __cplusplus
-}    // extern "C"
-#endif
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@@ -307,6 +307,21 @@ object NativeLibrary {
     */
    external fun isPaused(): Boolean

+    /**
+     * Mutes emulation sound
+     */
+    external fun muteAudio(): Boolean
+
+    /**
+     * Unmutes emulation sound
+     */
+    external fun unmuteAudio(): Boolean
+
+    /**
+     * Returns true if emulation audio is muted.
+     */
+    external fun isMuted(): Boolean
+
    /**
     * Returns the performance stats for the current game
     */
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -332,7 +332,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            pictureInPictureActions.add(pauseRemoteAction)
        }

-        if (BooleanSetting.AUDIO_MUTED.boolean) {
+        if (NativeLibrary.isMuted()) {
            val unmuteIcon = Icon.createWithResource(
                this@EmulationActivity,
                R.drawable.ic_pip_unmute
@@ -389,9 +389,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
            }
            if (intent.action == actionUnmute) {
-                if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
+                if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
            } else if (intent.action == actionMute) {
-                if (!BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(true)
+                if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
            }
            buildPictureInPictureParams()
        }
@@ -417,7 +417,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            } catch (ignored: Exception) {
            }
            // Always resume audio, since there is no UI button
-            if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
+            if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
        }
    }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
@@ -4,8 +4,7 @@
 package org.yuzu.yuzu_emu.adapters

 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -16,10 +15,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.IconCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.graphics.drawable.toDrawable
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
@@ -91,24 +87,11 @@ class GameAdapter(private val activity: AppCompatActivity) :
            action = Intent.ACTION_VIEW
            data = Uri.parse(holder.game.path)
        }
-
-        val layerDrawable = ResourcesCompat.getDrawable(
-            YuzuApplication.appContext.resources,
-            R.drawable.shortcut,
-            null
-        ) as LayerDrawable
-        layerDrawable.setDrawableByLayerId(
-            R.id.shortcut_foreground,
-            GameIconUtils.getGameIcon(holder.game).toDrawable(YuzuApplication.appContext.resources)
-        )
-        val inset = YuzuApplication.appContext.resources
-            .getDimensionPixelSize(R.dimen.icon_inset)
-        layerDrawable.setLayerInset(1, inset, inset, inset, inset)
        val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)
            .setShortLabel(holder.game.title)
            .setIcon(
-                IconCompat.createWithAdaptiveBitmap(
-                    layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
+                IconCompat.createWithBitmap(
+                    (holder.binding.imageGameScreen.drawable as BitmapDrawable).bitmap
                )
            )
            .setIntent(openIntent)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt
@@ -10,12 +10,8 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
@@ -90,11 +86,7 @@ class HomeSettingAdapter(
                binding.optionIcon.alpha = 0.5f
            }

-            viewLifecycle.lifecycleScope.launch {
-                viewLifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    option.details.collect { updateOptionDetails(it) }
-                }
-            }
+            option.details.observe(viewLifecycle) { updateOptionDetails(it) }
            binding.optionDetail.postDelayed(
                {
                    binding.optionDetail.ellipsize = TextUtils.TruncateAt.MARQUEE
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
@@ -10,7 +10,6 @@ enum class BooleanSetting(
    override val category: Settings.Category,
    override val androidDefault: Boolean? = null
 ) : AbstractBooleanSetting {
-    AUDIO_MUTED("audio_muted", Settings.Category.Audio),
    CPU_DEBUG_MODE("cpu_debug_mode", Settings.Category.Cpu),
    FASTMEM("cpuopt_fastmem", Settings.Category.Cpu),
    FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.Category.Cpu),
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
@@ -80,17 +80,6 @@ object Settings {
    const val SECTION_THEME = "Theme"
    const val SECTION_DEBUG = "Debug"

-    enum class MenuTag(val titleId: Int) {
-        SECTION_ROOT(R.string.advanced_settings),
-        SECTION_GENERAL(R.string.preferences_general),
-        SECTION_SYSTEM(R.string.preferences_system),
-        SECTION_RENDERER(R.string.preferences_graphics),
-        SECTION_AUDIO(R.string.preferences_audio),
-        SECTION_CPU(R.string.cpu),
-        SECTION_THEME(R.string.preferences_theme),
-        SECTION_DEBUG(R.string.preferences_debug);
-    }
-
    const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"

    const val PREF_OVERLAY_VERSION = "OverlayVersion"
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt
@@ -3,12 +3,10 @@

 package org.yuzu.yuzu_emu.features.settings.model.view

-import org.yuzu.yuzu_emu.features.settings.model.Settings
-
 class SubmenuSetting(
    titleId: Int,
    descriptionId: Int,
-    val menuKey: Settings.MenuTag
+    val menuKey: String
 ) : SettingsItem(emptySetting, titleId, descriptionId) {
    override val type = TYPE_SUBMENU
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@@ -13,14 +13,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.navArgs
 import com.google.android.material.color.MaterialColors
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 import java.io.IOException
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
@@ -71,39 +66,25 @@ class SettingsActivity : AppCompatActivity() {
            )
        }

-        lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldRecreate.collectLatest {
-                        if (it) {
-                            settingsViewModel.setShouldRecreate(false)
-                            recreate()
-                        }
-                    }
-                }
+        settingsViewModel.shouldRecreate.observe(this) {
+            if (it) {
+                settingsViewModel.setShouldRecreate(false)
+                recreate()
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldNavigateBack.collectLatest {
-                        if (it) {
-                            settingsViewModel.setShouldNavigateBack(false)
-                            navigateBack()
-                        }
-                    }
-                }
+        }
+        settingsViewModel.shouldNavigateBack.observe(this) {
+            if (it) {
+                settingsViewModel.setShouldNavigateBack(false)
+                navigateBack()
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldShowResetSettingsDialog.collectLatest {
-                        if (it) {
-                            settingsViewModel.setShouldShowResetSettingsDialog(false)
-                            ResetSettingsDialogFragment().show(
-                                supportFragmentManager,
-                                ResetSettingsDialogFragment.TAG
-                            )
-                        }
-                    }
-                }
+        }
+        settingsViewModel.shouldShowResetSettingsDialog.observe(this) {
+            if (it) {
+                settingsViewModel.setShouldShowResetSettingsDialog(false)
+                ResetSettingsDialogFragment().show(
+                    supportFragmentManager,
+                    ResetSettingsDialogFragment.TAG
+                )
            }
        }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt
@@ -3,7 +3,6 @@

 package org.yuzu.yuzu_emu.features.settings.ui

-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,19 +13,14 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentSettingsBinding
-import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.SettingsViewModel

 class SettingsFragment : Fragment() {
@@ -57,17 +51,15 @@ class SettingsFragment : Fragment() {
        return binding.root
    }

-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        settingsAdapter = SettingsAdapter(this, requireContext())
        presenter = SettingsFragmentPresenter(
            settingsViewModel,
            settingsAdapter!!,
-            args.menuTag
+            args.menuTag,
+            args.game?.gameId ?: ""
        )

-        binding.toolbarSettingsLayout.title = getString(args.menuTag.titleId)
        val dividerDecoration = MaterialDividerItemDecoration(
            requireContext(),
            LinearLayoutManager.VERTICAL
@@ -83,31 +75,28 @@ class SettingsFragment : Fragment() {
            settingsViewModel.setShouldNavigateBack(true)
        }

-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    settingsViewModel.shouldReloadSettingsList.collectLatest {
-                        if (it) {
-                            settingsViewModel.setShouldReloadSettingsList(false)
-                            presenter.loadSettingsList()
-                        }
-                    }
-                }
-            }
-            launch {
-                settingsViewModel.isUsingSearch.collectLatest {
-                    if (it) {
-                        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-                    } else {
-                        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-                    }
-                }
+        settingsViewModel.toolbarTitle.observe(viewLifecycleOwner) {
+            if (it.isNotEmpty()) binding.toolbarSettingsLayout.title = it
+        }
+
+        settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
+            if (it) {
+                settingsViewModel.setShouldReloadSettingsList(false)
+                presenter.loadSettingsList()
            }
        }

-        if (args.menuTag == Settings.MenuTag.SECTION_ROOT) {
+        settingsViewModel.isUsingSearch.observe(viewLifecycleOwner) {
+            if (it) {
+                reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+                exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
+            } else {
+                reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+                exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+            }
+        }
+
+        if (args.menuTag == SettingsFile.FILE_NAME_CONFIG) {
            binding.toolbarSettings.inflateMenu(R.menu.menu_settings)
            binding.toolbarSettings.setOnMenuItemClickListener {
                when (it.itemId) {
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.ui
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Build
+import android.text.TextUtils
 import android.widget.Toast
 import androidx.preference.PreferenceManager
 import org.yuzu.yuzu_emu.R
@@ -19,13 +20,15 @@ import org.yuzu.yuzu_emu.features.settings.model.LongSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.*
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.SettingsViewModel
 import org.yuzu.yuzu_emu.utils.NativeConfig

 class SettingsFragmentPresenter(
    private val settingsViewModel: SettingsViewModel,
    private val adapter: SettingsAdapter,
-    private var menuTag: Settings.MenuTag
+    private var menuTag: String,
+    private var gameId: String
 ) {
    private var settingsList = ArrayList<SettingsItem>()

@@ -50,15 +53,24 @@ class SettingsFragmentPresenter(
    }

    fun loadSettingsList() {
+        if (!TextUtils.isEmpty(gameId)) {
+            settingsViewModel.setToolbarTitle(
+                context.getString(
+                    R.string.advanced_settings_game,
+                    gameId
+                )
+            )
+        }
+
        val sl = ArrayList<SettingsItem>()
        when (menuTag) {
-            Settings.MenuTag.SECTION_ROOT -> addConfigSettings(sl)
-            Settings.MenuTag.SECTION_GENERAL -> addGeneralSettings(sl)
-            Settings.MenuTag.SECTION_SYSTEM -> addSystemSettings(sl)
-            Settings.MenuTag.SECTION_RENDERER -> addGraphicsSettings(sl)
-            Settings.MenuTag.SECTION_AUDIO -> addAudioSettings(sl)
-            Settings.MenuTag.SECTION_THEME -> addThemeSettings(sl)
-            Settings.MenuTag.SECTION_DEBUG -> addDebugSettings(sl)
+            SettingsFile.FILE_NAME_CONFIG -> addConfigSettings(sl)
+            Settings.SECTION_GENERAL -> addGeneralSettings(sl)
+            Settings.SECTION_SYSTEM -> addSystemSettings(sl)
+            Settings.SECTION_RENDERER -> addGraphicsSettings(sl)
+            Settings.SECTION_AUDIO -> addAudioSettings(sl)
+            Settings.SECTION_THEME -> addThemeSettings(sl)
+            Settings.SECTION_DEBUG -> addDebugSettings(sl)
            else -> {
                val context = YuzuApplication.appContext
                Toast.makeText(
@@ -74,12 +86,13 @@ class SettingsFragmentPresenter(
    }

    private fun addConfigSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.advanced_settings))
        sl.apply {
-            add(SubmenuSetting(R.string.preferences_general, 0, Settings.MenuTag.SECTION_GENERAL))
-            add(SubmenuSetting(R.string.preferences_system, 0, Settings.MenuTag.SECTION_SYSTEM))
-            add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.MenuTag.SECTION_RENDERER))
-            add(SubmenuSetting(R.string.preferences_audio, 0, Settings.MenuTag.SECTION_AUDIO))
-            add(SubmenuSetting(R.string.preferences_debug, 0, Settings.MenuTag.SECTION_DEBUG))
+            add(SubmenuSetting(R.string.preferences_general, 0, Settings.SECTION_GENERAL))
+            add(SubmenuSetting(R.string.preferences_system, 0, Settings.SECTION_SYSTEM))
+            add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.SECTION_RENDERER))
+            add(SubmenuSetting(R.string.preferences_audio, 0, Settings.SECTION_AUDIO))
+            add(SubmenuSetting(R.string.preferences_debug, 0, Settings.SECTION_DEBUG))
            add(
                RunnableSetting(R.string.reset_to_default, 0, false) {
                    settingsViewModel.setShouldShowResetSettingsDialog(true)
@@ -89,6 +102,7 @@ class SettingsFragmentPresenter(
    }

    private fun addGeneralSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_general))
        sl.apply {
            add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
            add(ShortSetting.RENDERER_SPEED_LIMIT.key)
@@ -98,6 +112,7 @@ class SettingsFragmentPresenter(
    }

    private fun addSystemSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_system))
        sl.apply {
            add(BooleanSetting.USE_DOCKED_MODE.key)
            add(IntSetting.REGION_INDEX.key)
@@ -108,6 +123,7 @@ class SettingsFragmentPresenter(
    }

    private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_graphics))
        sl.apply {
            add(IntSetting.RENDERER_ACCURACY.key)
            add(IntSetting.RENDERER_RESOLUTION.key)
@@ -124,6 +140,7 @@ class SettingsFragmentPresenter(
    }

    private fun addAudioSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_audio))
        sl.apply {
            add(IntSetting.AUDIO_OUTPUT_ENGINE.key)
            add(ByteSetting.AUDIO_VOLUME.key)
@@ -131,6 +148,7 @@ class SettingsFragmentPresenter(
    }

    private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_theme))
        sl.apply {
            val theme: AbstractIntSetting = object : AbstractIntSetting {
                override val int: Int
@@ -243,6 +261,7 @@ class SettingsFragmentPresenter(
    }

    private fun addDebugSettings(sl: ArrayList<SettingsItem>) {
+        settingsViewModel.setToolbarTitle(context.getString(R.string.preferences_debug))
        sl.apply {
            add(HeaderSetting(R.string.gpu))
            add(IntSetting.RENDERER_BACKEND.key)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -39,7 +39,6 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
@@ -50,6 +49,7 @@ import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
 import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.overlay.InputOverlay
@@ -129,8 +129,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        return binding.root
    }

-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        binding.surfaceEmulation.holder.addCallback(this)
        binding.showFpsText.setTextColor(Color.YELLOW)
@@ -165,7 +163,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                R.id.menu_settings -> {
                    val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                        null,
-                        Settings.MenuTag.SECTION_ROOT
+                        SettingsFile.FILE_NAME_CONFIG
                    )
                    binding.root.findNavController().navigate(action)
                    true
@@ -207,80 +205,59 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }
        )

+        viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
+            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                WindowInfoTracker.getOrCreate(requireContext())
+                    .windowLayoutInfo(requireActivity())
+                    .collect { updateFoldableLayout(requireActivity() as EmulationActivity, it) }
+            }
+        }
+
        GameIconUtils.loadGameIcon(game, binding.loadingImage)
        binding.loadingTitle.text = game.title
        binding.loadingTitle.isSelected = true
        binding.loadingText.isSelected = true

-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    WindowInfoTracker.getOrCreate(requireContext())
-                        .windowLayoutInfo(requireActivity())
-                        .collect {
-                            updateFoldableLayout(requireActivity() as EmulationActivity, it)
-                        }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.shaderProgress.collectLatest {
-                        if (it > 0 && it != emulationViewModel.totalShaders.value) {
-                            binding.loadingProgressIndicator.isIndeterminate = false
+        emulationViewModel.shaderProgress.observe(viewLifecycleOwner) {
+            if (it > 0 && it != emulationViewModel.totalShaders.value!!) {
+                binding.loadingProgressIndicator.isIndeterminate = false

-                            if (it < binding.loadingProgressIndicator.max) {
-                                binding.loadingProgressIndicator.progress = it
-                            }
-                        }
+                if (it < binding.loadingProgressIndicator.max) {
+                    binding.loadingProgressIndicator.progress = it
+                }
+            }

-                        if (it == emulationViewModel.totalShaders.value) {
-                            binding.loadingText.setText(R.string.loading)
-                            binding.loadingProgressIndicator.isIndeterminate = true
-                        }
-                    }
-                }
+            if (it == emulationViewModel.totalShaders.value!!) {
+                binding.loadingText.setText(R.string.loading)
+                binding.loadingProgressIndicator.isIndeterminate = true
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.totalShaders.collectLatest {
-                        binding.loadingProgressIndicator.max = it
-                    }
-                }
+        }
+        emulationViewModel.totalShaders.observe(viewLifecycleOwner) {
+            binding.loadingProgressIndicator.max = it
+        }
+        emulationViewModel.shaderMessage.observe(viewLifecycleOwner) {
+            if (it.isNotEmpty()) {
+                binding.loadingText.text = it
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.shaderMessage.collectLatest {
-                        if (it.isNotEmpty()) {
-                            binding.loadingText.text = it
-                        }
-                    }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.emulationStarted.collectLatest {
-                        if (it) {
-                            binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
-                            ViewUtils.showView(binding.surfaceInputOverlay)
-                            ViewUtils.hideView(binding.loadingIndicator)
+        }

-                            // Setup overlay
-                            updateShowFpsOverlay()
-                        }
-                    }
-                }
+        emulationViewModel.emulationStarted.observe(viewLifecycleOwner) { started ->
+            if (started) {
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+                ViewUtils.showView(binding.surfaceInputOverlay)
+                ViewUtils.hideView(binding.loadingIndicator)
+
+                // Setup overlay
+                updateShowFpsOverlay()
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    emulationViewModel.isEmulationStopping.collectLatest {
-                        if (it) {
-                            binding.loadingText.setText(R.string.shutting_down)
-                            ViewUtils.showView(binding.loadingIndicator)
-                            ViewUtils.hideView(binding.inputContainer)
-                            ViewUtils.hideView(binding.showFpsText)
-                        }
-                    }
-                }
+        }
+
+        emulationViewModel.isEmulationStopping.observe(viewLifecycleOwner) {
+            if (it) {
+                binding.loadingText.setText(R.string.shutting_down)
+                ViewUtils.showView(binding.loadingIndicator)
+                ViewUtils.hideView(binding.inputContainer)
+                ViewUtils.hideView(binding.showFpsText)
            }
        }
    }
@@ -297,7 +274,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                }
            }
        } else {
-            if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
+            if (EmulationMenuSettings.showOverlay &&
+                emulationViewModel.emulationStarted.value == true
+            ) {
                binding.surfaceInputOverlay.post {
                    binding.surfaceInputOverlay.visibility = View.VISIBLE
                }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@@ -37,6 +37,7 @@ import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.HomeSetting
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.ui.main.MainActivity
@@ -77,7 +78,7 @@ class HomeSettingsFragment : Fragment() {
                    {
                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                            null,
-                            Settings.MenuTag.SECTION_ROOT
+                            SettingsFile.FILE_NAME_CONFIG
                        )
                        binding.root.findNavController().navigate(action)
                    }
@@ -99,7 +100,7 @@ class HomeSettingsFragment : Fragment() {
                    {
                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                            null,
-                            Settings.MenuTag.SECTION_THEME
+                            Settings.SECTION_THEME
                        )
                        binding.root.findNavController().navigate(action)
                    }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
@@ -5,75 +5,49 @@ package org.yuzu.yuzu_emu.fragments

 import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel

 class IndeterminateProgressDialogFragment : DialogFragment() {
    private val taskViewModel: TaskViewModel by activityViewModels()

-    private lateinit var binding: DialogProgressBarBinding
-
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val titleId = requireArguments().getInt(TITLE)

-        binding = DialogProgressBarBinding.inflate(layoutInflater)
-        binding.progressBar.isIndeterminate = true
+        val progressBinding = DialogProgressBarBinding.inflate(layoutInflater)
+        progressBinding.progressBar.isIndeterminate = true
        val dialog = MaterialAlertDialogBuilder(requireContext())
            .setTitle(titleId)
-            .setView(binding.root)
+            .setView(progressBinding.root)
            .create()
        dialog.setCanceledOnTouchOutside(false)

-        if (!taskViewModel.isRunning.value) {
+        taskViewModel.isComplete.observe(this) { complete ->
+            if (complete) {
+                dialog.dismiss()
+                when (val result = taskViewModel.result.value) {
+                    is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()
+                    is MessageDialogFragment -> result.show(
+                        requireActivity().supportFragmentManager,
+                        MessageDialogFragment.TAG
+                    )
+                }
+                taskViewModel.clear()
+            }
+        }
+
+        if (taskViewModel.isRunning.value == false) {
            taskViewModel.runTask()
        }
        return dialog
    }

-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                taskViewModel.isComplete.collect {
-                    if (it) {
-                        dismiss()
-                        when (val result = taskViewModel.result.value) {
-                            is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG)
-                                .show()
-
-                            is MessageDialogFragment -> result.show(
-                                requireActivity().supportFragmentManager,
-                                MessageDialogFragment.TAG
-                            )
-                        }
-                        taskViewModel.clear()
-                    }
-                }
-            }
-        }
-    }
-
    companion object {
        const val TAG = "IndeterminateProgressDialogFragment"

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt
@@ -3,7 +3,6 @@

 package org.yuzu.yuzu_emu.fragments

-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -18,13 +17,9 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
 import info.debatty.java.stringsimilarity.Jaccard
 import info.debatty.java.stringsimilarity.JaroWinkler
-import kotlinx.coroutines.launch
 import java.util.Locale
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -57,8 +52,6 @@ class SearchFragment : Fragment() {
        return binding.root
    }

-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        homeViewModel.setNavigationVisibility(visible = true, animated = false)
        preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
@@ -86,32 +79,21 @@ class SearchFragment : Fragment() {
            filterAndSearch()
        }

-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.searchFocused.collect {
-                        if (it) {
-                            focusSearch()
-                            gamesViewModel.setSearchFocused(false)
-                        }
-                    }
+        gamesViewModel.apply {
+            searchFocused.observe(viewLifecycleOwner) { searchFocused ->
+                if (searchFocused) {
+                    focusSearch()
+                    gamesViewModel.setSearchFocused(false)
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.games.collect { filterAndSearch() }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    gamesViewModel.searchedGames.collect {
-                        (binding.gridGamesSearch.adapter as GameAdapter).submitList(it)
-                        if (it.isEmpty()) {
-                            binding.noResultsView.visibility = View.VISIBLE
-                        } else {
-                            binding.noResultsView.visibility = View.GONE
-                        }
-                    }
+
+            games.observe(viewLifecycleOwner) { filterAndSearch() }
+            searchedGames.observe(viewLifecycleOwner) {
+                (binding.gridGamesSearch.adapter as GameAdapter).submitList(it)
+                if (it.isEmpty()) {
+                    binding.noResultsView.visibility = View.VISIBLE
+                } else {
+                    binding.noResultsView.visibility = View.GONE
                }
            }
        }
@@ -127,7 +109,7 @@ class SearchFragment : Fragment() {
    private inner class ScoredGame(val score: Double, val item: Game)

    private fun filterAndSearch() {
-        val baseList = gamesViewModel.games.value
+        val baseList = gamesViewModel.games.value!!
        val filteredList: List<Game> = when (binding.chipGroup.checkedChipId) {
            R.id.chip_recently_played -> {
                baseList.filter {
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt
@@ -15,14 +15,10 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.transition.MaterialSharedAxis
 import info.debatty.java.stringsimilarity.Cosine
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentSettingsSearchBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
@@ -83,14 +79,10 @@ class SettingsSearchFragment : Fragment() {
            search()
            binding.settingsList.smoothScrollToPosition(0)
        }
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                settingsViewModel.shouldReloadSettingsList.collect {
-                    if (it) {
-                        settingsViewModel.setShouldReloadSettingsList(false)
-                        search()
-                    }
-                }
+        settingsViewModel.shouldReloadSettingsList.observe(viewLifecycleOwner) {
+            if (it) {
+                settingsViewModel.setShouldReloadSettingsList(false)
+                search()
            }
        }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
@@ -22,14 +22,10 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
-import kotlinx.coroutines.launch
 import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -210,14 +206,10 @@ class SetupFragment : Fragment() {
            )
        }

-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                homeViewModel.shouldPageForward.collect {
-                    if (it) {
-                        pageForward()
-                        homeViewModel.setShouldPageForward(false)
-                    }
-                }
+        homeViewModel.shouldPageForward.observe(viewLifecycleOwner) {
+            if (it) {
+                pageForward()
+                homeViewModel.setShouldPageForward(false)
            }
        }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt
@@ -3,28 +3,28 @@

 package org.yuzu.yuzu_emu.model

+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow

 class EmulationViewModel : ViewModel() {
-    val emulationStarted: StateFlow<Boolean> get() = _emulationStarted
-    private val _emulationStarted = MutableStateFlow(false)
+    private val _emulationStarted = MutableLiveData(false)
+    val emulationStarted: LiveData<Boolean> get() = _emulationStarted

-    val isEmulationStopping: StateFlow<Boolean> get() = _isEmulationStopping
-    private val _isEmulationStopping = MutableStateFlow(false)
+    private val _isEmulationStopping = MutableLiveData(false)
+    val isEmulationStopping: LiveData<Boolean> get() = _isEmulationStopping

-    val shaderProgress: StateFlow<Int> get() = _shaderProgress
-    private val _shaderProgress = MutableStateFlow(0)
+    private val _shaderProgress = MutableLiveData(0)
+    val shaderProgress: LiveData<Int> get() = _shaderProgress

-    val totalShaders: StateFlow<Int> get() = _totalShaders
-    private val _totalShaders = MutableStateFlow(0)
+    private val _totalShaders = MutableLiveData(0)
+    val totalShaders: LiveData<Int> get() = _totalShaders

-    val shaderMessage: StateFlow<String> get() = _shaderMessage
-    private val _shaderMessage = MutableStateFlow("")
+    private val _shaderMessage = MutableLiveData("")
+    val shaderMessage: LiveData<String> get() = _shaderMessage

    fun setEmulationStarted(started: Boolean) {
-        _emulationStarted.value = started
+        _emulationStarted.postValue(started)
    }

    fun setIsEmulationStopping(value: Boolean) {
@@ -50,18 +50,10 @@ class EmulationViewModel : ViewModel() {
    }

    fun clear() {
-        setEmulationStarted(false)
-        setIsEmulationStopping(false)
-        setShaderProgress(0)
-        setTotalShaders(0)
-        setShaderMessage("")
-    }
-
-    companion object {
-        const val KEY_EMULATION_STARTED = "EmulationStarted"
-        const val KEY_IS_EMULATION_STOPPING = "IsEmulationStarting"
-        const val KEY_SHADER_PROGRESS = "ShaderProgress"
-        const val KEY_TOTAL_SHADERS = "TotalShaders"
-        const val KEY_SHADER_MESSAGE = "ShaderMessage"
+        _emulationStarted.value = false
+        _isEmulationStopping.value = false
+        _shaderProgress.value = 0
+        _totalShaders.value = 0
+        _shaderMessage.value = ""
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
@@ -5,13 +5,13 @@ package org.yuzu.yuzu_emu.model

 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
 import java.util.Locale
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -24,23 +24,23 @@ import org.yuzu.yuzu_emu.utils.GameHelper

@OptIn(ExperimentalSerializationApi::class)
 class GamesViewModel : ViewModel() {
-    val games: StateFlow<List<Game>> get() = _games
-    private val _games = MutableStateFlow(emptyList<Game>())
+    private val _games = MutableLiveData<List<Game>>(emptyList())
+    val games: LiveData<List<Game>> get() = _games

-    val searchedGames: StateFlow<List<Game>> get() = _searchedGames
-    private val _searchedGames = MutableStateFlow(emptyList<Game>())
+    private val _searchedGames = MutableLiveData<List<Game>>(emptyList())
+    val searchedGames: LiveData<List<Game>> get() = _searchedGames

-    val isReloading: StateFlow<Boolean> get() = _isReloading
-    private val _isReloading = MutableStateFlow(false)
+    private val _isReloading = MutableLiveData(false)
+    val isReloading: LiveData<Boolean> get() = _isReloading

-    val shouldSwapData: StateFlow<Boolean> get() = _shouldSwapData
-    private val _shouldSwapData = MutableStateFlow(false)
+    private val _shouldSwapData = MutableLiveData(false)
+    val shouldSwapData: LiveData<Boolean> get() = _shouldSwapData

-    val shouldScrollToTop: StateFlow<Boolean> get() = _shouldScrollToTop
-    private val _shouldScrollToTop = MutableStateFlow(false)
+    private val _shouldScrollToTop = MutableLiveData(false)
+    val shouldScrollToTop: LiveData<Boolean> get() = _shouldScrollToTop

-    val searchFocused: StateFlow<Boolean> get() = _searchFocused
-    private val _searchFocused = MutableStateFlow(false)
+    private val _searchFocused = MutableLiveData(false)
+    val searchFocused: LiveData<Boolean> get() = _searchFocused

    init {
        // Ensure keys are loaded so that ROM metadata can be decrypted.
@@ -79,36 +79,36 @@ class GamesViewModel : ViewModel() {
            )
        )

-        _games.value = sortedList
+        _games.postValue(sortedList)
    }

    fun setSearchedGames(games: List<Game>) {
-        _searchedGames.value = games
+        _searchedGames.postValue(games)
    }

    fun setShouldSwapData(shouldSwap: Boolean) {
-        _shouldSwapData.value = shouldSwap
+        _shouldSwapData.postValue(shouldSwap)
    }

    fun setShouldScrollToTop(shouldScroll: Boolean) {
-        _shouldScrollToTop.value = shouldScroll
+        _shouldScrollToTop.postValue(shouldScroll)
    }

    fun setSearchFocused(searchFocused: Boolean) {
-        _searchFocused.value = searchFocused
+        _searchFocused.postValue(searchFocused)
    }

    fun reloadGames(directoryChanged: Boolean) {
-        if (isReloading.value) {
+        if (isReloading.value == true) {
            return
        }
-        _isReloading.value = true
+        _isReloading.postValue(true)

        viewModelScope.launch {
            withContext(Dispatchers.IO) {
                NativeLibrary.resetRomMetadata()
                setGames(GameHelper.getGames())
-                _isReloading.value = false
+                _isReloading.postValue(false)

                if (directoryChanged) {
                    setShouldSwapData(true)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeSetting.kt
@@ -3,8 +3,8 @@

 package org.yuzu.yuzu_emu.model

-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData

 data class HomeSetting(
    val titleId: Int,
@@ -14,5 +14,5 @@ data class HomeSetting(
    val isEnabled: () -> Boolean = { true },
    val disabledTitleId: Int = 0,
    val disabledMessageId: Int = 0,
-    val details: StateFlow<String> = MutableStateFlow("")
+    val details: LiveData<String> = MutableLiveData("")
 )
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
@@ -5,43 +5,47 @@ package org.yuzu.yuzu_emu.model

 import android.net.Uri
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.utils.GameHelper

 class HomeViewModel : ViewModel() {
-    val navigationVisible: StateFlow<Pair<Boolean, Boolean>> get() = _navigationVisible
-    private val _navigationVisible = MutableStateFlow(Pair(false, false))
+    private val _navigationVisible = MutableLiveData<Pair<Boolean, Boolean>>()
+    val navigationVisible: LiveData<Pair<Boolean, Boolean>> get() = _navigationVisible

-    val statusBarShadeVisible: StateFlow<Boolean> get() = _statusBarShadeVisible
-    private val _statusBarShadeVisible = MutableStateFlow(true)
+    private val _statusBarShadeVisible = MutableLiveData(true)
+    val statusBarShadeVisible: LiveData<Boolean> get() = _statusBarShadeVisible

-    val shouldPageForward: StateFlow<Boolean> get() = _shouldPageForward
-    private val _shouldPageForward = MutableStateFlow(false)
+    private val _shouldPageForward = MutableLiveData(false)
+    val shouldPageForward: LiveData<Boolean> get() = _shouldPageForward

-    val gamesDir: StateFlow<String> get() = _gamesDir
-    private val _gamesDir = MutableStateFlow(
+    private val _gamesDir = MutableLiveData(
        Uri.parse(
            PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
                .getString(GameHelper.KEY_GAME_PATH, "")
        ).path ?: ""
    )
+    val gamesDir: LiveData<String> get() = _gamesDir

    var navigatedToSetup = false

+    init {
+        _navigationVisible.value = Pair(false, false)
+    }
+
    fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
-        if (navigationVisible.value.first == visible) {
+        if (_navigationVisible.value?.first == visible) {
            return
        }
        _navigationVisible.value = Pair(visible, animated)
    }

    fun setStatusBarShadeVisibility(visible: Boolean) {
-        if (statusBarShadeVisible.value == visible) {
+        if (_statusBarShadeVisible.value == visible) {
            return
        }
        _statusBarShadeVisible.value = visible
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt
@@ -3,43 +3,48 @@

 package org.yuzu.yuzu_emu.model

+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem

-class SettingsViewModel : ViewModel() {
+class SettingsViewModel(private val savedStateHandle: SavedStateHandle) : ViewModel() {
    var game: Game? = null

    var shouldSave = false

    var clickedItem: SettingsItem? = null

-    val shouldRecreate: StateFlow<Boolean> get() = _shouldRecreate
-    private val _shouldRecreate = MutableStateFlow(false)
+    private val _toolbarTitle = MutableLiveData("")
+    val toolbarTitle: LiveData<String> get() = _toolbarTitle

-    val shouldNavigateBack: StateFlow<Boolean> get() = _shouldNavigateBack
-    private val _shouldNavigateBack = MutableStateFlow(false)
+    private val _shouldRecreate = MutableLiveData(false)
+    val shouldRecreate: LiveData<Boolean> get() = _shouldRecreate

-    val shouldShowResetSettingsDialog: StateFlow<Boolean> get() = _shouldShowResetSettingsDialog
-    private val _shouldShowResetSettingsDialog = MutableStateFlow(false)
+    private val _shouldNavigateBack = MutableLiveData(false)
+    val shouldNavigateBack: LiveData<Boolean> get() = _shouldNavigateBack

-    val shouldReloadSettingsList: StateFlow<Boolean> get() = _shouldReloadSettingsList
-    private val _shouldReloadSettingsList = MutableStateFlow(false)
+    private val _shouldShowResetSettingsDialog = MutableLiveData(false)
+    val shouldShowResetSettingsDialog: LiveData<Boolean> get() = _shouldShowResetSettingsDialog

-    val isUsingSearch: StateFlow<Boolean> get() = _isUsingSearch
-    private val _isUsingSearch = MutableStateFlow(false)
+    private val _shouldReloadSettingsList = MutableLiveData(false)
+    val shouldReloadSettingsList: LiveData<Boolean> get() = _shouldReloadSettingsList

-    val sliderProgress: StateFlow<Int> get() = _sliderProgress
-    private val _sliderProgress = MutableStateFlow(-1)
+    private val _isUsingSearch = MutableLiveData(false)
+    val isUsingSearch: LiveData<Boolean> get() = _isUsingSearch

-    val sliderTextValue: StateFlow<String> get() = _sliderTextValue
-    private val _sliderTextValue = MutableStateFlow("")
+    val sliderProgress = savedStateHandle.getStateFlow(KEY_SLIDER_PROGRESS, -1)

-    val adapterItemChanged: StateFlow<Int> get() = _adapterItemChanged
-    private val _adapterItemChanged = MutableStateFlow(-1)
+    val sliderTextValue = savedStateHandle.getStateFlow(KEY_SLIDER_TEXT_VALUE, "")
+
+    val adapterItemChanged = savedStateHandle.getStateFlow(KEY_ADAPTER_ITEM_CHANGED, -1)
+
+    fun setToolbarTitle(value: String) {
+        _toolbarTitle.value = value
+    }

    fun setShouldRecreate(value: Boolean) {
        _shouldRecreate.value = value
@@ -62,8 +67,8 @@ class SettingsViewModel : ViewModel() {
    }

    fun setSliderTextValue(value: Float, units: String) {
-        _sliderProgress.value = value.toInt()
-        _sliderTextValue.value = String.format(
+        savedStateHandle[KEY_SLIDER_PROGRESS] = value
+        savedStateHandle[KEY_SLIDER_TEXT_VALUE] = String.format(
            YuzuApplication.appContext.getString(R.string.value_with_units),
            value.toInt().toString(),
            units
@@ -71,15 +76,21 @@ class SettingsViewModel : ViewModel() {
    }

    fun setSliderProgress(value: Float) {
-        _sliderProgress.value = value.toInt()
+        savedStateHandle[KEY_SLIDER_PROGRESS] = value
    }

    fun setAdapterItemChanged(value: Int) {
-        _adapterItemChanged.value = value
+        savedStateHandle[KEY_ADAPTER_ITEM_CHANGED] = value
    }

    fun clear() {
        game = null
        shouldSave = false
    }
+
+    companion object {
+        const val KEY_SLIDER_TEXT_VALUE = "SliderTextValue"
+        const val KEY_SLIDER_PROGRESS = "SliderProgress"
+        const val KEY_ADAPTER_ITEM_CHANGED = "AdapterItemChanged"
+    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
@@ -3,25 +3,29 @@

 package org.yuzu.yuzu_emu.model

+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch

 class TaskViewModel : ViewModel() {
-    val result: StateFlow<Any> get() = _result
-    private val _result = MutableStateFlow(Any())
+    private val _result = MutableLiveData<Any>()
+    val result: LiveData<Any> = _result

-    val isComplete: StateFlow<Boolean> get() = _isComplete
-    private val _isComplete = MutableStateFlow(false)
+    private val _isComplete = MutableLiveData<Boolean>()
+    val isComplete: LiveData<Boolean> = _isComplete

-    val isRunning: StateFlow<Boolean> get() = _isRunning
-    private val _isRunning = MutableStateFlow(false)
+    private val _isRunning = MutableLiveData<Boolean>()
+    val isRunning: LiveData<Boolean> = _isRunning

    lateinit var task: () -> Any

+    init {
+        clear()
+    }
+
    fun clear() {
        _result.value = Any()
        _isComplete.value = false
@@ -29,16 +33,15 @@ class TaskViewModel : ViewModel() {
    }

    fun runTask() {
-        if (isRunning.value) {
+        if (_isRunning.value == true) {
            return
        }
        _isRunning.value = true

        viewModelScope.launch(Dispatchers.IO) {
            val res = task()
-            _result.value = res
-            _isComplete.value = true
-            _isRunning.value = false
+            _result.postValue(res)
+            _isComplete.postValue(true)
        }
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
@@ -3,7 +3,6 @@

 package org.yuzu.yuzu_emu.ui

-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,12 +14,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.transition.MaterialFadeThrough
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.adapters.GameAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding
@@ -49,8 +44,6 @@ class GamesFragment : Fragment() {
        return binding.root
    }

-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        homeViewModel.setNavigationVisibility(visible = true, animated = false)

@@ -87,48 +80,37 @@ class GamesFragment : Fragment() {
                if (_binding == null) {
                    return@post
                }
-                binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value
+                binding.swipeRefresh.isRefreshing = gamesViewModel.isReloading.value!!
            }
        }

-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.isReloading.collect { binding.swipeRefresh.isRefreshing = it }
+        gamesViewModel.apply {
+            // Watch for when we get updates to any of our games lists
+            isReloading.observe(viewLifecycleOwner) { isReloading ->
+                binding.swipeRefresh.isRefreshing = isReloading
+            }
+            games.observe(viewLifecycleOwner) {
+                (binding.gridGames.adapter as GameAdapter).submitList(it)
+                if (it.isEmpty()) {
+                    binding.noticeText.visibility = View.VISIBLE
+                } else {
+                    binding.noticeText.visibility = View.GONE
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.games.collect {
-                        (binding.gridGames.adapter as GameAdapter).submitList(it)
-                        if (it.isEmpty()) {
-                            binding.noticeText.visibility = View.VISIBLE
-                        } else {
-                            binding.noticeText.visibility = View.GONE
-                        }
-                    }
+            shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData ->
+                if (shouldSwapData) {
+                    (binding.gridGames.adapter as GameAdapter).submitList(
+                        gamesViewModel.games.value!!
+                    )
+                    gamesViewModel.setShouldSwapData(false)
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.shouldSwapData.collect {
-                        if (it) {
-                            (binding.gridGames.adapter as GameAdapter).submitList(
-                                gamesViewModel.games.value
-                            )
-                            gamesViewModel.setShouldSwapData(false)
-                        }
-                    }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    gamesViewModel.shouldScrollToTop.collect {
-                        if (it) {
-                            scrollToTop()
-                            gamesViewModel.setShouldScrollToTop(false)
-                        }
-                    }
+
+            // Check if the user reselected the games menu item and then scroll to top of the list
+            shouldScrollToTop.observe(viewLifecycleOwner) { shouldScroll ->
+                if (shouldScroll) {
+                    scrollToTop()
+                    gamesViewModel.setShouldScrollToTop(false)
                }
            }
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -19,9 +19,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
@@ -42,6 +40,7 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -108,7 +107,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                R.id.homeSettingsFragment -> {
                    val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                        null,
-                        Settings.MenuTag.SECTION_ROOT
+                        SettingsFile.FILE_NAME_CONFIG
                    )
                    navHostFragment.navController.navigate(action)
                }
@@ -116,22 +115,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
        }

        // Prevents navigation from being drawn for a short time on recreation if set to hidden
-        if (!homeViewModel.navigationVisible.value.first) {
+        if (!homeViewModel.navigationVisible.value?.first!!) {
            binding.navigationView.visibility = View.INVISIBLE
            binding.statusBarShade.visibility = View.INVISIBLE
        }

-        lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.navigationVisible.collect { showNavigation(it.first, it.second) }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.statusBarShadeVisible.collect { showStatusBarShade(it) }
-                }
-            }
+        homeViewModel.navigationVisible.observe(this) {
+            showNavigation(it.first, it.second)
+        }
+        homeViewModel.statusBarShadeVisible.observe(this) { visible ->
+            showStatusBarShade(visible)
        }

        // Dismiss previous notifications (should not happen unless a crash occurred)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt
@@ -6,11 +6,9 @@ package org.yuzu.yuzu_emu.utils
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.widget.ImageView
-import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
-import coil.executeBlocking
 import coil.fetch.DrawableResult
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
@@ -76,13 +74,4 @@ object GameIconUtils {
            .build()
        imageLoader.enqueue(request)
    }
-
-    fun getGameIcon(game: Game): Bitmap {
-        val request = ImageRequest.Builder(YuzuApplication.appContext)
-            .data(game)
-            .error(R.drawable.default_icon)
-            .build()
-        return imageLoader.executeBlocking(request)
-            .drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)
-    }
 }
--- a/src/android/app/src/main/jni/config.cpp
+++ b/src/android/app/src/main/jni/config.cpp
@@ -282,7 +282,7 @@ void Config::ReadValues() {
    std::stringstream ss(title_list);
    std::string line;
    while (std::getline(ss, line, '|')) {
-        const auto title_id = std::strtoul(line.c_str(), nullptr, 16);
+        const auto title_id = std::stoul(line, nullptr, 16);
        const auto disabled_list = config->Get("AddOns", "disabled_" + line, "");

        std::stringstream inner_ss(disabled_list);
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -262,6 +262,9 @@ public:
    Core::SystemResultStatus InitializeEmulation(const std::string& filepath) {
        std::scoped_lock lock(m_mutex);

+        // Loads the configuration.
+        Config{};
+
        // Create the render window.
        m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window,
                                                       m_vulkan_library);
@@ -327,13 +330,12 @@ public:
            m_system.ShutdownMainProcess();
            m_detached_tasks.WaitForAllTasks();
            m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
-            m_window.reset();
-            OnEmulationStopped(Core::SystemResultStatus::Success);
-            return;
        }

        // Tear down the render window.
        m_window.reset();
+
+        OnEmulationStopped(m_load_result);
    }

    void PauseEmulation() {
@@ -670,6 +672,18 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass claz
    return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
 }

+void Java_org_yuzu_yuzu_1emu_NativeLibrary_muteAduio(JNIEnv* env, jclass clazz) {
+    Settings::values.audio_muted = true;
+}
+
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_unmuteAudio(JNIEnv* env, jclass clazz) {
+    Settings::values.audio_muted = false;
+}
+
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isMuted(JNIEnv* env, jclass clazz) {
+    return static_cast<jboolean>(Settings::values.audio_muted.GetValue());
+}
+
 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, jclass clazz) {
    return EmulationSession::GetInstance().IsHandheldOnly();
 }
--- a/src/android/app/src/main/res/drawable/shortcut.xml
+++ b/src/android/app/src/main/res/drawable/shortcut.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <color android:color="@android:color/white" />
-    </item>
-    <item android:id="@+id/shortcut_foreground">
-        <bitmap android:src="@drawable/default_icon" />
-    </item>
-
-</layer-list>
--- a/src/android/app/src/main/res/navigation/emulation_navigation.xml
+++ b/src/android/app/src/main/res/navigation/emulation_navigation.xml
@@ -27,7 +27,7 @@
            app:nullable="true" />
        <argument
            android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
    </activity>

    <action
--- a/src/android/app/src/main/res/navigation/home_navigation.xml
+++ b/src/android/app/src/main/res/navigation/home_navigation.xml
@@ -82,7 +82,7 @@
            app:nullable="true" />
        <argument
            android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
    </activity>

    <action
--- a/src/android/app/src/main/res/navigation/settings_navigation.xml
+++ b/src/android/app/src/main/res/navigation/settings_navigation.xml
@@ -10,7 +10,7 @@
        android:label="SettingsFragment">
        <argument
            android:name="menuTag"
-            app:argType="org.yuzu.yuzu_emu.features.settings.model.Settings$MenuTag" />
+            app:argType="string" />
        <argument
            android:name="game"
            app:argType="org.yuzu.yuzu_emu.model.Game"
--- a/src/android/app/src/main/res/values/dimens.xml
+++ b/src/android/app/src/main/res/values/dimens.xml
@@ -12,7 +12,6 @@
    <dimen name="spacing_refresh_end">72dp</dimen>
    <dimen name="menu_width">256dp</dimen>
    <dimen name="card_width">165dp</dimen>
-    <dimen name="icon_inset">24dp</dimen>

    <dimen name="dialog_margin">20dp</dimen>
    <dimen name="elevated_app_bar">3dp</dimen>
--- a/src/common/fs/fs.cpp
+++ b/src/common/fs/fs.cpp
@@ -528,41 +528,38 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path,
 // Generic Filesystem Operations

 bool Exists(const fs::path& path) {
-    std::error_code ec;
 #ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return Android::Exists(path);
    } else {
-        return fs::exists(path, ec);
+        return fs::exists(path);
    }
 #else
-    return fs::exists(path, ec);
+    return fs::exists(path);
 #endif
 }

 bool IsFile(const fs::path& path) {
-    std::error_code ec;
 #ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return !Android::IsDirectory(path);
    } else {
-        return fs::is_regular_file(path, ec);
+        return fs::is_regular_file(path);
    }
 #else
-    return fs::is_regular_file(path, ec);
+    return fs::is_regular_file(path);
 #endif
 }

 bool IsDir(const fs::path& path) {
-    std::error_code ec;
 #ifdef ANDROID
    if (Android::IsContentUri(path)) {
        return Android::IsDirectory(path);
    } else {
-        return fs::is_directory(path, ec);
+        return fs::is_directory(path);
    }
 #else
-    return fs::is_directory(path, ec);
+    return fs::is_directory(path);
 #endif
 }

--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -112,7 +112,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
    SUB(Service, NCM)                                                                              \
    SUB(Service, NFC)                                                                              \
    SUB(Service, NFP)                                                                              \
-    SUB(Service, NGC)                                                                              \
+    SUB(Service, NGCT)                                                                             \
    SUB(Service, NIFM)                                                                             \
    SUB(Service, NIM)                                                                              \
    SUB(Service, NOTIF)                                                                            \
--- a/src/common/logging/types.h
+++ b/src/common/logging/types.h
@@ -80,7 +80,7 @@ enum class Class : u8 {
    Service_NCM,        ///< The NCM service
    Service_NFC,        ///< The NFC (Near-field communication) service
    Service_NFP,        ///< The NFP service
-    Service_NGC,        ///< The NGC (No Good Content) service
+    Service_NGCT,       ///< The NGCT (No Good Content for Terra) service
    Service_NIFM,       ///< The NIFM (Network interface) service
    Service_NIM,        ///< The NIM service
    Service_NOTIF,      ///< The NOTIF (Notification) service
--- a/src/common/polyfill_thread.h
+++ b/src/common/polyfill_thread.h
@@ -19,8 +19,8 @@
 namespace Common {

 template <typename Condvar, typename Lock, typename Pred>
-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred&& pred) {
-    cv.wait(lk, token, std::move(pred));
+void CondvarWait(Condvar& cv, Lock& lock, std::stop_token token, Pred&& pred) {
+    cv.wait(lock, token, std::move(pred));
 }

 template <typename Rep, typename Period>
@@ -332,17 +332,13 @@ private:
 namespace Common {

 template <typename Condvar, typename Lock, typename Pred>
-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred pred) {
+void CondvarWait(Condvar& cv, Lock& lock, std::stop_token token, Pred pred) {
    if (token.stop_requested()) {
        return;
    }

-    std::stop_callback callback(token, [&] {
-        { std::scoped_lock lk2{*lk.mutex()}; }
-        cv.notify_all();
-    });
-
-    cv.wait(lk, [&] { return pred() || token.stop_requested(); });
+    std::stop_callback callback(token, [&] { cv.notify_all(); });
+    cv.wait(lock, [&] { return pred() || token.stop_requested(); });
 }

 template <typename Rep, typename Period>
@@ -357,10 +353,8 @@ bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep,

    std::stop_callback cb(token, [&] {
        // Wake up the waiting thread.
-        {
-            std::scoped_lock lk{m};
-            stop_requested = true;
-        }
+        std::unique_lock lk{m};
+        stop_requested = true;
        cv.notify_one();
    });

--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -348,8 +348,6 @@ struct Values {
                                          Category::RendererDebug};
    Setting<bool> disable_shader_loop_safety_checks{
        linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
-    Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey",
-                                          Category::RendererDebug};

    // System
    SwitchableSetting<Language, true> language_index{linkage,
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -225,16 +225,6 @@ public:
     */
    [[nodiscard]] virtual constexpr u32 EnumIndex() const = 0;

-    /**
-     * @returns True if the underlying type is a floating point storage
-     */
-    [[nodiscard]] virtual constexpr bool IsFloatingPoint() const = 0;
-
-    /**
-     * @returns True if the underlying type is an integer storage
-     */
-    [[nodiscard]] virtual constexpr bool IsIntegral() const = 0;
-
    /*
     * Switchable settings
     */
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <typeindex>
 #include <typeinfo>
-#include <fmt/core.h>
 #include "common/common_types.h"
 #include "common/settings_common.h"
 #include "common/settings_enums.h"
@@ -116,12 +115,8 @@ protected:
        } else if constexpr (std::is_same_v<Type, AudioEngine>) {
            // Compatibility with old AudioEngine setting being a string
            return CanonicalizeEnum(value_);
-        } else if constexpr (std::is_floating_point_v<Type>) {
-            return fmt::format("{:f}", value_);
-        } else if constexpr (std::is_enum_v<Type>) {
-            return std::to_string(static_cast<u32>(value_));
        } else {
-            return std::to_string(value_);
+            return std::to_string(static_cast<u64>(value_));
        }
    }

@@ -185,15 +180,13 @@ public:
                this->SetValue(static_cast<u32>(std::stoul(input)));
            } else if constexpr (std::is_same_v<Type, bool>) {
                this->SetValue(input == "true");
-            } else if constexpr (std::is_same_v<Type, float>) {
-                this->SetValue(std::stof(input));
+            } else if constexpr (std::is_same_v<Type, AudioEngine>) {
+                this->SetValue(ToEnum<Type>(input));
            } else {
                this->SetValue(static_cast<Type>(std::stoll(input)));
            }
        } catch (std::invalid_argument&) {
            this->SetValue(this->GetDefault());
-        } catch (std::out_of_range&) {
-            this->SetValue(this->GetDefault());
        }
    }

@@ -222,27 +215,11 @@ public:
        }
    }

-    [[nodiscard]] constexpr bool IsFloatingPoint() const final {
-        return std::is_floating_point_v<Type>;
-    }
-
-    [[nodiscard]] constexpr bool IsIntegral() const final {
-        return std::is_integral_v<Type>;
-    }
-
    [[nodiscard]] std::string MinVal() const override final {
-        if constexpr (std::is_arithmetic_v<Type> && !ranged) {
-            return this->ToString(std::numeric_limits<Type>::min());
-        } else {
-            return this->ToString(minimum);
-        }
+        return this->ToString(minimum);
    }
    [[nodiscard]] std::string MaxVal() const override final {
-        if constexpr (std::is_arithmetic_v<Type> && !ranged) {
-            return this->ToString(std::numeric_limits<Type>::max());
-        } else {
-            return this->ToString(maximum);
-        }
+        return this->ToString(maximum);
    }

    [[nodiscard]] constexpr bool Ranged() const override {
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -627,8 +627,8 @@ add_library(core STATIC
    hle/service/nfp/nfp_interface.h
    hle/service/nfp/nfp_result.h
    hle/service/nfp/nfp_types.h
-    hle/service/ngc/ngc.cpp
-    hle/service/ngc/ngc.h
+    hle/service/ngct/ngct.cpp
+    hle/service/ngct/ngct.h
    hle/service/nifm/nifm.cpp
    hle/service/nifm/nifm.h
    hle/service/nim/nim.cpp
@@ -864,8 +864,6 @@ add_library(core STATIC
    telemetry_session.h
    tools/freezer.cpp
    tools/freezer.h
-    tools/renderdoc.cpp
-    tools/renderdoc.h
 )

 if (MSVC)
@@ -881,7 +879,6 @@ else()
        -Werror=conversion

        -Wno-sign-conversion
-        -Wno-cast-function-type

        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
    )
@@ -890,7 +887,7 @@ endif()
 create_target_directory_groups(core)

 target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
-target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus renderdoc)
+target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus)
 if (MINGW)
    target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
 endif()
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -51,7 +51,6 @@
 #include "core/reporter.h"
 #include "core/telemetry_session.h"
 #include "core/tools/freezer.h"
-#include "core/tools/renderdoc.h"
 #include "network/network.h"
 #include "video_core/host1x/host1x.h"
 #include "video_core/renderer_base.h"
@@ -282,10 +281,6 @@ struct System::Impl {
        microprofile_cpu[2] = MICROPROFILE_TOKEN(ARM_CPU2);
        microprofile_cpu[3] = MICROPROFILE_TOKEN(ARM_CPU3);

-        if (Settings::values.enable_renderdoc_hotkey) {
-            renderdoc_api = std::make_unique<Tools::RenderdocAPI>();
-        }
-
        LOG_DEBUG(Core, "Initialized OK");

        return SystemResultStatus::Success;
@@ -526,8 +521,6 @@ struct System::Impl {
    std::unique_ptr<Tools::Freezer> memory_freezer;
    std::array<u8, 0x20> build_id{};

-    std::unique_ptr<Tools::RenderdocAPI> renderdoc_api;
-
    /// Frontend applets
    Service::AM::Applets::AppletManager applet_manager;

@@ -1031,10 +1024,6 @@ const Network::RoomNetwork& System::GetRoomNetwork() const {
    return impl->room_network;
 }

-Tools::RenderdocAPI& System::GetRenderdocAPI() {
-    return *impl->renderdoc_api;
-}
-
 void System::RunServer(std::unique_ptr<Service::ServerManager>&& server_manager) {
    return impl->kernel.RunServer(std::move(server_manager));
 }
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -102,10 +102,6 @@ namespace Network {
 class RoomNetwork;
 }

-namespace Tools {
-class RenderdocAPI;
-}
-
 namespace Core {

 class ARM_Interface;
@@ -417,8 +413,6 @@ public:
    /// Gets an immutable reference to the Room Network.
    [[nodiscard]] const Network::RoomNetwork& GetRoomNetwork() const;

-    [[nodiscard]] Tools::RenderdocAPI& GetRenderdocAPI();
-
    void SetExitLocked(bool locked);
    bool GetExitLocked() const;

--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -724,14 +724,14 @@ void KeyManager::LoadFromFile(const std::filesystem::path& file_path, bool is_ti
                    continue;
                }

-                const auto index = std::strtoul(out[0].substr(8, 2).c_str(), nullptr, 16);
+                const auto index = std::stoul(out[0].substr(8, 2), nullptr, 16);
                keyblobs[index] = Common::HexStringToArray<0x90>(out[1]);
            } else if (out[0].compare(0, 18, "encrypted_keyblob_") == 0) {
                if (!ValidCryptoRevisionString(out[0], 18, 2)) {
                    continue;
                }

-                const auto index = std::strtoul(out[0].substr(18, 2).c_str(), nullptr, 16);
+                const auto index = std::stoul(out[0].substr(18, 2), nullptr, 16);
                encrypted_keyblobs[index] = Common::HexStringToArray<0xB0>(out[1]);
            } else if (out[0].compare(0, 20, "eticket_extended_kek") == 0) {
                eticket_extended_kek = Common::HexStringToArray<576>(out[1]);
@@ -750,7 +750,7 @@ void KeyManager::LoadFromFile(const std::filesystem::path& file_path, bool is_ti
                    }
                    if (out[0].compare(0, kv.second.size(), kv.second) == 0) {
                        const auto index =
-                            std::strtoul(out[0].substr(kv.second.size(), 2).c_str(), nullptr, 16);
+                            std::stoul(out[0].substr(kv.second.size(), 2), nullptr, 16);
                        const auto sub = kv.first.second;
                        if (sub == 0) {
                            s128_keys[{kv.first.first, index, 0}] =
@@ -770,7 +770,7 @@ void KeyManager::LoadFromFile(const std::filesystem::path& file_path, bool is_ti
                    const auto& match = kak_names[j];
                    if (out[0].compare(0, std::strlen(match), match) == 0) {
                        const auto index =
-                            std::strtoul(out[0].substr(std::strlen(match), 2).c_str(), nullptr, 16);
+                            std::stoul(out[0].substr(std::strlen(match), 2), nullptr, 16);
                        s128_keys[{S128KeyType::KeyArea, index, j}] =
                            Common::HexStringToArray<16>(out[1]);
                    }
--- a/src/core/file_sys/ips_layer.cpp
+++ b/src/core/file_sys/ips_layer.cpp
@@ -165,7 +165,7 @@ static std::string EscapeStringSequences(std::string in) {
 void IPSwitchCompiler::ParseFlag(const std::string& line) {
    if (StartsWith(line, "@flag offset_shift ")) {
        // Offset Shift Flag
-        offset_shift = std::strtoll(line.substr(19).c_str(), nullptr, 0);
+        offset_shift = std::stoll(line.substr(19), nullptr, 0);
    } else if (StartsWith(line, "@little-endian")) {
        // Set values to read as little endian
        is_little_endian = true;
@@ -263,7 +263,7 @@ void IPSwitchCompiler::Parse() {
                // 11 - 8 hex digit offset + space + minimum two digit overwrite val
                if (patch_line.length() < 11)
                    break;
-                auto offset = std::strtoul(patch_line.substr(0, 8).c_str(), nullptr, 16);
+                auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16);
                offset += static_cast<unsigned long>(offset_shift);

                std::vector<u8> replace;
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -294,11 +294,11 @@ std::vector<u8> PatchManager::PatchNSO(const std::vector<u8>& nso, const std::st
    return out;
 }

-bool PatchManager::HasNSOPatch(const BuildID& build_id_, std::string_view name) const {
+bool PatchManager::HasNSOPatch(const BuildID& build_id_) const {
    const auto build_id_raw = Common::HexToString(build_id_);
    const auto build_id = build_id_raw.substr(0, build_id_raw.find_last_not_of('0') + 1);

-    LOG_INFO(Loader, "Querying NSO patch existence for build_id={}, name={}", build_id, name);
+    LOG_INFO(Loader, "Querying NSO patch existence for build_id={}", build_id);

    const auto load_dir = fs_controller.GetModificationLoadRoot(title_id);
    if (load_dir == nullptr) {
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@@ -52,7 +52,7 @@ public:

    // Checks to see if PatchNSO() will have any effect given the NSO's build ID.
    // Used to prevent expensive copies in NSO loader.
-    [[nodiscard]] bool HasNSOPatch(const BuildID& build_id, std::string_view name) const;
+    [[nodiscard]] bool HasNSOPatch(const BuildID& build_id) const;

    // Creates a CheatList object with all
    [[nodiscard]] std::vector<Core::Memory::CheatEntry> CreateCheatList(
--- a/src/core/hid/hid_core.cpp
+++ b/src/core/hid/hid_core.cpp
@@ -154,14 +154,6 @@ NpadIdType HIDCore::GetFirstDisconnectedNpadId() const {
    return NpadIdType::Player1;
 }

-void HIDCore::SetLastActiveController(NpadIdType npad_id) {
-    last_active_controller = npad_id;
-}
-
-NpadIdType HIDCore::GetLastActiveController() const {
-    return last_active_controller;
-}
-
 void HIDCore::EnableAllControllerConfiguration() {
    player_1->EnableConfiguration();
    player_2->EnableConfiguration();
--- a/src/core/hid/hid_core.h
+++ b/src/core/hid/hid_core.h
@@ -48,12 +48,6 @@ public:
    /// Returns the first disconnected npad id
    NpadIdType GetFirstDisconnectedNpadId() const;

-    /// Sets the npad id of the last active controller
-    void SetLastActiveController(NpadIdType npad_id);
-
-    /// Returns the npad id of the last controller that pushed a button
-    NpadIdType GetLastActiveController() const;
-
    /// Sets all emulated controllers into configuring mode.
    void EnableAllControllerConfiguration();

@@ -83,7 +77,6 @@ private:
    std::unique_ptr<EmulatedConsole> console;
    std::unique_ptr<EmulatedDevices> devices;
    NpadStyleTag supported_style_tag{NpadStyleSet::All};
-    NpadIdType last_active_controller{NpadIdType::Handheld};
 };

 } // namespace Core::HID
--- a/src/core/hle/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@@ -96,7 +96,6 @@ Result KProcess::Initialize(KProcess* process, Core::System& system, std::string
    process->m_is_suspended = false;
    process->m_schedule_count = 0;
    process->m_is_handle_table_initialized = false;
-    process->m_is_hbl = false;

    // Open a reference to the resource limit.
    process->m_resource_limit->Open();
@@ -352,14 +351,12 @@ Result KProcess::SetActivity(ProcessActivity activity) {
    R_SUCCEED();
 }

-Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std::size_t code_size,
-                                  bool is_hbl) {
+Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std::size_t code_size) {
    m_program_id = metadata.GetTitleID();
    m_ideal_core = metadata.GetMainThreadCore();
    m_is_64bit_process = metadata.Is64BitProgram();
    m_system_resource_size = metadata.GetSystemResourceSize();
    m_image_size = code_size;
-    m_is_hbl = is_hbl;

    if (metadata.GetAddressSpaceType() == FileSys::ProgramAddressSpaceType::Is39Bit) {
        // For 39-bit processes, the ASLR region starts at 0x800'0000 and is ~512GiB large.
--- a/src/core/hle/kernel/k_process.h
+++ b/src/core/hle/kernel/k_process.h
@@ -338,8 +338,7 @@ public:
     * @returns ResultSuccess if all relevant metadata was able to be
     *          loaded and parsed. Otherwise, an error code is returned.
     */
-    Result LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std::size_t code_size,
-                            bool is_hbl);
+    Result LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std::size_t code_size);

    /**
     * Starts the main application thread for this process.
@@ -369,10 +368,6 @@ public:
        return GetProcessId();
    }

-    bool IsHbl() const {
-        return m_is_hbl;
-    }
-
    bool IsSignaled() const override;

    void DoWorkerTaskImpl();
@@ -530,7 +525,6 @@ private:
    bool m_is_immortal{};
    bool m_is_handle_table_initialized{};
    bool m_is_initialized{};
-    bool m_is_hbl{};

    std::atomic<u16> m_num_running_threads{};

--- a/src/core/hle/kernel/svc/svc_debug_string.cpp
+++ b/src/core/hle/kernel/svc/svc_debug_string.cpp
@@ -14,7 +14,7 @@ Result OutputDebugString(Core::System& system, u64 address, u64 len) {

    std::string str(len, '\0');
    GetCurrentMemory(system.Kernel()).ReadBlock(address, str.data(), str.size());
-    LOG_INFO(Debug_Emulated, "{}", str);
+    LOG_DEBUG(Debug_Emulated, "{}", str);

    R_SUCCEED();
 }
--- a/src/core/hle/kernel/svc/svc_exception.cpp
+++ b/src/core/hle/kernel/svc/svc_exception.cpp
@@ -3,7 +3,6 @@

 #include "core/core.h"
 #include "core/debugger/debugger.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/svc.h"
 #include "core/hle/kernel/svc_types.h"
@@ -108,10 +107,7 @@ void Break(Core::System& system, BreakReason reason, u64 info1, u64 info2) {
        system.ArmInterface(static_cast<std::size_t>(thread_processor_id)).LogBacktrace();
    }

-    const bool is_hbl = GetCurrentProcess(system.Kernel()).IsHbl();
-    const bool should_break = is_hbl || !notification_only;
-
-    if (system.DebuggerEnabled() && should_break) {
+    if (system.DebuggerEnabled()) {
        auto* thread = system.Kernel().GetCurrentEmuThread();
        system.GetDebugger().NotifyThreadStopped(thread);
        thread->RequestSuspend(Kernel::SuspendType::Debug);
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1386,7 +1386,7 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
        {25, &IApplicationFunctions::ExtendSaveData, "ExtendSaveData"},
        {26, &IApplicationFunctions::GetSaveDataSize, "GetSaveDataSize"},
        {27, &IApplicationFunctions::CreateCacheStorage, "CreateCacheStorage"},
-        {28, &IApplicationFunctions::GetSaveDataSizeMax, "GetSaveDataSizeMax"},
+        {28, nullptr, "GetSaveDataSizeMax"},
        {29, nullptr, "GetCacheStorageMax"},
        {30, &IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed, "BeginBlockingHomeButtonShortAndLongPressed"},
        {31, &IApplicationFunctions::EndBlockingHomeButtonShortAndLongPressed, "EndBlockingHomeButtonShortAndLongPressed"},
@@ -1821,18 +1821,6 @@ void IApplicationFunctions::CreateCacheStorage(HLERequestContext& ctx) {
    rb.PushRaw(resp);
 }

-void IApplicationFunctions::GetSaveDataSizeMax(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-
-    constexpr u64 size_max_normal = 0xFFFFFFF;
-    constexpr u64 size_max_journal = 0xFFFFFFF;
-
-    IPC::ResponseBuilder rb{ctx, 6};
-    rb.Push(ResultSuccess);
-    rb.Push(size_max_normal);
-    rb.Push(size_max_journal);
-}
-
 void IApplicationFunctions::QueryApplicationPlayStatistics(HLERequestContext& ctx) {
    LOG_WARNING(Service_AM, "(STUBBED) called");

--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -316,7 +316,6 @@ private:
    void ExtendSaveData(HLERequestContext& ctx);
    void GetSaveDataSize(HLERequestContext& ctx);
    void CreateCacheStorage(HLERequestContext& ctx);
-    void GetSaveDataSizeMax(HLERequestContext& ctx);
    void BeginBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx);
    void EndBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx);
    void BeginBlockingHomeButton(HLERequestContext& ctx);
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -193,7 +193,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
        shared_memory->system_properties.use_minus.Assign(1);
        shared_memory->system_properties.is_charging_joy_dual.Assign(
            battery_level.dual.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::SwitchProController;
+        shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::SwitchProController;
        shared_memory->sixaxis_fullkey_properties.is_newly_assigned.Assign(1);
        break;
    case Core::HID::NpadStyleIndex::Handheld:
@@ -216,7 +216,8 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
        shared_memory->system_properties.is_charging_joy_right.Assign(
            battery_level.right.is_charging);
        shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;
-        shared_memory->applet_footer_type = AppletFooterUiType::HandheldJoyConLeftJoyConRight;
+        shared_memory->applet_nfc_xcd.applet_footer.type =
+            AppletFooterUiType::HandheldJoyConLeftJoyConRight;
        shared_memory->sixaxis_handheld_properties.is_newly_assigned.Assign(1);
        break;
    case Core::HID::NpadStyleIndex::JoyconDual:
@@ -246,19 +247,19 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
        shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;

        if (controller.is_dual_left_connected && controller.is_dual_right_connected) {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDual;
+            shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDual;
            shared_memory->fullkey_color.fullkey = body_colors.left;
            shared_memory->battery_level_dual = battery_level.left.battery_level;
            shared_memory->system_properties.is_charging_joy_dual.Assign(
                battery_level.left.is_charging);
        } else if (controller.is_dual_left_connected) {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDualLeftOnly;
+            shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDualLeftOnly;
            shared_memory->fullkey_color.fullkey = body_colors.left;
            shared_memory->battery_level_dual = battery_level.left.battery_level;
            shared_memory->system_properties.is_charging_joy_dual.Assign(
                battery_level.left.is_charging);
        } else {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDualRightOnly;
+            shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDualRightOnly;
            shared_memory->fullkey_color.fullkey = body_colors.right;
            shared_memory->battery_level_dual = battery_level.right.battery_level;
            shared_memory->system_properties.is_charging_joy_dual.Assign(
@@ -277,7 +278,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
        shared_memory->system_properties.use_minus.Assign(1);
        shared_memory->system_properties.is_charging_joy_left.Assign(
            battery_level.left.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::JoyLeftHorizontal;
+        shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyLeftHorizontal;
        shared_memory->sixaxis_left_properties.is_newly_assigned.Assign(1);
        break;
    case Core::HID::NpadStyleIndex::JoyconRight:
@@ -292,7 +293,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
        shared_memory->system_properties.use_plus.Assign(1);
        shared_memory->system_properties.is_charging_joy_right.Assign(
            battery_level.right.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::JoyRightHorizontal;
+        shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyRightHorizontal;
        shared_memory->sixaxis_right_properties.is_newly_assigned.Assign(1);
        break;
    case Core::HID::NpadStyleIndex::GameCube:
@@ -313,12 +314,12 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
    case Core::HID::NpadStyleIndex::SNES:
        shared_memory->style_tag.lucia.Assign(1);
        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->applet_footer_type = AppletFooterUiType::Lucia;
+        shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::Lucia;
        break;
    case Core::HID::NpadStyleIndex::N64:
        shared_memory->style_tag.lagoon.Assign(1);
        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->applet_footer_type = AppletFooterUiType::Lagon;
+        shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::Lagon;
        break;
    case Core::HID::NpadStyleIndex::SegaGenesis:
        shared_memory->style_tag.lager.Assign(1);
@@ -418,17 +419,9 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) {
    std::scoped_lock lock{mutex};
    auto& controller = GetControllerFromNpadIdType(npad_id);
    const auto controller_type = controller.device->GetNpadStyleIndex();
-
-    if (!controller.device->IsConnected() && controller.is_connected) {
-        DisconnectNpad(npad_id);
-        return;
-    }
    if (!controller.device->IsConnected()) {
        return;
    }
-    if (controller.device->IsConnected() && !controller.is_connected) {
-        InitNewlyAddedController(npad_id);
-    }

    // This function is unique to yuzu for the turbo buttons and motion to work properly
    controller.device->StatusUpdate();
@@ -475,10 +468,6 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) {
        pad_entry.npad_buttons.l.Assign(button_state.zl);
        pad_entry.npad_buttons.r.Assign(button_state.zr);
    }
-
-    if (pad_entry.npad_buttons.raw != Core::HID::NpadButton::None) {
-        hid_core.SetLastActiveController(npad_id);
-    }
 }

 void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
@@ -747,6 +736,14 @@ void Controller_NPad::SetSupportedStyleSet(Core::HID::NpadStyleTag style_set) {

    // Once SetSupportedStyleSet is called controllers are fully initialized
    is_controller_initialized = true;
+
+    // Connect all active controllers
+    for (auto& controller : controller_data) {
+        const auto& device = controller.device;
+        if (device->IsConnected()) {
+            AddNewControllerAt(device->GetNpadStyleIndex(), device->GetNpadIdType());
+        }
+    }
 }

 Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const {
@@ -1119,7 +1116,7 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) {
        .left = {},
        .right = {},
    };
-    shared_memory->applet_footer_type = AppletFooterUiType::None;
+    shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::None;

    controller.is_dual_left_connected = true;
    controller.is_dual_right_connected = true;
@@ -1511,31 +1508,6 @@ Core::HID::NpadButton Controller_NPad::GetAndResetPressState() {
    return static_cast<Core::HID::NpadButton>(press_state.exchange(0));
 }

-void Controller_NPad::ApplyNpadSystemCommonPolicy() {
-    Core::HID::NpadStyleTag styletag{};
-    styletag.fullkey.Assign(1);
-    styletag.handheld.Assign(1);
-    styletag.joycon_dual.Assign(1);
-    styletag.system_ext.Assign(1);
-    styletag.system.Assign(1);
-    SetSupportedStyleSet(styletag);
-
-    SetNpadHandheldActivationMode(NpadHandheldActivationMode::Dual);
-
-    supported_npad_id_types.clear();
-    supported_npad_id_types.resize(10);
-    supported_npad_id_types[0] = Core::HID::NpadIdType::Player1;
-    supported_npad_id_types[1] = Core::HID::NpadIdType::Player2;
-    supported_npad_id_types[2] = Core::HID::NpadIdType::Player3;
-    supported_npad_id_types[3] = Core::HID::NpadIdType::Player4;
-    supported_npad_id_types[4] = Core::HID::NpadIdType::Player5;
-    supported_npad_id_types[5] = Core::HID::NpadIdType::Player6;
-    supported_npad_id_types[6] = Core::HID::NpadIdType::Player7;
-    supported_npad_id_types[7] = Core::HID::NpadIdType::Player8;
-    supported_npad_id_types[8] = Core::HID::NpadIdType::Other;
-    supported_npad_id_types[9] = Core::HID::NpadIdType::Handheld;
-}
-
 bool Controller_NPad::IsControllerSupported(Core::HID::NpadStyleIndex controller) const {
    if (controller == Core::HID::NpadStyleIndex::Handheld) {
        const bool support_handheld =
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -190,8 +190,6 @@ public:
    // Specifically for cheat engine and other features.
    Core::HID::NpadButton GetAndResetPressState();

-    void ApplyNpadSystemCommonPolicy();
-
    static bool IsNpadIdValid(Core::HID::NpadIdType npad_id);
    static Result IsDeviceHandleValid(const Core::HID::VibrationDeviceHandle& device_handle);
    static Result VerifyValidSixAxisSensorHandle(
@@ -362,7 +360,7 @@ private:
    enum class AppletFooterUiType : u8 {
        None = 0,
        HandheldNone = 1,
-        HandheldJoyConLeftOnly = 2,
+        HandheldJoyConLeftOnly = 1,
        HandheldJoyConRightOnly = 3,
        HandheldJoyConLeftJoyConRight = 4,
        JoyDual = 5,
@@ -384,6 +382,13 @@ private:
        Lagon = 21,
    };

+    struct AppletFooterUi {
+        AppletFooterUiAttributes attributes{};
+        AppletFooterUiType type{AppletFooterUiType::None};
+        INSERT_PADDING_BYTES(0x5B); // Reserved
+    };
+    static_assert(sizeof(AppletFooterUi) == 0x60, "AppletFooterUi is an invalid size");
+
    // This is nn::hid::NpadLarkType
    enum class NpadLarkType : u32 {
        Invalid,
@@ -414,6 +419,13 @@ private:
        U,
    };

+    struct AppletNfcXcd {
+        union {
+            AppletFooterUi applet_footer{};
+            Lifo<NfcXcdDeviceHandleStateImpl, 0x2> nfc_xcd_device_lifo;
+        };
+    };
+
    // This is nn::hid::detail::NpadInternalState
    struct NpadInternalState {
        Core::HID::NpadStyleTag style_tag{Core::HID::NpadStyleSet::None};
@@ -440,9 +452,7 @@ private:
        Core::HID::NpadBatteryLevel battery_level_dual{};
        Core::HID::NpadBatteryLevel battery_level_left{};
        Core::HID::NpadBatteryLevel battery_level_right{};
-        AppletFooterUiAttributes applet_footer_attributes{};
-        AppletFooterUiType applet_footer_type{AppletFooterUiType::None};
-        INSERT_PADDING_BYTES(0x5B); // Reserved
+        AppletNfcXcd applet_nfc_xcd{};
        INSERT_PADDING_BYTES(0x20); // Unknown
        Lifo<NpadGcTriggerState, hid_entry_count> gc_trigger_lifo{};
        NpadLarkType lark_type_l_and_main{};
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -231,10 +231,8 @@ std::shared_ptr<IAppletResource> Hid::GetAppletResource() {
    return applet_resource;
 }

-Hid::Hid(Core::System& system_, std::shared_ptr<IAppletResource> applet_resource_)
-    : ServiceFramework{system_, "hid"}, applet_resource{applet_resource_}, service_context{
-                                                                               system_,
-                                                                               service_name} {
+Hid::Hid(Core::System& system_)
+    : ServiceFramework{system_, "hid"}, service_context{system_, service_name} {
    // clang-format off
    static const FunctionInfo functions[] = {
        {0, &Hid::CreateAppletResource, "CreateAppletResource"},
@@ -2545,9 +2543,8 @@ public:

 class HidSys final : public ServiceFramework<HidSys> {
 public:
-    explicit HidSys(Core::System& system_, std::shared_ptr<IAppletResource> applet_resource_)
-        : ServiceFramework{system_, "hid:sys"}, service_context{system_, "hid:sys"},
-          applet_resource{applet_resource_} {
+    explicit HidSys(Core::System& system_)
+        : ServiceFramework{system_, "hid:sys"}, service_context{system_, "hid:sys"} {
        // clang-format off
        static const FunctionInfo functions[] = {
            {31, nullptr, "SendKeyboardLockKeyEvent"},
@@ -2759,12 +2756,9 @@ public:

 private:
    void ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) {
+        // We already do this for homebrew so we can just stub it out
        LOG_WARNING(Service_HID, "called");

-        GetAppletResource()
-            ->GetController<Controller_NPad>(HidController::NPad)
-            .ApplyNpadSystemCommonPolicy();
-
        IPC::ResponseBuilder rb{ctx, 2};
        rb.Push(ResultSuccess);
    }
@@ -2774,7 +2768,7 @@ private:

        IPC::ResponseBuilder rb{ctx, 3};
        rb.Push(ResultSuccess);
-        rb.PushEnum(system.HIDCore().GetLastActiveController());
+        rb.PushEnum(Core::HID::NpadIdType::Handheld);
    }

    void GetUniquePadsFromNpad(HLERequestContext& ctx) {
@@ -2827,28 +2821,17 @@ private:
        rb.PushRaw(touchscreen_config);
    }

-    std::shared_ptr<IAppletResource> GetAppletResource() {
-        if (applet_resource == nullptr) {
-            applet_resource = std::make_shared<IAppletResource>(system, service_context);
-        }
-
-        return applet_resource;
-    }
-
    Kernel::KEvent* joy_detach_event;
    KernelHelpers::ServiceContext service_context;
-    std::shared_ptr<IAppletResource> applet_resource;
 };

 void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);
-    std::shared_ptr<IAppletResource> applet_resource;

-    server_manager->RegisterNamedService("hid", std::make_shared<Hid>(system, applet_resource));
+    server_manager->RegisterNamedService("hid", std::make_shared<Hid>(system));
    server_manager->RegisterNamedService("hidbus", std::make_shared<HidBus>(system));
    server_manager->RegisterNamedService("hid:dbg", std::make_shared<HidDbg>(system));
-    server_manager->RegisterNamedService("hid:sys",
-                                         std::make_shared<HidSys>(system, applet_resource));
+    server_manager->RegisterNamedService("hid:sys", std::make_shared<HidSys>(system));

    server_manager->RegisterNamedService("irs", std::make_shared<Service::IRS::IRS>(system));
    server_manager->RegisterNamedService("irs:sys",
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -95,7 +95,7 @@ private:

 class Hid final : public ServiceFramework<Hid> {
 public:
-    explicit Hid(Core::System& system_, std::shared_ptr<IAppletResource> applet_resource_);
+    explicit Hid(Core::System& system_);
    ~Hid() override;

    std::shared_ptr<IAppletResource> GetAppletResource();
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -874,19 +874,17 @@ Result NfcDevice::RestoreAmiibo() {
 }

 Result NfcDevice::Format() {
-    Result result = ResultSuccess;
+    auto result1 = DeleteApplicationArea();
+    auto result2 = DeleteRegisterInfo();

-    if (device_state == DeviceState::TagFound) {
-        result = Mount(NFP::ModelType::Amiibo, NFP::MountTarget::All);
+    if (result1.IsError()) {
+        return result1;
    }

-    if (result.IsError()) {
-        return result;
+    if (result2.IsError()) {
+        return result2;
    }

-    DeleteApplicationArea();
-    DeleteRegisterInfo();
-
    return Flush();
 }

--- a/src/core/hle/service/ngc/ngc.cpp
+++ b/src/core/hle/service/ngc/ngc.cpp
@@ -1,150 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/string_util.h"
-#include "core/core.h"
-#include "core/hle/service/ipc_helpers.h"
-#include "core/hle/service/ngc/ngc.h"
-#include "core/hle/service/server_manager.h"
-#include "core/hle/service/service.h"
-
-namespace Service::NGC {
-
-class NgctServiceImpl final : public ServiceFramework<NgctServiceImpl> {
-public:
-    explicit NgctServiceImpl(Core::System& system_) : ServiceFramework{system_, "ngct:u"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &NgctServiceImpl::Match, "Match"},
-            {1, &NgctServiceImpl::Filter, "Filter"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void Match(HLERequestContext& ctx) {
-        const auto buffer = ctx.ReadBuffer();
-        const auto text = Common::StringFromFixedZeroTerminatedBuffer(
-            reinterpret_cast<const char*>(buffer.data()), buffer.size());
-
-        LOG_WARNING(Service_NGC, "(STUBBED) called, text={}", text);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        // Return false since we don't censor anything
-        rb.Push(false);
-    }
-
-    void Filter(HLERequestContext& ctx) {
-        const auto buffer = ctx.ReadBuffer();
-        const auto text = Common::StringFromFixedZeroTerminatedBuffer(
-            reinterpret_cast<const char*>(buffer.data()), buffer.size());
-
-        LOG_WARNING(Service_NGC, "(STUBBED) called, text={}", text);
-
-        // Return the same string since we don't censor anything
-        ctx.WriteBuffer(buffer);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-    }
-};
-
-class NgcServiceImpl final : public ServiceFramework<NgcServiceImpl> {
-public:
-    explicit NgcServiceImpl(Core::System& system_) : ServiceFramework(system_, "ngc:u") {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &NgcServiceImpl::GetContentVersion, "GetContentVersion"},
-            {1, &NgcServiceImpl::Check, "Check"},
-            {2, &NgcServiceImpl::Mask, "Mask"},
-            {3, &NgcServiceImpl::Reload, "Reload"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    static constexpr u32 NgcContentVersion = 1;
-
-    // This is nn::ngc::detail::ProfanityFilterOption
-    struct ProfanityFilterOption {
-        INSERT_PADDING_BYTES_NOINIT(0x20);
-    };
-    static_assert(sizeof(ProfanityFilterOption) == 0x20,
-                  "ProfanityFilterOption has incorrect size");
-
-    void GetContentVersion(HLERequestContext& ctx) {
-        LOG_INFO(Service_NGC, "(STUBBED) called");
-
-        // This calls nn::ngc::ProfanityFilter::GetContentVersion
-        const u32 version = NgcContentVersion;
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(version);
-    }
-
-    void Check(HLERequestContext& ctx) {
-        LOG_INFO(Service_NGC, "(STUBBED) called");
-
-        struct InputParameters {
-            u32 flags;
-            ProfanityFilterOption option;
-        };
-
-        IPC::RequestParser rp{ctx};
-        [[maybe_unused]] const auto params = rp.PopRaw<InputParameters>();
-        [[maybe_unused]] const auto input = ctx.ReadBuffer(0);
-
-        // This calls nn::ngc::ProfanityFilter::CheckProfanityWords
-        const u32 out_flags = 0;
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(out_flags);
-    }
-
-    void Mask(HLERequestContext& ctx) {
-        LOG_INFO(Service_NGC, "(STUBBED) called");
-
-        struct InputParameters {
-            u32 flags;
-            ProfanityFilterOption option;
-        };
-
-        IPC::RequestParser rp{ctx};
-        [[maybe_unused]] const auto params = rp.PopRaw<InputParameters>();
-        const auto input = ctx.ReadBuffer(0);
-
-        // This calls nn::ngc::ProfanityFilter::MaskProfanityWordsInText
-        const u32 out_flags = 0;
-        ctx.WriteBuffer(input);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(out_flags);
-    }
-
-    void Reload(HLERequestContext& ctx) {
-        LOG_INFO(Service_NGC, "(STUBBED) called");
-
-        // This reloads the database.
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-    }
-};
-
-void LoopProcess(Core::System& system) {
-    auto server_manager = std::make_unique<ServerManager>(system);
-
-    server_manager->RegisterNamedService("ngct:u", std::make_shared<NgctServiceImpl>(system));
-    server_manager->RegisterNamedService("ngc:u", std::make_shared<NgcServiceImpl>(system));
-    ServerManager::RunServer(std::move(server_manager));
-}
-
-} // namespace Service::NGC
--- a/src/core/hle/service/ngct/ngct.cpp
+++ b/src/core/hle/service/ngct/ngct.cpp
@@ -0,0 +1,62 @@
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/string_util.h"
+#include "core/core.h"
+#include "core/hle/service/ipc_helpers.h"
+#include "core/hle/service/ngct/ngct.h"
+#include "core/hle/service/server_manager.h"
+#include "core/hle/service/service.h"
+
+namespace Service::NGCT {
+
+class IService final : public ServiceFramework<IService> {
+public:
+    explicit IService(Core::System& system_) : ServiceFramework{system_, "ngct:u"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &IService::Match, "Match"},
+            {1, &IService::Filter, "Filter"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+private:
+    void Match(HLERequestContext& ctx) {
+        const auto buffer = ctx.ReadBuffer();
+        const auto text = Common::StringFromFixedZeroTerminatedBuffer(
+            reinterpret_cast<const char*>(buffer.data()), buffer.size());
+
+        LOG_WARNING(Service_NGCT, "(STUBBED) called, text={}", text);
+
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultSuccess);
+        // Return false since we don't censor anything
+        rb.Push(false);
+    }
+
+    void Filter(HLERequestContext& ctx) {
+        const auto buffer = ctx.ReadBuffer();
+        const auto text = Common::StringFromFixedZeroTerminatedBuffer(
+            reinterpret_cast<const char*>(buffer.data()), buffer.size());
+
+        LOG_WARNING(Service_NGCT, "(STUBBED) called, text={}", text);
+
+        // Return the same string since we don't censor anything
+        ctx.WriteBuffer(buffer);
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+};
+
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("ngct:u", std::make_shared<IService>(system));
+    ServerManager::RunServer(std::move(server_manager));
+}
+
+} // namespace Service::NGCT
--- a/src/core/hle/service/ngct/ngct.h
+++ b/src/core/hle/service/ngct/ngct.h
@@ -7,8 +7,8 @@ namespace Core {
 class System;
 }

-namespace Service::NGC {
+namespace Service::NGCT {

 void LoopProcess(Core::System& system);

-} // namespace Service::NGC
+} // namespace Service::NGCT
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -43,7 +43,7 @@
 #include "core/hle/service/ncm/ncm.h"
 #include "core/hle/service/nfc/nfc.h"
 #include "core/hle/service/nfp/nfp.h"
-#include "core/hle/service/ngc/ngc.h"
+#include "core/hle/service/ngct/ngct.h"
 #include "core/hle/service/nifm/nifm.h"
 #include "core/hle/service/nim/nim.h"
 #include "core/hle/service/npns/npns.h"
@@ -257,7 +257,7 @@ Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system
    kernel.RunOnGuestCoreProcess("NCM",        [&] { NCM::LoopProcess(system); });
    kernel.RunOnGuestCoreProcess("nfc",        [&] { NFC::LoopProcess(system); });
    kernel.RunOnGuestCoreProcess("nfp",        [&] { NFP::LoopProcess(system); });
-    kernel.RunOnGuestCoreProcess("ngc",        [&] { NGC::LoopProcess(system); });
+    kernel.RunOnGuestCoreProcess("ngct",       [&] { NGCT::LoopProcess(system); });
    kernel.RunOnGuestCoreProcess("nifm",       [&] { NIFM::LoopProcess(system); });
    kernel.RunOnGuestCoreProcess("nim",        [&] { NIM::LoopProcess(system); });
    kernel.RunOnGuestCoreProcess("npns",       [&] { NPNS::LoopProcess(system); });
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -170,7 +170,7 @@ void BSD::Socket(HLERequestContext& ctx) {
 }

 void BSD::Select(HLERequestContext& ctx) {
-    LOG_DEBUG(Service, "(STUBBED) called");
+    LOG_WARNING(Service, "(STUBBED) called");

    IPC::ResponseBuilder rb{ctx, 4};

--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -18,7 +18,7 @@ namespace Loader {

 AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys::VirtualFile file_,
                                                                         bool override_update_)
-    : AppLoader(std::move(file_)), override_update(override_update_), is_hbl(false) {
+    : AppLoader(std::move(file_)), override_update(override_update_) {
    const auto file_dir = file->GetContainingDirectory();

    // Title ID
@@ -69,9 +69,9 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys
 }

 AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(
-    FileSys::VirtualDir directory, bool override_update_, bool is_hbl_)
+    FileSys::VirtualDir directory, bool override_update_)
    : AppLoader(directory->GetFile("main")), dir(std::move(directory)),
-      override_update(override_update_), is_hbl(is_hbl_) {}
+      override_update(override_update_) {}

 FileType AppLoader_DeconstructedRomDirectory::IdentifyType(const FileSys::VirtualFile& dir_file) {
    if (FileSys::IsDirectoryExeFS(dir_file->GetContainingDirectory())) {
@@ -147,7 +147,7 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirect
    }

    // Setup the process code layout
-    if (process.LoadFromMetadata(metadata, code_size, is_hbl).IsError()) {
+    if (process.LoadFromMetadata(metadata, code_size).IsError()) {
        return {ResultStatus::ErrorUnableToParseKernelMetadata, {}};
    }

--- a/src/core/loader/deconstructed_rom_directory.h
+++ b/src/core/loader/deconstructed_rom_directory.h
@@ -27,8 +27,7 @@ public:

    // Overload to accept exefs directory. Must contain 'main' and 'main.npdm'
    explicit AppLoader_DeconstructedRomDirectory(FileSys::VirtualDir directory,
-                                                 bool override_update_ = false,
-                                                 bool is_hbl_ = false);
+                                                 bool override_update_ = false);

    /**
     * Identifies whether or not the given file is a deconstructed ROM directory.
@@ -63,7 +62,6 @@ private:
    std::string name;
    u64 title_id{};
    bool override_update;
-    bool is_hbl;

    Modules modules;
 };
--- a/src/core/loader/kip.cpp
+++ b/src/core/loader/kip.cpp
@@ -90,8 +90,7 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process,
    codeset.DataSegment().size += kip->GetBSSSize();

    // Setup the process code layout
-    if (process
-            .LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size(), false)
+    if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size())
            .IsError()) {
        return {ResultStatus::ErrorNotInitialized, {}};
    }
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -196,8 +196,7 @@ static bool LoadNroImpl(Kernel::KProcess& process, const std::vector<u8>& data)
    program_image.resize(static_cast<u32>(program_image.size()) + bss_size);

    // Setup the process code layout
-    if (process
-            .LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size(), false)
+    if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size())
            .IsError()) {
        return false;
    }
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -127,14 +127,13 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
    }

    // Apply patches if necessary
-    const auto name = nso_file.GetName();
-    if (pm && (pm->HasNSOPatch(nso_header.build_id, name) || Settings::values.dump_nso)) {
+    if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) {
        std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size());
        std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));
        std::memcpy(pi_header.data() + sizeof(NSOHeader), program_image.data(),
                    program_image.size());

-        pi_header = pm->PatchNSO(pi_header, name);
+        pi_header = pm->PatchNSO(pi_header, nso_file.GetName());

        std::copy(pi_header.begin() + sizeof(NSOHeader), pi_header.end(), program_image.data());
    }
--- a/src/core/loader/nsp.cpp
+++ b/src/core/loader/nsp.cpp
@@ -30,8 +30,7 @@ AppLoader_NSP::AppLoader_NSP(FileSys::VirtualFile file_,
    }

    if (nsp->IsExtractedType()) {
-        secondary_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(
-            nsp->GetExeFS(), false, file->GetName() == "hbl.nsp");
+        secondary_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(nsp->GetExeFS());
    } else {
        const auto control_nca =
            nsp->GetNCA(nsp->GetProgramTitleID(), FileSys::ContentRecordType::Control);
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -154,7 +154,7 @@ std::vector<CheatEntry> TextCheatParser::Parse(std::string_view data) const {
                return {};
            }

-            const auto value = static_cast<u32>(std::strtoul(hex.c_str(), nullptr, 0x10));
+            const auto value = static_cast<u32>(std::stoul(hex, nullptr, 0x10));
            out[*current_entry].definition.opcodes[out[*current_entry].definition.num_opcodes++] =
                value;

--- a/src/core/tools/renderdoc.cpp
+++ b/src/core/tools/renderdoc.cpp
@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <renderdoc_app.h>
-
-#include "common/assert.h"
-#include "common/dynamic_library.h"
-#include "core/tools/renderdoc.h"
-
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <dlfcn.h>
-#endif
-
-namespace Tools {
-
-RenderdocAPI::RenderdocAPI() {
-#ifdef WIN32
-    if (HMODULE mod = GetModuleHandleA("renderdoc.dll")) {
-        const auto RENDERDOC_GetAPI =
-            reinterpret_cast<pRENDERDOC_GetAPI>(GetProcAddress(mod, "RENDERDOC_GetAPI"));
-        const s32 ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_6_0, (void**)&rdoc_api);
-        ASSERT(ret == 1);
-    }
-#else
-#ifdef ANDROID
-    static constexpr const char RENDERDOC_LIB[] = "libVkLayer_GLES_RenderDoc.so";
-#else
-    static constexpr const char RENDERDOC_LIB[] = "librenderdoc.so";
-#endif
-    if (void* mod = dlopen(RENDERDOC_LIB, RTLD_NOW | RTLD_NOLOAD)) {
-        const auto RENDERDOC_GetAPI =
-            reinterpret_cast<pRENDERDOC_GetAPI>(dlsym(mod, "RENDERDOC_GetAPI"));
-        const s32 ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_6_0, (void**)&rdoc_api);
-        ASSERT(ret == 1);
-    }
-#endif
-}
-
-RenderdocAPI::~RenderdocAPI() = default;
-
-void RenderdocAPI::ToggleCapture() {
-    if (!rdoc_api) [[unlikely]] {
-        return;
-    }
-    if (!is_capturing) {
-        rdoc_api->StartFrameCapture(NULL, NULL);
-    } else {
-        rdoc_api->EndFrameCapture(NULL, NULL);
-    }
-    is_capturing = !is_capturing;
-}
-
-} // namespace Tools
--- a/src/core/tools/renderdoc.h
+++ b/src/core/tools/renderdoc.h
@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-struct RENDERDOC_API_1_6_0;
-
-namespace Tools {
-
-class RenderdocAPI {
-public:
-    explicit RenderdocAPI();
-    ~RenderdocAPI();
-
-    void ToggleCapture();
-
-private:
-    RENDERDOC_API_1_6_0* rdoc_api{};
-    bool is_capturing{false};
-};
-
-} // namespace Tools
--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
@@ -204,7 +204,9 @@ Id TextureImage(EmitContext& ctx, IR::TextureInstInfo info, const IR::Value& ind
        if (def.count > 1) {
            throw NotImplementedException("Indirect texture sample");
        }
-        return ctx.OpLoad(ctx.image_buffer_type, def.id);
+        const Id sampler_id{def.id};
+        const Id id{ctx.OpLoad(ctx.sampled_texture_buffer_type, sampler_id)};
+        return ctx.OpImage(ctx.image_buffer_type, id);
    } else {
        const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
        if (def.count > 1) {
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -1247,8 +1247,9 @@ void EmitContext::DefineTextureBuffers(const Info& info, u32& binding) {
    }
    const spv::ImageFormat format{spv::ImageFormat::Unknown};
    image_buffer_type = TypeImage(F32[1], spv::Dim::Buffer, 0U, false, false, 1, format);
+    sampled_texture_buffer_type = TypeSampledImage(image_buffer_type);

-    const Id type{TypePointer(spv::StorageClass::UniformConstant, image_buffer_type)};
+    const Id type{TypePointer(spv::StorageClass::UniformConstant, sampled_texture_buffer_type)};
    texture_buffers.reserve(info.texture_buffer_descriptors.size());
    for (const TextureBufferDescriptor& desc : info.texture_buffer_descriptors) {
        if (desc.count != 1) {
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -206,6 +206,7 @@ public:
    Id output_u32{};

    Id image_buffer_type{};
+    Id sampled_texture_buffer_type{};
    Id image_u32{};

    std::array<UniformDefinitions, Info::MAX_CBUFS> cbufs{};
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -719,7 +719,6 @@ typename P::ImageView* TextureCache<P>::TryFindFramebufferImageView(VAddr cpu_ad
        return nullptr;
    }
    const auto& image_map_ids = it->second;
-    boost::container::small_vector<const ImageBase*, 4> valid_images;
    for (const ImageMapId map_id : image_map_ids) {
        const ImageMapView& map = slot_map_views[map_id];
        const ImageBase& image = slot_images[map.image_id];
@@ -729,20 +728,8 @@ typename P::ImageView* TextureCache<P>::TryFindFramebufferImageView(VAddr cpu_ad
        if (image.image_view_ids.empty()) {
            continue;
        }
-        valid_images.push_back(&image);
+        return &slot_image_views[image.image_view_ids.at(0)];
    }
-
-    if (valid_images.size() == 1) [[likely]] {
-        return &slot_image_views[valid_images[0]->image_view_ids.at(0)];
-    }
-
-    if (valid_images.size() > 0) [[unlikely]] {
-        std::ranges::sort(valid_images, [](const auto* a, const auto* b) {
-            return a->modification_tick > b->modification_tick;
-        });
-        return &slot_image_views[valid_images[0]->image_view_ids.at(0)];
-    }
-
    return nullptr;
 }

--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -59,8 +59,6 @@ void ConfigureDebug::SetConfiguration() {
    ui->use_debug_asserts->setChecked(Settings::values.use_debug_asserts.GetValue());
    ui->use_auto_stub->setChecked(Settings::values.use_auto_stub.GetValue());
    ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue());
-    ui->enable_renderdoc_hotkey->setEnabled(runtime_lock);
-    ui->enable_renderdoc_hotkey->setChecked(Settings::values.enable_renderdoc_hotkey.GetValue());
    ui->enable_graphics_debugging->setEnabled(runtime_lock);
    ui->enable_graphics_debugging->setChecked(Settings::values.renderer_debug.GetValue());
    ui->enable_shader_feedback->setEnabled(runtime_lock);
@@ -113,7 +111,6 @@ void ConfigureDebug::ApplyConfiguration() {
    Settings::values.use_auto_stub = ui->use_auto_stub->isChecked();
    Settings::values.enable_all_controllers = ui->enable_all_controllers->isChecked();
    Settings::values.renderer_debug = ui->enable_graphics_debugging->isChecked();
-    Settings::values.enable_renderdoc_hotkey = ui->enable_renderdoc_hotkey->isChecked();
    Settings::values.renderer_shader_feedback = ui->enable_shader_feedback->isChecked();
    Settings::values.cpu_debug_mode = ui->enable_cpu_debugging->isChecked();
    Settings::values.enable_nsight_aftermath = ui->enable_nsight_aftermath->isChecked();
--- a/src/yuzu/configuration/configure_debug.ui
+++ b/src/yuzu/configuration/configure_debug.ui
@@ -18,8 +18,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-     <width>842</width>
-     <height>741</height>
+     <width>829</width>
+     <height>758</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_1">
@@ -260,7 +260,7 @@
         <string>Graphics</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="4" column="0">
+         <item row="3" column="0">
          <widget class="QCheckBox" name="disable_loop_safety_checks">
           <property name="toolTip">
            <string>When checked, it executes shaders without loop logic changes</string>
@@ -270,7 +270,20 @@
           </property>
          </widget>
         </item>
-         <item row="8" column="0">
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="dump_shaders">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="toolTip">
+            <string>When checked, it will dump all the original assembler shaders from the disk shader cache or game as found</string>
+           </property>
+           <property name="text">
+            <string>Dump Game Shaders</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
          <widget class="QCheckBox" name="disable_macro_hle">
           <property name="enabled">
            <bool>true</bool>
@@ -283,40 +296,7 @@
           </property>
          </widget>
         </item>
-         <item row="7" column="0">
-          <widget class="QCheckBox" name="dump_macros">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="toolTip">
-            <string>When checked, it will dump all the macro programs of the GPU</string>
-           </property>
-           <property name="text">
-            <string>Dump Maxwell Macros</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="enable_nsight_aftermath">
-           <property name="toolTip">
-            <string>When checked, it enables Nsight Aftermath crash dumps</string>
-           </property>
-           <property name="text">
-            <string>Enable Nsight Aftermath</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="enable_shader_feedback">
-           <property name="toolTip">
-            <string>When checked, yuzu will log statistics about the compiled pipeline cache</string>
-           </property>
-           <property name="text">
-            <string>Enable Shader Feedback</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
+         <item row="5" column="0">
          <widget class="QCheckBox" name="disable_macro_jit">
           <property name="enabled">
            <bool>true</bool>
@@ -329,22 +309,6 @@
           </property>
          </widget>
         </item>
-         <item row="9" column="0">
-          <spacer name="verticalSpacer_5">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         <item row="0" column="0">
          <widget class="QCheckBox" name="enable_graphics_debugging">
           <property name="enabled">
@@ -358,26 +322,55 @@
           </property>
          </widget>
         </item>
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="dump_shaders">
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="dump_macros">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="toolTip">
-            <string>When checked, it will dump all the original assembler shaders from the disk shader cache or game as found</string>
+            <string>When checked, it will dump all the macro programs of the GPU</string>
           </property>
           <property name="text">
-            <string>Dump Game Shaders</string>
+            <string>Dump Maxwell Macros</string>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
-          <widget class="QCheckBox" name="enable_renderdoc_hotkey">
+          <widget class="QCheckBox" name="enable_shader_feedback">
+           <property name="toolTip">
+            <string>When checked, yuzu will log statistics about the compiled pipeline cache</string>
+           </property>
           <property name="text">
-            <string>Enable Renderdoc Hotkey</string>
+            <string>Enable Shader Feedback</string>
           </property>
          </widget>
         </item>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="enable_nsight_aftermath">
+           <property name="toolTip">
+            <string>When checked, it enables Nsight Aftermath crash dumps</string>
+           </property>
+           <property name="text">
+            <string>Enable Nsight Aftermath</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <spacer name="verticalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Preferred</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
        </layout>
       </widget>
      </item>
--- a/src/yuzu/configuration/configure_ui.cpp
+++ b/src/yuzu/configuration/configure_ui.cpp
@@ -4,7 +4,6 @@
 #include "yuzu/configuration/configure_ui.h"

 #include <array>
-#include <cstdlib>
 #include <set>
 #include <stdexcept>
 #include <string>
@@ -95,7 +94,11 @@ static void PopulateResolutionComboBox(QComboBox* screenshot_height, QWidget* pa
 }

 static u32 ScreenshotDimensionToInt(const QString& height) {
-    return std::strtoul(height.toUtf8(), nullptr, 0);
+    try {
+        return std::stoi(height.toStdString());
+    } catch (std::invalid_argument&) {
+        return 0;
+    }
 }

 ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -63,7 +63,7 @@ static QString DefaultSuffix(QWidget* parent, Settings::BasicSetting& setting) {
        return tr("%", context.c_str());
    }

-    return default_suffix;
+    return QStringLiteral("");
 }

 QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) {
@@ -71,7 +71,7 @@ QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* paren

    QStyle* style = parent->style();
    QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_LineEditClearButton));
-    QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(), parent);
+    QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(""), parent);
    restore_button->setObjectName(QStringLiteral("RestoreButton%1").arg(restore_button_count));
    restore_button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);

@@ -151,7 +151,7 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
        return -1;
    };

-    const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
+    const u32 setting_value = std::stoi(setting.ToString());
    combobox->setCurrentIndex(find_index(setting_value));

    serializer = [this, enumeration]() {
@@ -160,7 +160,7 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
    };

    restore_func = [this, find_index]() {
-        const u32 global_value = std::strtoul(RelevantDefault(setting).c_str(), nullptr, 0);
+        const u32 global_value = std::stoi(RelevantDefault(setting));
        combobox->setCurrentIndex(find_index(global_value));
    };

@@ -209,7 +209,7 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
        }
    };

-    const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
+    const u32 setting_value = std::stoi(setting.ToString());
    set_index(setting_value);

    serializer = [get_selected]() {
@@ -218,7 +218,7 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
    };

    restore_func = [this, set_index]() {
-        const u32 global_value = std::strtoul(RelevantDefault(setting).c_str(), nullptr, 0);
+        const u32 global_value = std::stoi(RelevantDefault(setting));
        set_index(global_value);
    };

@@ -255,59 +255,6 @@ QWidget* Widget::CreateLineEdit(std::function<std::string()>& serializer,
    return line_edit;
 }

-static void CreateIntSlider(Settings::BasicSetting& setting, bool reversed, float multiplier,
-                            QLabel* feedback, const QString& use_format, QSlider* slider,
-                            std::function<std::string()>& serializer,
-                            std::function<void()>& restore_func) {
-    const int max_val = std::strtol(setting.MaxVal().c_str(), nullptr, 0);
-
-    const auto update_feedback = [=](int value) {
-        int present = (reversed ? max_val - value : value) * multiplier + 0.5f;
-        feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
-    };
-
-    QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback);
-    update_feedback(std::strtol(setting.ToString().c_str(), nullptr, 0));
-
-    slider->setMinimum(std::strtol(setting.MinVal().c_str(), nullptr, 0));
-    slider->setMaximum(max_val);
-    slider->setValue(std::strtol(setting.ToString().c_str(), nullptr, 0));
-
-    serializer = [slider]() { return std::to_string(slider->value()); };
-    restore_func = [slider, &setting]() {
-        slider->setValue(std::strtol(RelevantDefault(setting).c_str(), nullptr, 0));
-    };
-}
-
-static void CreateFloatSlider(Settings::BasicSetting& setting, bool reversed, float multiplier,
-                              QLabel* feedback, const QString& use_format, QSlider* slider,
-                              std::function<std::string()>& serializer,
-                              std::function<void()>& restore_func) {
-    const float max_val = std::strtof(setting.MaxVal().c_str(), nullptr);
-    const float min_val = std::strtof(setting.MinVal().c_str(), nullptr);
-    const float use_multiplier =
-        multiplier == default_multiplier ? default_float_multiplier : multiplier;
-
-    const auto update_feedback = [=](float value) {
-        int present = (reversed ? max_val - value : value) + 0.5f;
-        feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
-    };
-
-    QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback);
-    update_feedback(std::strtof(setting.ToString().c_str(), nullptr));
-
-    slider->setMinimum(min_val * use_multiplier);
-    slider->setMaximum(max_val * use_multiplier);
-    slider->setValue(std::strtof(setting.ToString().c_str(), nullptr) * use_multiplier);
-
-    serializer = [slider, use_multiplier]() {
-        return std::to_string(slider->value() / use_multiplier);
-    };
-    restore_func = [slider, &setting, use_multiplier]() {
-        slider->setValue(std::strtof(RelevantDefault(setting).c_str(), nullptr) * use_multiplier);
-    };
-}
-
 QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& given_suffix,
                              std::function<std::string()>& serializer,
                              std::function<void()>& restore_func,
@@ -331,19 +278,27 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& gi

    layout->setContentsMargins(0, 0, 0, 0);

-    QString suffix = given_suffix == default_suffix ? DefaultSuffix(this, setting) : given_suffix;
+    int max_val = std::stoi(setting.MaxVal());
+
+    QString suffix =
+        given_suffix == QStringLiteral("") ? DefaultSuffix(this, setting) : given_suffix;

    const QString use_format = QStringLiteral("%1").append(suffix);

-    if (setting.IsIntegral()) {
-        CreateIntSlider(setting, reversed, multiplier, feedback, use_format, slider, serializer,
-                        restore_func);
-    } else {
-        CreateFloatSlider(setting, reversed, multiplier, feedback, use_format, slider, serializer,
-                          restore_func);
-    }
+    QObject::connect(slider, &QAbstractSlider::valueChanged, [=](int value) {
+        int present = (reversed ? max_val - value : value) * multiplier + 0.5f;
+        feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
+    });
+
+    slider->setMinimum(std::stoi(setting.MinVal()));
+    slider->setMaximum(max_val);
+    slider->setValue(std::stoi(setting.ToString()));

    slider->setInvertedAppearance(reversed);
+    slider->setInvertedControls(reversed);
+
+    serializer = [this]() { return std::to_string(slider->value()); };
+    restore_func = [this]() { slider->setValue(std::stoi(RelevantDefault(setting))); };

    if (!Settings::IsConfiguringGlobal()) {
        QObject::connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); });
@@ -356,11 +311,14 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix,
                               std::function<std::string()>& serializer,
                               std::function<void()>& restore_func,
                               const std::function<void()>& touch) {
-    const auto min_val = std::strtol(setting.MinVal().c_str(), nullptr, 0);
-    const auto max_val = std::strtol(setting.MaxVal().c_str(), nullptr, 0);
-    const auto default_val = std::strtol(setting.ToString().c_str(), nullptr, 0);
+    const int min_val =
+        setting.Ranged() ? std::stoi(setting.MinVal()) : std::numeric_limits<int>::min();
+    const int max_val =
+        setting.Ranged() ? std::stoi(setting.MaxVal()) : std::numeric_limits<int>::max();
+    const int default_val = std::stoi(setting.ToString());

-    QString suffix = given_suffix == default_suffix ? DefaultSuffix(this, setting) : given_suffix;
+    QString suffix =
+        given_suffix == QStringLiteral("") ? DefaultSuffix(this, setting) : given_suffix;

    spinbox = new QSpinBox(this);
    spinbox->setRange(min_val, max_val);
@@ -371,13 +329,13 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix,
    serializer = [this]() { return std::to_string(spinbox->value()); };

    restore_func = [this]() {
-        auto value{std::strtol(RelevantDefault(setting).c_str(), nullptr, 0)};
+        auto value{std::stol(RelevantDefault(setting))};
        spinbox->setValue(value);
    };

    if (!Settings::IsConfiguringGlobal()) {
        QObject::connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this, touch]() {
-            if (spinbox->value() != std::strtol(setting.ToStringGlobal().c_str(), nullptr, 0)) {
+            if (spinbox->value() != std::stoi(setting.ToStringGlobal())) {
                touch();
            }
        });
@@ -386,42 +344,6 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix,
    return spinbox;
 }

-QWidget* Widget::CreateDoubleSpinBox(const QString& given_suffix,
-                                     std::function<std::string()>& serializer,
-                                     std::function<void()>& restore_func,
-                                     const std::function<void()>& touch) {
-    const auto min_val = std::strtod(setting.MinVal().c_str(), nullptr);
-    const auto max_val = std::strtod(setting.MaxVal().c_str(), nullptr);
-    const auto default_val = std::strtod(setting.ToString().c_str(), nullptr);
-
-    QString suffix = given_suffix == default_suffix ? DefaultSuffix(this, setting) : given_suffix;
-
-    double_spinbox = new QDoubleSpinBox(this);
-    double_spinbox->setRange(min_val, max_val);
-    double_spinbox->setValue(default_val);
-    double_spinbox->setSuffix(suffix);
-    double_spinbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
-    serializer = [this]() { return fmt::format("{:f}", double_spinbox->value()); };
-
-    restore_func = [this]() {
-        auto value{std::strtod(RelevantDefault(setting).c_str(), nullptr)};
-        double_spinbox->setValue(value);
-    };
-
-    if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(double_spinbox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-                         [this, touch]() {
-                             if (double_spinbox->value() !=
-                                 std::strtod(setting.ToStringGlobal().c_str(), nullptr)) {
-                                 touch();
-                             }
-                         });
-    }
-
-    return double_spinbox;
-}
-
 QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
                               std::function<void()>& restore_func,
                               const std::function<void()>& touch) {
@@ -431,8 +353,7 @@ QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
    }

    auto to_hex = [=](const std::string& input) {
-        return QString::fromStdString(
-            fmt::format("{:08x}", std::strtoul(input.c_str(), nullptr, 0)));
+        return QString::fromStdString(fmt::format("{:08x}", std::stoul(input)));
    };

    QRegularExpressionValidator* regex = new QRegularExpressionValidator(
@@ -445,7 +366,7 @@ QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
    line_edit->setValidator(regex);

    auto hex_to_dec = [this]() -> std::string {
-        return std::to_string(std::strtoul(line_edit->text().toStdString().c_str(), nullptr, 16));
+        return std::to_string(std::stoul(line_edit->text().toStdString(), nullptr, 16));
    };

    serializer = [hex_to_dec]() { return hex_to_dec(); };
@@ -465,8 +386,7 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
                                    std::function<void()>& restore_func,
                                    const std::function<void()>& touch) {
    const long long current_time = QDateTime::currentSecsSinceEpoch();
-    const s64 the_time =
-        disabled ? current_time : std::strtoll(setting.ToString().c_str(), nullptr, 0);
+    const s64 the_time = disabled ? current_time : std::stoll(setting.ToString());
    const auto default_val = QDateTime::fromSecsSinceEpoch(the_time);

    date_time_edit = new QDateTimeEdit(this);
@@ -479,7 +399,7 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
    auto get_clear_val = [this, restrict, current_time]() {
        return QDateTime::fromSecsSinceEpoch([this, restrict, current_time]() {
            if (restrict && checkbox->checkState() == Qt::Checked) {
-                return std::strtoll(RelevantDefault(setting).c_str(), nullptr, 0);
+                return std::stoll(RelevantDefault(setting));
            }
            return current_time;
        }());
@@ -586,7 +506,8 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
        } else {
            data_component = CreateCombobox(serializer, restore_func, touch);
        }
-    } else if (setting.IsIntegral()) {
+    } else if (type == typeid(u32) || type == typeid(int) || type == typeid(u16) ||
+               type == typeid(s64) || type == typeid(u8)) {
        switch (request) {
        case RequestType::Slider:
        case RequestType::ReverseSlider:
@@ -613,20 +534,6 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
        default:
            UNIMPLEMENTED();
        }
-    } else if (setting.IsFloatingPoint()) {
-        switch (request) {
-        case RequestType::Default:
-        case RequestType::SpinBox:
-            data_component = CreateDoubleSpinBox(suffix, serializer, restore_func, touch);
-            break;
-        case RequestType::Slider:
-        case RequestType::ReverseSlider:
-            data_component = CreateSlider(request == RequestType::ReverseSlider, multiplier, suffix,
-                                          serializer, restore_func, touch);
-            break;
-        default:
-            UNIMPLEMENTED();
-        }
    } else if (type == typeid(std::string)) {
        switch (request) {
        case RequestType::Default:
@@ -731,10 +638,10 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
            return std::pair{translations.at(id).first, translations.at(id).second};
        }
        LOG_WARNING(Frontend, "Translation table lacks entry for \"{}\"", setting_label);
-        return std::pair{QString::fromStdString(setting_label), QStringLiteral()};
+        return std::pair{QString::fromStdString(setting_label), QStringLiteral("")};
    }();

-    if (label == QStringLiteral()) {
+    if (label == QStringLiteral("")) {
        LOG_DEBUG(Frontend, "Translation table has empty entry for \"{}\", skipping...",
                  setting.GetLabel());
        return;
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -22,7 +22,6 @@ class QObject;
 class QPushButton;
 class QSlider;
 class QSpinBox;
-class QDoubleSpinBox;
 class QRadioButton;

 namespace Settings {
@@ -44,10 +43,6 @@ enum class RequestType {
    MaxEnum,
 };

-constexpr float default_multiplier{1.f};
-constexpr float default_float_multiplier{100.f};
-static const QString default_suffix = QStringLiteral();
-
 class Widget : public QWidget {
    Q_OBJECT

@@ -71,9 +66,8 @@ public:
                    const ComboboxTranslationMap& combobox_translations, QWidget* parent,
                    bool runtime_lock, std::vector<std::function<void(bool)>>& apply_funcs_,
                    RequestType request = RequestType::Default, bool managed = true,
-                    float multiplier = default_multiplier,
-                    Settings::BasicSetting* other_setting = nullptr,
-                    const QString& suffix = default_suffix);
+                    float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
+                    const QString& suffix = QStringLiteral(""));
    virtual ~Widget();

    /**
@@ -95,7 +89,6 @@ public:
    QPushButton* restore_button{}; ///< Restore button for custom configurations
    QLineEdit* line_edit{};        ///< QLineEdit, used for LineEdit and HexEdit
    QSpinBox* spinbox{};
-    QDoubleSpinBox* double_spinbox{};
    QCheckBox* checkbox{};
    QSlider* slider{};
    QComboBox* combobox{};
@@ -133,9 +126,6 @@ private:
                                const std::function<void()>& touch);
    QWidget* CreateSpinBox(const QString& suffix, std::function<std::string()>& serializer,
                           std::function<void()>& restore_func, const std::function<void()>& touch);
-    QWidget* CreateDoubleSpinBox(const QString& suffix, std::function<std::string()>& serializer,
-                                 std::function<void()>& restore_func,
-                                 const std::function<void()>& touch);

    QWidget* parent;
    const TranslationMap& translations;
@@ -155,15 +145,14 @@ public:
    Widget* BuildWidget(Settings::BasicSetting* setting,
                        std::vector<std::function<void(bool)>>& apply_funcs,
                        RequestType request = RequestType::Default, bool managed = true,
-                        float multiplier = default_multiplier,
-                        Settings::BasicSetting* other_setting = nullptr,
-                        const QString& suffix = default_suffix) const;
+                        float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
+                        const QString& suffix = QStringLiteral("")) const;

    Widget* BuildWidget(Settings::BasicSetting* setting,
                        std::vector<std::function<void(bool)>>& apply_funcs,
                        Settings::BasicSetting* other_setting,
                        RequestType request = RequestType::Default,
-                        const QString& suffix = default_suffix) const;
+                        const QString& suffix = QStringLiteral("")) const;

    const ComboboxTranslationMap& ComboboxTranslations() const;

--- a/src/yuzu/hotkeys.h
+++ b/src/yuzu/hotkeys.h
@@ -4,12 +4,10 @@
 #pragma once

 #include <map>
-#include <QKeySequence>
-#include <QString>
-#include <QWidget>
 #include "core/hid/hid_types.h"

 class QDialog;
+class QKeySequence;
 class QSettings;
 class QShortcut;
 class ControllerShortcut;
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -9,7 +9,6 @@
 #include <memory>
 #include <thread>
 #include "core/loader/nca.h"
-#include "core/tools/renderdoc.h"
 #ifdef __APPLE__
 #include <unistd.h> // for chdir
 #endif
@@ -1349,11 +1348,6 @@ void GMainWindow::InitializeHotkeys() {
    connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] {
        Settings::values.use_speed_limit.SetValue(!Settings::values.use_speed_limit.GetValue());
    });
-    connect_shortcut(QStringLiteral("Toggle Renderdoc Capture"), [this] {
-        if (Settings::values.enable_renderdoc_hotkey) {
-            system->GetRenderdocAPI().ToggleCapture();
-        }
-    });
    connect_shortcut(QStringLiteral("Toggle Mouse Panning"), [&] {
        if (Settings::values.mouse_enabled) {
            Settings::values.mouse_panning = false;
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -259,7 +259,7 @@ void Config::ReadValues() {
    std::stringstream ss(title_list);
    std::string line;
    while (std::getline(ss, line, '|')) {
-        const auto title_id = std::strtoul(line.c_str(), nullptr, 16);
+        const auto title_id = std::stoul(line, nullptr, 16);
        const auto disabled_list = sdl2_config->Get("AddOns", "disabled_" + line, "");

        std::stringstream inner_ss(disabled_list);
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -264,9 +264,8 @@ int main(int argc, char** argv) {
                nickname = match[1];
                password = match[2];
                address = match[3];
-                if (!match[4].str().empty()) {
-                    port = static_cast<u16>(std::strtoul(match[4].str().c_str(), nullptr, 0));
-                }
+                if (!match[4].str().empty())
+                    port = static_cast<u16>(std::stoi(match[4]));
                std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$");
                if (!std::regex_match(nickname, nickname_re)) {
                    std::cout