Android #174

Merge PR 12487
Merge PR 12479
2023-12-28 00:57:01 +00:00 · 2023-12-28 00:57:01 +00:00 · 2023-12-28 00:57:01 +00:00 · 2023-12-28 00:57:01 +00:00
67 changed files with 1186 additions and 1871 deletions
--- a/.ci/scripts/android/build.sh
+++ b/.ci/scripts/android/build.sh
@ -6,12 +6,7 @@
 export NDK_CCACHE="$(which ccache)"
 ccache -s

-BUILD_FLAVOR="mainline"
-
-BUILD_TYPE="release"
-if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
-    BUILD_TYPE="relWithDebInfo"
-fi
+BUILD_FLAVOR=mainline

 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
@ -20,7 +15,7 @@ fi

 cd src/android
 chmod +x ./gradlew
-./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
+./gradlew "assemble${BUILD_FLAVOR}Release" "bundle${BUILD_FLAVOR}Release"

 ccache -s

--- a/.ci/scripts/android/upload.sh
+++ b/.ci/scripts/android/upload.sh
@ -7,16 +7,9 @@

 REV_NAME="yuzu-${GITDATE}-${GITREV}"

-BUILD_FLAVOR="mainline"
+BUILD_FLAVOR=mainline

-BUILD_TYPE_LOWER="release"
-BUILD_TYPE_UPPER="Release"
-if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
-    BUILD_TYPE_LOWER="relWithDebInfo"
-    BUILD_TYPE_UPPER="RelWithDebInfo"
-fi
-
-cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
+cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR}-release.apk" \
  "artifacts/${REV_NAME}.apk"
-cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
+cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}Release"/"app-${BUILD_FLAVOR}-release.aab" \
  "artifacts/${REV_NAME}.aab"
--- a/README.md
+++ b/README.md
@ -1,10 +1,8 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12454](https://github.com/yuzu-emu/yuzu//pull/12454) | [`3a4e7d45f`](https://github.com/yuzu-emu/yuzu//pull/12454/files) |  core_timing: minor refactors | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [12466](https://github.com/yuzu-emu/yuzu//pull/12466) | [`adb2af0a2`](https://github.com/yuzu-emu/yuzu//pull/12466/files) |  core: track separate heap allocation for linux  | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12501](https://github.com/yuzu-emu/yuzu//pull/12501) | [`d1c99c5d5`](https://github.com/yuzu-emu/yuzu//pull/12501/files) | ips_layer: prevent out of bounds access with offset exceeding module size | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12513](https://github.com/yuzu-emu/yuzu//pull/12513) | [`558192abf`](https://github.com/yuzu-emu/yuzu//pull/12513/files) | jit: use code memory handles correctly | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12518](https://github.com/yuzu-emu/yuzu//pull/12518) | [`aa4d15594`](https://github.com/yuzu-emu/yuzu//pull/12518/files) | android: Migrate remaining settings to ini | [t895](https://github.com/t895/) | Yes |
+| [12479](https://github.com/yuzu-emu/yuzu//pull/12479) | [`20e040723`](https://github.com/yuzu-emu/yuzu//pull/12479/files) | video_core: Fix buffer_row_length for linear compressed textures | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [12487](https://github.com/yuzu-emu/yuzu//pull/12487) | [`d0c60605a`](https://github.com/yuzu-emu/yuzu//pull/12487/files) | shader_recompiler: use default value for clip distances array | [liamwhite](https://github.com/liamwhite/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@ -10,7 +10,7 @@ plugins {
    id("com.android.application")
    id("org.jetbrains.kotlin.android")
    id("kotlin-parcelize")
-    kotlin("plugin.serialization") version "1.9.20"
+    kotlin("plugin.serialization") version "1.8.21"
    id("androidx.navigation.safeargs.kotlin")
    id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
 }
--- 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
@ -49,7 +49,6 @@ import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.NfcReader
 import org.yuzu.yuzu_emu.utils.ThemeHelper
 import java.text.NumberFormat
@ -171,11 +170,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        stopMotionSensorListener()
    }

-    override fun onStop() {
-        super.onStop()
-        NativeConfig.saveGlobalConfig()
-    }
-
    override fun onUserLeaveHint() {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
            if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
--- 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
@ -18,14 +18,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_REACTIVE_FLUSHING("use_reactive_flushing"),
    RENDERER_DEBUG("debug"),
    PICTURE_IN_PICTURE("picture_in_picture"),
-    USE_CUSTOM_RTC("custom_rtc_enabled"),
-    BLACK_BACKGROUNDS("black_backgrounds"),
-    JOYSTICK_REL_CENTER("joystick_rel_center"),
-    DPAD_SLIDE("dpad_slide"),
-    HAPTIC_FEEDBACK("haptic_feedback"),
-    SHOW_PERFORMANCE_OVERLAY("show_performance_overlay"),
-    SHOW_INPUT_OVERLAY("show_input_overlay"),
-    TOUCHSCREEN("touchscreen");
+    USE_CUSTOM_RTC("custom_rtc_enabled");

    override fun getBoolean(needsGlobal: Boolean): Boolean =
        NativeConfig.getBoolean(key, needsGlobal)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
@ -18,12 +18,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
    RENDERER_ANTI_ALIASING("anti_aliasing"),
    RENDERER_SCREEN_LAYOUT("screen_layout"),
    RENDERER_ASPECT_RATIO("aspect_ratio"),
-    AUDIO_OUTPUT_ENGINE("output_engine"),
-    MAX_ANISOTROPY("max_anisotropy"),
-    THEME("theme"),
-    THEME_MODE("theme_mode"),
-    OVERLAY_SCALE("control_scale"),
-    OVERLAY_OPACITY("control_opacity");
+    AUDIO_OUTPUT_ENGINE("output_engine");

    override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)

--- 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
@ -15,10 +15,18 @@ object Settings {
        SECTION_DEBUG(R.string.preferences_debug);
    }

-    const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
    const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"

-    // Deprecated input overlay preference keys
+    const val PREF_OVERLAY_VERSION = "OverlayVersion"
+    const val PREF_LANDSCAPE_OVERLAY_VERSION = "LandscapeOverlayVersion"
+    const val PREF_PORTRAIT_OVERLAY_VERSION = "PortraitOverlayVersion"
+    const val PREF_FOLDABLE_OVERLAY_VERSION = "FoldableOverlayVersion"
+    val overlayLayoutPrefs = listOf(
+        PREF_LANDSCAPE_OVERLAY_VERSION,
+        PREF_PORTRAIT_OVERLAY_VERSION,
+        PREF_FOLDABLE_OVERLAY_VERSION
+    )
+
    const val PREF_CONTROL_SCALE = "controlScale"
    const val PREF_CONTROL_OPACITY = "controlOpacity"
    const val PREF_TOUCH_ENABLED = "isTouchEnabled"
@ -39,12 +47,23 @@ object Settings {
    const val PREF_BUTTON_STICK_R = "buttonToggle14"
    const val PREF_BUTTON_HOME = "buttonToggle15"
    const val PREF_BUTTON_SCREENSHOT = "buttonToggle16"
+
    const val PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER = "EmulationMenuSettings_JoystickRelCenter"
    const val PREF_MENU_SETTINGS_DPAD_SLIDE = "EmulationMenuSettings_DpadSlideEnable"
    const val PREF_MENU_SETTINGS_HAPTICS = "EmulationMenuSettings_Haptics"
    const val PREF_MENU_SETTINGS_SHOW_FPS = "EmulationMenuSettings_ShowFps"
    const val PREF_MENU_SETTINGS_SHOW_OVERLAY = "EmulationMenuSettings_ShowOverlay"
+
+    const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
+    const val PREF_THEME = "Theme"
+    const val PREF_THEME_MODE = "ThemeMode"
+    const val PREF_BLACK_BACKGROUNDS = "BlackBackgrounds"
+
    val overlayPreferences = listOf(
+        PREF_OVERLAY_VERSION,
+        PREF_CONTROL_SCALE,
+        PREF_CONTROL_OPACITY,
+        PREF_TOUCH_ENABLED,
        PREF_BUTTON_A,
        PREF_BUTTON_B,
        PREF_BUTTON_X,
@ -64,21 +83,6 @@ object Settings {
        PREF_BUTTON_STICK_R
    )

-    // Deprecated layout preference keys
-    const val PREF_LANDSCAPE_SUFFIX = "_Landscape"
-    const val PREF_PORTRAIT_SUFFIX = "_Portrait"
-    const val PREF_FOLDABLE_SUFFIX = "_Foldable"
-    val overlayLayoutSuffixes = listOf(
-        PREF_LANDSCAPE_SUFFIX,
-        PREF_PORTRAIT_SUFFIX,
-        PREF_FOLDABLE_SUFFIX
-    )
-
-    // Deprecated theme preference keys
-    const val PREF_THEME = "Theme"
-    const val PREF_THEME_MODE = "ThemeMode"
-    const val PREF_BLACK_BACKGROUNDS = "BlackBackgrounds"
-
    const val LayoutOption_Unspecified = 0
    const val LayoutOption_MobilePortrait = 4
    const val LayoutOption_MobileLandscape = 5
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@ -243,15 +243,6 @@ abstract class SettingsItem(
                    R.string.renderer_reactive_flushing_description
                )
            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.MAX_ANISOTROPY,
-                    R.string.anisotropic_filtering,
-                    R.string.anisotropic_filtering_description,
-                    R.array.anisoEntries,
-                    R.array.anisoValues
-                )
-            )
            put(
                SingleChoiceSetting(
                    IntSetting.AUDIO_OUTPUT_ENGINE,
@ -307,7 +298,6 @@ abstract class SettingsItem(

                override val key: String = FASTMEM_COMBINED
                override val isRuntimeModifiable: Boolean = false
-                override val pairedSettingKey = BooleanSetting.CPU_DEBUG_MODE.key
                override val defaultValue: Boolean = true
                override val isSwitchable: Boolean = true
                override var global: Boolean
--- 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
@ -3,8 +3,10 @@

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

+import android.content.SharedPreferences
 import android.os.Build
 import android.widget.Toast
+import androidx.preference.PreferenceManager
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@ -27,6 +29,9 @@ class SettingsFragmentPresenter(
 ) {
    private var settingsList = ArrayList<SettingsItem>()

+    private val preferences: SharedPreferences
+        get() = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+
    // Extension for altering settings list based on each setting's properties
    fun ArrayList<SettingsItem>.add(key: String) {
        val item = SettingsItem.settingsItems[key]!!
@ -144,7 +149,6 @@ class SettingsFragmentPresenter(
            add(IntSetting.RENDERER_VSYNC.key)
            add(IntSetting.RENDERER_SCALING_FILTER.key)
            add(IntSetting.RENDERER_ANTI_ALIASING.key)
-            add(IntSetting.MAX_ANISOTROPY.key)
            add(IntSetting.RENDERER_SCREEN_LAYOUT.key)
            add(IntSetting.RENDERER_ASPECT_RATIO.key)
            add(BooleanSetting.PICTURE_IN_PICTURE.key)
@ -165,19 +169,25 @@ class SettingsFragmentPresenter(
    private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
        sl.apply {
            val theme: AbstractIntSetting = object : AbstractIntSetting {
-                override fun getInt(needsGlobal: Boolean): Int = IntSetting.THEME.getInt()
+                override fun getInt(needsGlobal: Boolean): Int =
+                    preferences.getInt(Settings.PREF_THEME, 0)
+
                override fun setInt(value: Int) {
-                    IntSetting.THEME.setInt(value)
+                    preferences.edit()
+                        .putInt(Settings.PREF_THEME, value)
+                        .apply()
                    settingsViewModel.setShouldRecreate(true)
                }

-                override val key: String = IntSetting.THEME.key
-                override val isRuntimeModifiable: Boolean = IntSetting.THEME.isRuntimeModifiable
-                override fun getValueAsString(needsGlobal: Boolean): String =
-                    IntSetting.THEME.getValueAsString()
-
-                override val defaultValue: Int = IntSetting.THEME.defaultValue
-                override fun reset() = IntSetting.THEME.setInt(defaultValue)
+                override val key: String = Settings.PREF_THEME
+                override val isRuntimeModifiable: Boolean = false
+                override fun getValueAsString(needsGlobal: Boolean): String = getInt().toString()
+                override val defaultValue: Int = 0
+                override fun reset() {
+                    preferences.edit()
+                        .putInt(Settings.PREF_THEME, defaultValue)
+                        .apply()
+                }
            }

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@ -203,22 +213,24 @@ class SettingsFragmentPresenter(
            }

            val themeMode: AbstractIntSetting = object : AbstractIntSetting {
-                override fun getInt(needsGlobal: Boolean): Int = IntSetting.THEME_MODE.getInt()
+                override fun getInt(needsGlobal: Boolean): Int =
+                    preferences.getInt(Settings.PREF_THEME_MODE, -1)
+
                override fun setInt(value: Int) {
-                    IntSetting.THEME_MODE.setInt(value)
+                    preferences.edit()
+                        .putInt(Settings.PREF_THEME_MODE, value)
+                        .apply()
                    settingsViewModel.setShouldRecreate(true)
                }

-                override val key: String = IntSetting.THEME_MODE.key
-                override val isRuntimeModifiable: Boolean =
-                    IntSetting.THEME_MODE.isRuntimeModifiable
-
-                override fun getValueAsString(needsGlobal: Boolean): String =
-                    IntSetting.THEME_MODE.getValueAsString()
-
-                override val defaultValue: Int = IntSetting.THEME_MODE.defaultValue
+                override val key: String = Settings.PREF_THEME_MODE
+                override val isRuntimeModifiable: Boolean = false
+                override fun getValueAsString(needsGlobal: Boolean): String = getInt().toString()
+                override val defaultValue: Int = -1
                override fun reset() {
-                    IntSetting.THEME_MODE.setInt(defaultValue)
+                    preferences.edit()
+                        .putInt(Settings.PREF_BLACK_BACKGROUNDS, defaultValue)
+                        .apply()
                    settingsViewModel.setShouldRecreate(true)
                }
            }
@ -235,24 +247,25 @@ class SettingsFragmentPresenter(

            val blackBackgrounds: AbstractBooleanSetting = object : AbstractBooleanSetting {
                override fun getBoolean(needsGlobal: Boolean): Boolean =
-                    BooleanSetting.BLACK_BACKGROUNDS.getBoolean()
+                    preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false)

                override fun setBoolean(value: Boolean) {
-                    BooleanSetting.BLACK_BACKGROUNDS.setBoolean(value)
+                    preferences.edit()
+                        .putBoolean(Settings.PREF_BLACK_BACKGROUNDS, value)
+                        .apply()
                    settingsViewModel.setShouldRecreate(true)
                }

-                override val key: String = BooleanSetting.BLACK_BACKGROUNDS.key
-                override val isRuntimeModifiable: Boolean =
-                    BooleanSetting.BLACK_BACKGROUNDS.isRuntimeModifiable
-
+                override val key: String = Settings.PREF_BLACK_BACKGROUNDS
+                override val isRuntimeModifiable: Boolean = false
                override fun getValueAsString(needsGlobal: Boolean): String =
-                    BooleanSetting.BLACK_BACKGROUNDS.getValueAsString()
+                    getBoolean().toString()

-                override val defaultValue: Boolean = BooleanSetting.BLACK_BACKGROUNDS.defaultValue
+                override val defaultValue: Boolean = false
                override fun reset() {
-                    BooleanSetting.BLACK_BACKGROUNDS
-                        .setBoolean(BooleanSetting.BLACK_BACKGROUNDS.defaultValue)
+                    preferences.edit()
+                        .putBoolean(Settings.PREF_BLACK_BACKGROUNDS, defaultValue)
+                        .apply()
                    settingsViewModel.setShouldRecreate(true)
                }
            }
--- 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
@ -7,6 +7,7 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.SharedPreferences
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.Uri
@ -32,6 +33,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
+import androidx.preference.PreferenceManager
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
@ -44,22 +46,22 @@ import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
 import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 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.DriverViewModel
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.EmulationViewModel
-import org.yuzu.yuzu_emu.overlay.model.OverlayControl
-import org.yuzu.yuzu_emu.overlay.model.OverlayLayout
+import org.yuzu.yuzu_emu.overlay.InputOverlay
 import org.yuzu.yuzu_emu.utils.*
 import java.lang.NullPointerException

 class EmulationFragment : Fragment(), SurfaceHolder.Callback {
+    private lateinit var preferences: SharedPreferences
    private lateinit var emulationState: EmulationState
    private var emulationActivity: EmulationActivity? = null
    private var perfStatsUpdater: (() -> Unit)? = null
@ -139,6 +141,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

        // So this fragment doesn't restart on configuration changes; i.e. rotation.
        retainInstance = true
+        preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
        emulationState = EmulationState(game.path)
    }

@ -379,25 +382,24 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }

        updateScreenLayout()
-        val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
        if (emulationActivity?.isInPictureInPictureMode == true) {
            if (binding.drawerLayout.isOpen) {
                binding.drawerLayout.close()
            }
-            if (showInputOverlay) {
+            if (EmulationMenuSettings.showOverlay) {
                binding.surfaceInputOverlay.visibility = View.INVISIBLE
            }
        } else {
-            if (showInputOverlay && emulationViewModel.emulationStarted.value) {
+            if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
                binding.surfaceInputOverlay.visibility = View.VISIBLE
            } else {
                binding.surfaceInputOverlay.visibility = View.INVISIBLE
            }
            if (!isInFoldableLayout) {
                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                    binding.surfaceInputOverlay.layout = OverlayLayout.Portrait
+                    binding.surfaceInputOverlay.layout = InputOverlay.PORTRAIT
                } else {
-                    binding.surfaceInputOverlay.layout = OverlayLayout.Landscape
+                    binding.surfaceInputOverlay.layout = InputOverlay.LANDSCAPE
                }
            }
        }
@ -421,15 +423,17 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    }

    private fun resetInputOverlay() {
-        IntSetting.OVERLAY_SCALE.reset()
-        IntSetting.OVERLAY_OPACITY.reset()
+        preferences.edit()
+            .remove(Settings.PREF_CONTROL_SCALE)
+            .remove(Settings.PREF_CONTROL_OPACITY)
+            .apply()
        binding.surfaceInputOverlay.post {
            binding.surfaceInputOverlay.resetLayoutVisibilityAndPlacement()
        }
    }

    private fun updateShowFpsOverlay() {
-        if (BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()) {
+        if (EmulationMenuSettings.showFps) {
            val SYSTEM_FPS = 0
            val FPS = 1
            val FRAMETIME = 2
@ -492,7 +496,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                        binding.inGameMenu.layoutParams.height = it.bounds.bottom

                        isInFoldableLayout = true
-                        binding.surfaceInputOverlay.layout = OverlayLayout.Foldable
+                        binding.surfaceInputOverlay.layout = InputOverlay.FOLDABLE
                    }
                }
                it.isSeparating
@ -531,22 +535,18 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu)

        popup.menu.apply {
-            findItem(R.id.menu_toggle_fps).isChecked =
-                BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
-            findItem(R.id.menu_rel_stick_center).isChecked =
-                BooleanSetting.JOYSTICK_REL_CENTER.getBoolean()
-            findItem(R.id.menu_dpad_slide).isChecked = BooleanSetting.DPAD_SLIDE.getBoolean()
-            findItem(R.id.menu_show_overlay).isChecked =
-                BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
-            findItem(R.id.menu_haptics).isChecked = BooleanSetting.HAPTIC_FEEDBACK.getBoolean()
-            findItem(R.id.menu_touchscreen).isChecked = BooleanSetting.TOUCHSCREEN.getBoolean()
+            findItem(R.id.menu_toggle_fps).isChecked = EmulationMenuSettings.showFps
+            findItem(R.id.menu_rel_stick_center).isChecked = EmulationMenuSettings.joystickRelCenter
+            findItem(R.id.menu_dpad_slide).isChecked = EmulationMenuSettings.dpadSlide
+            findItem(R.id.menu_show_overlay).isChecked = EmulationMenuSettings.showOverlay
+            findItem(R.id.menu_haptics).isChecked = EmulationMenuSettings.hapticFeedback
        }

        popup.setOnMenuItemClickListener {
            when (it.itemId) {
                R.id.menu_toggle_fps -> {
                    it.isChecked = !it.isChecked
-                    BooleanSetting.SHOW_PERFORMANCE_OVERLAY.setBoolean(it.isChecked)
+                    EmulationMenuSettings.showFps = it.isChecked
                    updateShowFpsOverlay()
                    true
                }
@ -564,12 +564,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                }

                R.id.menu_toggle_controls -> {
-                    val overlayControlData = NativeConfig.getOverlayControlData()
-                    val optionsArray = BooleanArray(overlayControlData.size)
-                    overlayControlData.forEachIndexed { i, _ ->
-                        optionsArray[i] = overlayControlData.firstOrNull { data ->
-                            OverlayControl.entries[i].id == data.id
-                        }?.enabled == true
+                    val preferences =
+                        PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+                    val optionsArray = BooleanArray(Settings.overlayPreferences.size)
+                    Settings.overlayPreferences.forEachIndexed { i, _ ->
+                        optionsArray[i] = preferences.getBoolean("buttonToggle$i", i < 15)
                    }

                    val dialog = MaterialAlertDialogBuilder(requireContext())
@ -578,13 +577,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                            R.array.gamepadButtons,
                            optionsArray
                        ) { _, indexSelected, isChecked ->
-                            overlayControlData.firstOrNull { data ->
-                                OverlayControl.entries[indexSelected].id == data.id
-                            }?.enabled = isChecked
+                            preferences.edit()
+                                .putBoolean("buttonToggle$indexSelected", isChecked)
+                                .apply()
                        }
                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            NativeConfig.setOverlayControlData(overlayControlData)
-                            NativeConfig.saveGlobalConfig()
                            binding.surfaceInputOverlay.refreshControls()
                        }
                        .setNegativeButton(android.R.string.cancel, null)
@ -595,10 +592,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    dialog.getButton(AlertDialog.BUTTON_NEUTRAL)
                        .setOnClickListener {
                            val isChecked = !optionsArray[0]
-                            overlayControlData.forEachIndexed { i, _ ->
+                            Settings.overlayPreferences.forEachIndexed { i, _ ->
                                optionsArray[i] = isChecked
                                dialog.listView.setItemChecked(i, isChecked)
-                                overlayControlData[i].enabled = isChecked
+                                preferences.edit()
+                                    .putBoolean("buttonToggle$i", isChecked)
+                                    .apply()
                            }
                        }
                    true
@ -606,32 +605,26 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

                R.id.menu_show_overlay -> {
                    it.isChecked = !it.isChecked
-                    BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(it.isChecked)
+                    EmulationMenuSettings.showOverlay = it.isChecked
                    binding.surfaceInputOverlay.refreshControls()
                    true
                }

                R.id.menu_rel_stick_center -> {
                    it.isChecked = !it.isChecked
-                    BooleanSetting.JOYSTICK_REL_CENTER.setBoolean(it.isChecked)
+                    EmulationMenuSettings.joystickRelCenter = it.isChecked
                    true
                }

                R.id.menu_dpad_slide -> {
                    it.isChecked = !it.isChecked
-                    BooleanSetting.DPAD_SLIDE.setBoolean(it.isChecked)
+                    EmulationMenuSettings.dpadSlide = it.isChecked
                    true
                }

                R.id.menu_haptics -> {
                    it.isChecked = !it.isChecked
-                    BooleanSetting.HAPTIC_FEEDBACK.setBoolean(it.isChecked)
-                    true
-                }
-
-                R.id.menu_touchscreen -> {
-                    it.isChecked = !it.isChecked
-                    BooleanSetting.TOUCHSCREEN.setBoolean(it.isChecked)
+                    EmulationMenuSettings.hapticFeedback = it.isChecked
                    true
                }

@ -674,7 +667,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
            }
        }
-        NativeConfig.saveGlobalConfig()
    }

    @SuppressLint("SetTextI18n")
@ -683,7 +675,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        adjustBinding.apply {
            inputScaleSlider.apply {
                valueTo = 150F
-                value = IntSetting.OVERLAY_SCALE.getInt().toFloat()
+                value = preferences.getInt(Settings.PREF_CONTROL_SCALE, 50).toFloat()
                addOnChangeListener(
                    Slider.OnChangeListener { _, value, _ ->
                        inputScaleValue.text = "${value.toInt()}%"
@ -693,7 +685,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }
            inputOpacitySlider.apply {
                valueTo = 100F
-                value = IntSetting.OVERLAY_OPACITY.getInt().toFloat()
+                value = preferences.getInt(Settings.PREF_CONTROL_OPACITY, 100).toFloat()
                addOnChangeListener(
                    Slider.OnChangeListener { _, value, _ ->
                        inputOpacityValue.text = "${value.toInt()}%"
@ -717,12 +709,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    }

    private fun setControlScale(scale: Int) {
-        IntSetting.OVERLAY_SCALE.setInt(scale)
+        preferences.edit()
+            .putInt(Settings.PREF_CONTROL_SCALE, scale)
+            .apply()
        binding.surfaceInputOverlay.refreshControls()
    }

    private fun setControlOpacity(opacity: Int) {
-        IntSetting.OVERLAY_OPACITY.setInt(opacity)
+        preferences.edit()
+            .putInt(Settings.PREF_CONTROL_OPACITY, opacity)
+            .apply()
        binding.surfaceInputOverlay.refreshControls()
    }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.kt
@ -10,7 +10,6 @@ import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.view.MotionEvent
 import org.yuzu.yuzu_emu.NativeLibrary.ButtonState
-import org.yuzu.yuzu_emu.overlay.model.OverlayControlData

 /**
 * Custom [BitmapDrawable] that is capable
@ -26,7 +25,7 @@ class InputOverlayDrawableButton(
    defaultStateBitmap: Bitmap,
    pressedStateBitmap: Bitmap,
    val buttonId: Int,
-    val overlayControlData: OverlayControlData
+    val prefId: String
 ) {
    // The ID value what motion event is tracking
    var trackId: Int
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt
@ -14,7 +14,7 @@ import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.math.sqrt
 import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
+import org.yuzu.yuzu_emu.utils.EmulationMenuSettings

 /**
 * Custom [BitmapDrawable] that is capable
@ -125,7 +125,7 @@ class InputOverlayDrawableJoystick(
            pressedState = true
            outerBitmap.alpha = 0
            boundsBoxBitmap.alpha = opacity
-            if (BooleanSetting.JOYSTICK_REL_CENTER.getBoolean()) {
+            if (EmulationMenuSettings.joystickRelCenter) {
                virtBounds.offset(
                    xPosition - virtBounds.centerX(),
                    yPosition - virtBounds.centerY()
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControl.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControl.kt
@ -1,188 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.overlay.model
-
-import androidx.annotation.IntegerRes
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-
-enum class OverlayControl(
-    val id: String,
-    val defaultVisibility: Boolean,
-    @IntegerRes val defaultLandscapePositionResources: Pair<Int, Int>,
-    @IntegerRes val defaultPortraitPositionResources: Pair<Int, Int>,
-    @IntegerRes val defaultFoldablePositionResources: Pair<Int, Int>
-) {
-    BUTTON_A(
-        "button_a",
-        true,
-        Pair(R.integer.BUTTON_A_X, R.integer.BUTTON_A_Y),
-        Pair(R.integer.BUTTON_A_X_PORTRAIT, R.integer.BUTTON_A_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_A_X_FOLDABLE, R.integer.BUTTON_A_Y_FOLDABLE)
-    ),
-    BUTTON_B(
-        "button_b",
-        true,
-        Pair(R.integer.BUTTON_B_X, R.integer.BUTTON_B_Y),
-        Pair(R.integer.BUTTON_B_X_PORTRAIT, R.integer.BUTTON_B_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_B_X_FOLDABLE, R.integer.BUTTON_B_Y_FOLDABLE)
-    ),
-    BUTTON_X(
-        "button_x",
-        true,
-        Pair(R.integer.BUTTON_X_X, R.integer.BUTTON_X_Y),
-        Pair(R.integer.BUTTON_X_X_PORTRAIT, R.integer.BUTTON_X_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_X_X_FOLDABLE, R.integer.BUTTON_X_Y_FOLDABLE)
-    ),
-    BUTTON_Y(
-        "button_y",
-        true,
-        Pair(R.integer.BUTTON_Y_X, R.integer.BUTTON_Y_Y),
-        Pair(R.integer.BUTTON_Y_X_PORTRAIT, R.integer.BUTTON_Y_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_Y_X_FOLDABLE, R.integer.BUTTON_Y_Y_FOLDABLE)
-    ),
-    BUTTON_PLUS(
-        "button_plus",
-        true,
-        Pair(R.integer.BUTTON_PLUS_X, R.integer.BUTTON_PLUS_Y),
-        Pair(R.integer.BUTTON_PLUS_X_PORTRAIT, R.integer.BUTTON_PLUS_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_PLUS_X_FOLDABLE, R.integer.BUTTON_PLUS_Y_FOLDABLE)
-    ),
-    BUTTON_MINUS(
-        "button_minus",
-        true,
-        Pair(R.integer.BUTTON_MINUS_X, R.integer.BUTTON_MINUS_Y),
-        Pair(R.integer.BUTTON_MINUS_X_PORTRAIT, R.integer.BUTTON_MINUS_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_MINUS_X_FOLDABLE, R.integer.BUTTON_MINUS_Y_FOLDABLE)
-    ),
-    BUTTON_HOME(
-        "button_home",
-        false,
-        Pair(R.integer.BUTTON_HOME_X, R.integer.BUTTON_HOME_Y),
-        Pair(R.integer.BUTTON_HOME_X_PORTRAIT, R.integer.BUTTON_HOME_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_HOME_X_FOLDABLE, R.integer.BUTTON_HOME_Y_FOLDABLE)
-    ),
-    BUTTON_CAPTURE(
-        "button_capture",
-        false,
-        Pair(R.integer.BUTTON_CAPTURE_X, R.integer.BUTTON_CAPTURE_Y),
-        Pair(R.integer.BUTTON_CAPTURE_X_PORTRAIT, R.integer.BUTTON_CAPTURE_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_CAPTURE_X_FOLDABLE, R.integer.BUTTON_CAPTURE_Y_FOLDABLE)
-    ),
-    BUTTON_L(
-        "button_l",
-        true,
-        Pair(R.integer.BUTTON_L_X, R.integer.BUTTON_L_Y),
-        Pair(R.integer.BUTTON_L_X_PORTRAIT, R.integer.BUTTON_L_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_L_X_FOLDABLE, R.integer.BUTTON_L_Y_FOLDABLE)
-    ),
-    BUTTON_R(
-        "button_r",
-        true,
-        Pair(R.integer.BUTTON_R_X, R.integer.BUTTON_R_Y),
-        Pair(R.integer.BUTTON_R_X_PORTRAIT, R.integer.BUTTON_R_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_R_X_FOLDABLE, R.integer.BUTTON_R_Y_FOLDABLE)
-    ),
-    BUTTON_ZL(
-        "button_zl",
-        true,
-        Pair(R.integer.BUTTON_ZL_X, R.integer.BUTTON_ZL_Y),
-        Pair(R.integer.BUTTON_ZL_X_PORTRAIT, R.integer.BUTTON_ZL_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_ZL_X_FOLDABLE, R.integer.BUTTON_ZL_Y_FOLDABLE)
-    ),
-    BUTTON_ZR(
-        "button_zr",
-        true,
-        Pair(R.integer.BUTTON_ZR_X, R.integer.BUTTON_ZR_Y),
-        Pair(R.integer.BUTTON_ZR_X_PORTRAIT, R.integer.BUTTON_ZR_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_ZR_X_FOLDABLE, R.integer.BUTTON_ZR_Y_FOLDABLE)
-    ),
-    BUTTON_STICK_L(
-        "button_stick_l",
-        true,
-        Pair(R.integer.BUTTON_STICK_L_X, R.integer.BUTTON_STICK_L_Y),
-        Pair(R.integer.BUTTON_STICK_L_X_PORTRAIT, R.integer.BUTTON_STICK_L_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_STICK_L_X_FOLDABLE, R.integer.BUTTON_STICK_L_Y_FOLDABLE)
-    ),
-    BUTTON_STICK_R(
-        "button_stick_r",
-        true,
-        Pair(R.integer.BUTTON_STICK_R_X, R.integer.BUTTON_STICK_R_Y),
-        Pair(R.integer.BUTTON_STICK_R_X_PORTRAIT, R.integer.BUTTON_STICK_R_Y_PORTRAIT),
-        Pair(R.integer.BUTTON_STICK_R_X_FOLDABLE, R.integer.BUTTON_STICK_R_Y_FOLDABLE)
-    ),
-    STICK_L(
-        "stick_l",
-        true,
-        Pair(R.integer.STICK_L_X, R.integer.STICK_L_Y),
-        Pair(R.integer.STICK_L_X_PORTRAIT, R.integer.STICK_L_Y_PORTRAIT),
-        Pair(R.integer.STICK_L_X_FOLDABLE, R.integer.STICK_L_Y_FOLDABLE)
-    ),
-    STICK_R(
-        "stick_r",
-        true,
-        Pair(R.integer.STICK_R_X, R.integer.STICK_R_Y),
-        Pair(R.integer.STICK_R_X_PORTRAIT, R.integer.STICK_R_Y_PORTRAIT),
-        Pair(R.integer.STICK_R_X_FOLDABLE, R.integer.STICK_R_Y_FOLDABLE)
-    ),
-    COMBINED_DPAD(
-        "combined_dpad",
-        true,
-        Pair(R.integer.COMBINED_DPAD_X, R.integer.COMBINED_DPAD_Y),
-        Pair(R.integer.COMBINED_DPAD_X_PORTRAIT, R.integer.COMBINED_DPAD_Y_PORTRAIT),
-        Pair(R.integer.COMBINED_DPAD_X_FOLDABLE, R.integer.COMBINED_DPAD_Y_FOLDABLE)
-    );
-
-    fun getDefaultPositionForLayout(layout: OverlayLayout): Pair<Double, Double> {
-        val rawResourcePair: Pair<Int, Int>
-        YuzuApplication.appContext.resources.apply {
-            rawResourcePair = when (layout) {
-                OverlayLayout.Landscape -> {
-                    Pair(
-                        getInteger(this@OverlayControl.defaultLandscapePositionResources.first),
-                        getInteger(this@OverlayControl.defaultLandscapePositionResources.second)
-                    )
-                }
-
-                OverlayLayout.Portrait -> {
-                    Pair(
-                        getInteger(this@OverlayControl.defaultPortraitPositionResources.first),
-                        getInteger(this@OverlayControl.defaultPortraitPositionResources.second)
-                    )
-                }
-
-                OverlayLayout.Foldable -> {
-                    Pair(
-                        getInteger(this@OverlayControl.defaultFoldablePositionResources.first),
-                        getInteger(this@OverlayControl.defaultFoldablePositionResources.second)
-                    )
-                }
-            }
-        }
-
-        return Pair(
-            rawResourcePair.first.toDouble() / 1000,
-            rawResourcePair.second.toDouble() / 1000
-        )
-    }
-
-    fun toOverlayControlData(): OverlayControlData =
-        OverlayControlData(
-            id,
-            defaultVisibility,
-            getDefaultPositionForLayout(OverlayLayout.Landscape),
-            getDefaultPositionForLayout(OverlayLayout.Portrait),
-            getDefaultPositionForLayout(OverlayLayout.Foldable)
-        )
-
-    companion object {
-        val map: HashMap<String, OverlayControl> by lazy {
-            val hashMap = hashMapOf<String, OverlayControl>()
-            entries.forEach { hashMap[it.id] = it }
-            hashMap
-        }
-
-        fun from(id: String): OverlayControl? = map[id]
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControlData.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControlData.kt
@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.overlay.model
-
-data class OverlayControlData(
-    val id: String,
-    var enabled: Boolean,
-    var landscapePosition: Pair<Double, Double>,
-    var portraitPosition: Pair<Double, Double>,
-    var foldablePosition: Pair<Double, Double>
-) {
-    fun positionFromLayout(layout: OverlayLayout): Pair<Double, Double> =
-        when (layout) {
-            OverlayLayout.Landscape -> landscapePosition
-            OverlayLayout.Portrait -> portraitPosition
-            OverlayLayout.Foldable -> foldablePosition
-        }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControlDefault.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayControlDefault.kt
@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.overlay.model
-
-import androidx.annotation.IntegerRes
-
-data class OverlayControlDefault(
-    val buttonId: String,
-    @IntegerRes val landscapePositionResource: Pair<Int, Int>,
-    @IntegerRes val portraitPositionResource: Pair<Int, Int>,
-    @IntegerRes val foldablePositionResource: Pair<Int, Int>
-)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayLayout.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/model/OverlayLayout.kt
@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.overlay.model
-
-enum class OverlayLayout(val id: String) {
-    Landscape("Landscape"),
-    Portrait("Portrait"),
-    Foldable("Foldable")
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt
@ -3,17 +3,9 @@

 package org.yuzu.yuzu_emu.utils

-import androidx.preference.PreferenceManager
 import java.io.IOException
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting
-import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.overlay.model.OverlayControlData
-import org.yuzu.yuzu_emu.overlay.model.OverlayControl
-import org.yuzu.yuzu_emu.overlay.model.OverlayLayout
-import org.yuzu.yuzu_emu.utils.PreferenceUtil.migratePreference

 object DirectoryInitialization {
    private var userPath: String? = null
@ -25,7 +17,6 @@ object DirectoryInitialization {
            initializeInternalStorage()
            NativeLibrary.initializeSystem(false)
            NativeConfig.initializeGlobalConfig()
-            migrateSettings()
            areDirectoriesReady = true
        }
    }
@ -44,170 +35,4 @@ object DirectoryInitialization {
            e.printStackTrace()
        }
    }
-
-    private fun migrateSettings() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-        var saveConfig = false
-        val theme = preferences.migratePreference<Int>(Settings.PREF_THEME)
-        if (theme != null) {
-            IntSetting.THEME.setInt(theme)
-            saveConfig = true
-        }
-
-        val themeMode = preferences.migratePreference<Int>(Settings.PREF_THEME_MODE)
-        if (themeMode != null) {
-            IntSetting.THEME_MODE.setInt(themeMode)
-            saveConfig = true
-        }
-
-        val blackBackgrounds =
-            preferences.migratePreference<Boolean>(Settings.PREF_BLACK_BACKGROUNDS)
-        if (blackBackgrounds != null) {
-            BooleanSetting.BLACK_BACKGROUNDS.setBoolean(blackBackgrounds)
-            saveConfig = true
-        }
-
-        val joystickRelCenter =
-            preferences.migratePreference<Boolean>(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER)
-        if (joystickRelCenter != null) {
-            BooleanSetting.JOYSTICK_REL_CENTER.setBoolean(joystickRelCenter)
-            saveConfig = true
-        }
-
-        val dpadSlide =
-            preferences.migratePreference<Boolean>(Settings.PREF_MENU_SETTINGS_DPAD_SLIDE)
-        if (dpadSlide != null) {
-            BooleanSetting.DPAD_SLIDE.setBoolean(dpadSlide)
-            saveConfig = true
-        }
-
-        val hapticFeedback =
-            preferences.migratePreference<Boolean>(Settings.PREF_MENU_SETTINGS_HAPTICS)
-        if (hapticFeedback != null) {
-            BooleanSetting.HAPTIC_FEEDBACK.setBoolean(hapticFeedback)
-            saveConfig = true
-        }
-
-        val showPerformanceOverlay =
-            preferences.migratePreference<Boolean>(Settings.PREF_MENU_SETTINGS_SHOW_FPS)
-        if (showPerformanceOverlay != null) {
-            BooleanSetting.SHOW_PERFORMANCE_OVERLAY.setBoolean(showPerformanceOverlay)
-            saveConfig = true
-        }
-
-        val showInputOverlay =
-            preferences.migratePreference<Boolean>(Settings.PREF_MENU_SETTINGS_SHOW_OVERLAY)
-        if (showInputOverlay != null) {
-            BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(showInputOverlay)
-            saveConfig = true
-        }
-
-        val overlayOpacity = preferences.migratePreference<Int>(Settings.PREF_CONTROL_OPACITY)
-        if (overlayOpacity != null) {
-            IntSetting.OVERLAY_OPACITY.setInt(overlayOpacity)
-            saveConfig = true
-        }
-
-        val overlayScale = preferences.migratePreference<Int>(Settings.PREF_CONTROL_SCALE)
-        if (overlayScale != null) {
-            IntSetting.OVERLAY_SCALE.setInt(overlayScale)
-            saveConfig = true
-        }
-
-        var setOverlayData = false
-        val overlayControlData = NativeConfig.getOverlayControlData()
-        if (overlayControlData.isEmpty()) {
-            val overlayControlDataMap =
-                NativeConfig.getOverlayControlData().associateBy { it.id }.toMutableMap()
-            for (button in Settings.overlayPreferences) {
-                val buttonId = convertButtonId(button)
-                var buttonEnabled = preferences.migratePreference<Boolean>(button)
-                if (buttonEnabled == null) {
-                    buttonEnabled = OverlayControl.map[buttonId]?.defaultVisibility == true
-                }
-
-                var landscapeXPosition = preferences.migratePreference<Float>(
-                    "$button-X${Settings.PREF_LANDSCAPE_SUFFIX}"
-                )?.toDouble()
-                var landscapeYPosition = preferences.migratePreference<Float>(
-                    "$button-Y${Settings.PREF_LANDSCAPE_SUFFIX}"
-                )?.toDouble()
-                if (landscapeXPosition == null || landscapeYPosition == null) {
-                    val landscapePosition = OverlayControl.map[buttonId]
-                        ?.getDefaultPositionForLayout(OverlayLayout.Landscape) ?: Pair(0.0, 0.0)
-                    landscapeXPosition = landscapePosition.first
-                    landscapeYPosition = landscapePosition.second
-                }
-
-                var portraitXPosition = preferences.migratePreference<Float>(
-                    "$button-X${Settings.PREF_PORTRAIT_SUFFIX}"
-                )?.toDouble()
-                var portraitYPosition = preferences.migratePreference<Float>(
-                    "$button-Y${Settings.PREF_PORTRAIT_SUFFIX}"
-                )?.toDouble()
-                if (portraitXPosition == null || portraitYPosition == null) {
-                    val portraitPosition = OverlayControl.map[buttonId]
-                        ?.getDefaultPositionForLayout(OverlayLayout.Portrait) ?: Pair(0.0, 0.0)
-                    portraitXPosition = portraitPosition.first
-                    portraitYPosition = portraitPosition.second
-                }
-
-                var foldableXPosition = preferences.migratePreference<Float>(
-                    "$button-X${Settings.PREF_FOLDABLE_SUFFIX}"
-                )?.toDouble()
-                var foldableYPosition = preferences.migratePreference<Float>(
-                    "$button-Y${Settings.PREF_FOLDABLE_SUFFIX}"
-                )?.toDouble()
-                if (foldableXPosition == null || foldableYPosition == null) {
-                    val foldablePosition = OverlayControl.map[buttonId]
-                        ?.getDefaultPositionForLayout(OverlayLayout.Foldable) ?: Pair(0.0, 0.0)
-                    foldableXPosition = foldablePosition.first
-                    foldableYPosition = foldablePosition.second
-                }
-
-                val controlData = OverlayControlData(
-                    buttonId,
-                    buttonEnabled,
-                    Pair(landscapeXPosition, landscapeYPosition),
-                    Pair(portraitXPosition, portraitYPosition),
-                    Pair(foldableXPosition, foldableYPosition)
-                )
-                overlayControlDataMap[buttonId] = controlData
-                setOverlayData = true
-            }
-
-            if (setOverlayData) {
-                NativeConfig.setOverlayControlData(
-                    overlayControlDataMap.map { it.value }.toTypedArray()
-                )
-                saveConfig = true
-            }
-        }
-
-        if (saveConfig) {
-            NativeConfig.saveGlobalConfig()
-        }
-    }
-
-    private fun convertButtonId(buttonId: String): String =
-        when (buttonId) {
-            Settings.PREF_BUTTON_A -> OverlayControl.BUTTON_A.id
-            Settings.PREF_BUTTON_B -> OverlayControl.BUTTON_B.id
-            Settings.PREF_BUTTON_X -> OverlayControl.BUTTON_X.id
-            Settings.PREF_BUTTON_Y -> OverlayControl.BUTTON_Y.id
-            Settings.PREF_BUTTON_L -> OverlayControl.BUTTON_L.id
-            Settings.PREF_BUTTON_R -> OverlayControl.BUTTON_R.id
-            Settings.PREF_BUTTON_ZL -> OverlayControl.BUTTON_ZL.id
-            Settings.PREF_BUTTON_ZR -> OverlayControl.BUTTON_ZR.id
-            Settings.PREF_BUTTON_PLUS -> OverlayControl.BUTTON_PLUS.id
-            Settings.PREF_BUTTON_MINUS -> OverlayControl.BUTTON_MINUS.id
-            Settings.PREF_BUTTON_DPAD -> OverlayControl.COMBINED_DPAD.id
-            Settings.PREF_STICK_L -> OverlayControl.STICK_L.id
-            Settings.PREF_STICK_R -> OverlayControl.STICK_R.id
-            Settings.PREF_BUTTON_HOME -> OverlayControl.BUTTON_HOME.id
-            Settings.PREF_BUTTON_SCREENSHOT -> OverlayControl.BUTTON_CAPTURE.id
-            Settings.PREF_BUTTON_STICK_L -> OverlayControl.BUTTON_STICK_L.id
-            Settings.PREF_BUTTON_STICK_R -> OverlayControl.BUTTON_STICK_R.id
-            else -> ""
-        }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt
@ -0,0 +1,50 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.utils
+
+import androidx.preference.PreferenceManager
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.settings.model.Settings
+
+object EmulationMenuSettings {
+    private val preferences =
+        PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+
+    var joystickRelCenter: Boolean
+        get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, true)
+        set(value) {
+            preferences.edit()
+                .putBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, value)
+                .apply()
+        }
+    var dpadSlide: Boolean
+        get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_DPAD_SLIDE, true)
+        set(value) {
+            preferences.edit()
+                .putBoolean(Settings.PREF_MENU_SETTINGS_DPAD_SLIDE, value)
+                .apply()
+        }
+    var hapticFeedback: Boolean
+        get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_HAPTICS, false)
+        set(value) {
+            preferences.edit()
+                .putBoolean(Settings.PREF_MENU_SETTINGS_HAPTICS, value)
+                .apply()
+        }
+
+    var showFps: Boolean
+        get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, false)
+        set(value) {
+            preferences.edit()
+                .putBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, value)
+                .apply()
+        }
+    var showOverlay: Boolean
+        get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_OVERLAY, true)
+        set(value) {
+            preferences.edit()
+                .putBoolean(Settings.PREF_MENU_SETTINGS_SHOW_OVERLAY, value)
+                .apply()
+        }
+}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt
@ -4,7 +4,6 @@
 package org.yuzu.yuzu_emu.utils

 import org.yuzu.yuzu_emu.model.GameDir
-import org.yuzu.yuzu_emu.overlay.model.OverlayControlData

 object NativeConfig {
    /**
@ -151,21 +150,4 @@ object NativeConfig {
     */
    @Synchronized
    external fun setDisabledAddons(programId: String, disabledAddons: Array<String>)
-
-    /**
-     * Gets an array of [OverlayControlData] from settings
-     *
-     * @return An array of [OverlayControlData]
-     */
-    @Synchronized
-    external fun getOverlayControlData(): Array<OverlayControlData>
-
-    /**
-     * Clears the AndroidSettings::values.overlay_control_data array and replaces its values
-     * with [overlayControlData]
-     *
-     * @param overlayControlData Replacement array of [OverlayControlData]
-     */
-    @Synchronized
-    external fun setOverlayControlData(overlayControlData: Array<OverlayControlData>)
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/PreferenceUtil.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/PreferenceUtil.kt
@ -1,37 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.utils
-
-import android.content.SharedPreferences
-
-object PreferenceUtil {
-    /**
-     * Retrieves a shared preference value and then deletes the value in storage.
-     * @param key Associated key for the value in this preferences instance
-     * @return Typed value associated with [key]. Null if no such key exists.
-     */
-    inline fun <reified T> SharedPreferences.migratePreference(key: String): T? {
-        if (!this.contains(key)) {
-            return null
-        }
-
-        val value: Any = when (T::class) {
-            String::class -> this.getString(key, "")!!
-
-            Boolean::class -> this.getBoolean(key, false)
-
-            Int::class -> this.getInt(key, 0)
-
-            Float::class -> this.getFloat(key, 0f)
-
-            Long::class -> this.getLong(key, 0)
-
-            else -> throw IllegalStateException("Tried to migrate preference with invalid type!")
-        }
-        deletePreference(key)
-        return value as T
-    }
-
-    fun SharedPreferences.deletePreference(key: String) = this.edit().remove(key).apply()
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt
@ -5,38 +5,38 @@ package org.yuzu.yuzu_emu.utils

 import android.content.res.Configuration
 import android.graphics.Color
-import android.os.Build
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.preference.PreferenceManager
 import kotlin.math.roundToInt
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.ui.main.ThemeProvider

 object ThemeHelper {
    const val SYSTEM_BAR_ALPHA = 0.9f

+    private const val DEFAULT = 0
+    private const val MATERIAL_YOU = 1
+
    fun setTheme(activity: AppCompatActivity) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
        setThemeMode(activity)
-        when (Theme.from(IntSetting.THEME.getInt())) {
-            Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main)
-            Theme.MaterialYou -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou)
-                } else {
-                    activity.setTheme(R.style.Theme_Yuzu_Main)
-                }
-            }
+        when (preferences.getInt(Settings.PREF_THEME, 0)) {
+            DEFAULT -> activity.setTheme(R.style.Theme_Yuzu_Main)
+            MATERIAL_YOU -> activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou)
        }

        // Using a specific night mode check because this could apply incorrectly when using the
        // light app mode, dark system mode, and black backgrounds. Launching the settings activity
        // will then show light mode colors/navigation bars but with black backgrounds.
-        if (BooleanSetting.BLACK_BACKGROUNDS.getBoolean() && isNightMode(activity)) {
+        if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false) &&
+            isNightMode(activity)
+        ) {
            activity.setTheme(R.style.ThemeOverlay_Yuzu_Dark)
        }
    }
@ -60,7 +60,8 @@ object ThemeHelper {
    }

    fun setThemeMode(activity: AppCompatActivity) {
-        val themeMode = IntSetting.THEME_MODE.getInt()
+        val themeMode = PreferenceManager.getDefaultSharedPreferences(activity.applicationContext)
+            .getInt(Settings.PREF_THEME_MODE, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
        activity.delegate.localNightMode = themeMode
        val windowController = WindowCompat.getInsetsController(
            activity.window,
@ -94,12 +95,3 @@ object ThemeHelper {
        windowController.isAppearanceLightNavigationBars = false
    }
 }
-
-enum class Theme(val int: Int) {
-    Default(0),
-    MaterialYou(1);
-
-    companion object {
-        fun from(int: Int): Theme = entries.firstOrNull { it.int == int } ?: Default
-    }
-}
--- a/src/android/app/src/main/jni/android_common/android_common.cpp
+++ b/src/android/app/src/main/jni/android_common/android_common.cpp
@ -9,7 +9,6 @@
 #include <jni.h>

 #include "common/string_util.h"
-#include "jni/id_cache.h"

 std::string GetJString(JNIEnv* env, jstring jstr) {
    if (!jstr) {
@ -34,11 +33,3 @@ jstring ToJString(JNIEnv* env, std::string_view str) {
 jstring ToJString(JNIEnv* env, std::u16string_view str) {
    return ToJString(env, Common::UTF16ToUTF8(str));
 }
-
-double GetJDouble(JNIEnv* env, jobject jdouble) {
-    return env->GetDoubleField(jdouble, IDCache::GetDoubleValueField());
-}
-
-jobject ToJDouble(JNIEnv* env, double value) {
-    return env->NewObject(IDCache::GetDoubleClass(), IDCache::GetDoubleConstructor(), value);
-}
--- a/src/android/app/src/main/jni/android_common/android_common.h
+++ b/src/android/app/src/main/jni/android_common/android_common.h
@ -10,6 +10,3 @@
 std::string GetJString(JNIEnv* env, jstring jstr);
 jstring ToJString(JNIEnv* env, std::string_view str);
 jstring ToJString(JNIEnv* env, std::u16string_view str);
-
-double GetJDouble(JNIEnv* env, jobject jdouble);
-jobject ToJDouble(JNIEnv* env, double value);
--- a/src/android/app/src/main/jni/android_config.cpp
+++ b/src/android/app/src/main/jni/android_config.cpp
@ -35,7 +35,6 @@ void AndroidConfig::ReadAndroidValues() {
    if (global) {
        ReadAndroidUIValues();
        ReadUIValues();
-        ReadOverlayValues();
    }
    ReadDriverValues();
 }
@ -82,42 +81,10 @@ void AndroidConfig::ReadDriverValues() {
    EndGroup();
 }

-void AndroidConfig::ReadOverlayValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Overlay));
-
-    ReadCategory(Settings::Category::Overlay);
-
-    AndroidSettings::values.overlay_control_data.clear();
-    const int control_data_size = BeginArray("control_data");
-    for (int i = 0; i < control_data_size; ++i) {
-        SetArrayIndex(i);
-        AndroidSettings::OverlayControlData control_data;
-        control_data.id = ReadStringSetting(std::string("id"));
-        control_data.enabled = ReadBooleanSetting(std::string("enabled"));
-        control_data.landscape_position.first =
-            ReadDoubleSetting(std::string("landscape\\x_position"));
-        control_data.landscape_position.second =
-            ReadDoubleSetting(std::string("landscape\\y_position"));
-        control_data.portrait_position.first =
-            ReadDoubleSetting(std::string("portrait\\x_position"));
-        control_data.portrait_position.second =
-            ReadDoubleSetting(std::string("portrait\\y_position"));
-        control_data.foldable_position.first =
-            ReadDoubleSetting(std::string("foldable\\x_position"));
-        control_data.foldable_position.second =
-            ReadDoubleSetting(std::string("foldable\\y_position"));
-        AndroidSettings::values.overlay_control_data.push_back(control_data);
-    }
-    EndArray();
-
-    EndGroup();
-}
-
 void AndroidConfig::SaveAndroidValues() {
    if (global) {
        SaveAndroidUIValues();
        SaveUIValues();
-        SaveOverlayValues();
    }
    SaveDriverValues();

@ -147,9 +114,8 @@ void AndroidConfig::SavePathValues() {
    for (size_t i = 0; i < AndroidSettings::values.game_dirs.size(); ++i) {
        SetArrayIndex(i);
        const auto& game_dir = AndroidSettings::values.game_dirs[i];
-        WriteStringSetting(std::string("path"), game_dir.path);
-        WriteBooleanSetting(std::string("deep_scan"), game_dir.deep_scan,
-                            std::make_optional(false));
+        WriteSetting(std::string("path"), game_dir.path);
+        WriteSetting(std::string("deep_scan"), game_dir.deep_scan, std::make_optional(false));
    }
    EndArray();

@ -164,35 +130,6 @@ void AndroidConfig::SaveDriverValues() {
    EndGroup();
 }

-void AndroidConfig::SaveOverlayValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Overlay));
-
-    WriteCategory(Settings::Category::Overlay);
-
-    BeginArray("control_data");
-    for (size_t i = 0; i < AndroidSettings::values.overlay_control_data.size(); ++i) {
-        SetArrayIndex(i);
-        const auto& control_data = AndroidSettings::values.overlay_control_data[i];
-        WriteStringSetting(std::string("id"), control_data.id);
-        WriteBooleanSetting(std::string("enabled"), control_data.enabled);
-        WriteDoubleSetting(std::string("landscape\\x_position"),
-                           control_data.landscape_position.first);
-        WriteDoubleSetting(std::string("landscape\\y_position"),
-                           control_data.landscape_position.second);
-        WriteDoubleSetting(std::string("portrait\\x_position"),
-                           control_data.portrait_position.first);
-        WriteDoubleSetting(std::string("portrait\\y_position"),
-                           control_data.portrait_position.second);
-        WriteDoubleSetting(std::string("foldable\\x_position"),
-                           control_data.foldable_position.first);
-        WriteDoubleSetting(std::string("foldable\\y_position"),
-                           control_data.foldable_position.second);
-    }
-    EndArray();
-
-    EndGroup();
-}
-
 std::vector<Settings::BasicSetting*>& AndroidConfig::FindRelevantList(Settings::Category category) {
    auto& map = Settings::values.linkage.by_category;
    if (map.contains(category)) {
--- a/src/android/app/src/main/jni/android_config.h
+++ b/src/android/app/src/main/jni/android_config.h
@ -18,7 +18,6 @@ protected:
    void ReadAndroidValues();
    void ReadAndroidUIValues();
    void ReadDriverValues();
-    void ReadOverlayValues();
    void ReadHidbusValues() override {}
    void ReadDebugControlValues() override {}
    void ReadPathValues() override;
@ -31,7 +30,6 @@ protected:
    void SaveAndroidValues();
    void SaveAndroidUIValues();
    void SaveDriverValues();
-    void SaveOverlayValues();
    void SaveHidbusValues() override {}
    void SaveDebugControlValues() override {}
    void SavePathValues() override;
--- a/src/android/app/src/main/jni/android_settings.h
+++ b/src/android/app/src/main/jni/android_settings.h
@ -14,14 +14,6 @@ struct GameDir {
    bool deep_scan = false;
 };

-struct OverlayControlData {
-    std::string id;
-    bool enabled;
-    std::pair<double, double> landscape_position;
-    std::pair<double, double> portrait_position;
-    std::pair<double, double> foldable_position;
-};
-
 struct Values {
    Settings::Linkage linkage;

@ -41,28 +33,6 @@ struct Values {

    Settings::SwitchableSetting<std::string, false> driver_path{linkage, "", "driver_path",
                                                                Settings::Category::GpuDriver};
-
-    Settings::Setting<s32> theme{linkage, 0, "theme", Settings::Category::Android};
-    Settings::Setting<s32> theme_mode{linkage, -1, "theme_mode", Settings::Category::Android};
-    Settings::Setting<bool> black_backgrounds{linkage, false, "black_backgrounds",
-                                              Settings::Category::Android};
-
-    // Input/performance overlay settings
-    std::vector<OverlayControlData> overlay_control_data;
-    Settings::Setting<s32> overlay_scale{linkage, 50, "control_scale", Settings::Category::Overlay};
-    Settings::Setting<s32> overlay_opacity{linkage, 100, "control_opacity",
-                                           Settings::Category::Overlay};
-
-    Settings::Setting<bool> joystick_rel_center{linkage, true, "joystick_rel_center",
-                                                Settings::Category::Overlay};
-    Settings::Setting<bool> dpad_slide{linkage, true, "dpad_slide", Settings::Category::Overlay};
-    Settings::Setting<bool> haptic_feedback{linkage, true, "haptic_feedback",
-                                            Settings::Category::Overlay};
-    Settings::Setting<bool> show_performance_overlay{linkage, true, "show_performance_overlay",
-                                                     Settings::Category::Overlay};
-    Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
-                                               Settings::Category::Overlay};
-    Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
 };

 extern Values values;
--- a/src/android/app/src/main/jni/id_cache.cpp
+++ b/src/android/app/src/main/jni/id_cache.cpp
@ -35,18 +35,6 @@ static jmethodID s_pair_constructor;
 static jfieldID s_pair_first_field;
 static jfieldID s_pair_second_field;

-static jclass s_overlay_control_data_class;
-static jmethodID s_overlay_control_data_constructor;
-static jfieldID s_overlay_control_data_id_field;
-static jfieldID s_overlay_control_data_enabled_field;
-static jfieldID s_overlay_control_data_landscape_position_field;
-static jfieldID s_overlay_control_data_portrait_position_field;
-static jfieldID s_overlay_control_data_foldable_position_field;
-
-static jclass s_double_class;
-static jmethodID s_double_constructor;
-static jfieldID s_double_value_field;
-
 static constexpr jint JNI_VERSION = JNI_VERSION_1_6;

 namespace IDCache {
@ -158,46 +146,6 @@ jfieldID GetPairSecondField() {
    return s_pair_second_field;
 }

-jclass GetOverlayControlDataClass() {
-    return s_overlay_control_data_class;
-}
-
-jmethodID GetOverlayControlDataConstructor() {
-    return s_overlay_control_data_constructor;
-}
-
-jfieldID GetOverlayControlDataIdField() {
-    return s_overlay_control_data_id_field;
-}
-
-jfieldID GetOverlayControlDataEnabledField() {
-    return s_overlay_control_data_enabled_field;
-}
-
-jfieldID GetOverlayControlDataLandscapePositionField() {
-    return s_overlay_control_data_landscape_position_field;
-}
-
-jfieldID GetOverlayControlDataPortraitPositionField() {
-    return s_overlay_control_data_portrait_position_field;
-}
-
-jfieldID GetOverlayControlDataFoldablePositionField() {
-    return s_overlay_control_data_foldable_position_field;
-}
-
-jclass GetDoubleClass() {
-    return s_double_class;
-}
-
-jmethodID GetDoubleConstructor() {
-    return s_double_constructor;
-}
-
-jfieldID GetDoubleValueField() {
-    return s_double_value_field;
-}
-
 } // namespace IDCache

 #ifdef __cplusplus
@ -259,31 +207,6 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
    s_pair_second_field = env->GetFieldID(pair_class, "second", "Ljava/lang/Object;");
    env->DeleteLocalRef(pair_class);

-    const jclass overlay_control_data_class =
-        env->FindClass("org/yuzu/yuzu_emu/overlay/model/OverlayControlData");
-    s_overlay_control_data_class =
-        reinterpret_cast<jclass>(env->NewGlobalRef(overlay_control_data_class));
-    s_overlay_control_data_constructor =
-        env->GetMethodID(overlay_control_data_class, "<init>",
-                         "(Ljava/lang/String;ZLkotlin/Pair;Lkotlin/Pair;Lkotlin/Pair;)V");
-    s_overlay_control_data_id_field =
-        env->GetFieldID(overlay_control_data_class, "id", "Ljava/lang/String;");
-    s_overlay_control_data_enabled_field =
-        env->GetFieldID(overlay_control_data_class, "enabled", "Z");
-    s_overlay_control_data_landscape_position_field =
-        env->GetFieldID(overlay_control_data_class, "landscapePosition", "Lkotlin/Pair;");
-    s_overlay_control_data_portrait_position_field =
-        env->GetFieldID(overlay_control_data_class, "portraitPosition", "Lkotlin/Pair;");
-    s_overlay_control_data_foldable_position_field =
-        env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;");
-    env->DeleteLocalRef(overlay_control_data_class);
-
-    const jclass double_class = env->FindClass("java/lang/Double");
-    s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class));
-    s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V");
-    s_double_value_field = env->GetFieldID(double_class, "value", "D");
-    env->DeleteLocalRef(double_class);
-
    // Initialize Android Storage
    Common::FS::Android::RegisterCallbacks(env, s_native_library_class);

@ -308,8 +231,6 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
    env->DeleteGlobalRef(s_game_class);
    env->DeleteGlobalRef(s_string_class);
    env->DeleteGlobalRef(s_pair_class);
-    env->DeleteGlobalRef(s_overlay_control_data_class);
-    env->DeleteGlobalRef(s_double_class);

    // UnInitialize applets
    SoftwareKeyboard::CleanupJNI(env);
--- a/src/android/app/src/main/jni/id_cache.h
+++ b/src/android/app/src/main/jni/id_cache.h
@ -35,16 +35,4 @@ jmethodID GetPairConstructor();
 jfieldID GetPairFirstField();
 jfieldID GetPairSecondField();

-jclass GetOverlayControlDataClass();
-jmethodID GetOverlayControlDataConstructor();
-jfieldID GetOverlayControlDataIdField();
-jfieldID GetOverlayControlDataEnabledField();
-jfieldID GetOverlayControlDataLandscapePositionField();
-jfieldID GetOverlayControlDataPortraitPositionField();
-jfieldID GetOverlayControlDataFoldablePositionField();
-
-jclass GetDoubleClass();
-jmethodID GetDoubleConstructor();
-jfieldID GetDoubleValueField();
-
 } // namespace IDCache
--- a/src/android/app/src/main/jni/native_config.cpp
+++ b/src/android/app/src/main/jni/native_config.cpp
@ -344,74 +344,4 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_setDisabledAddons(JNIEnv* env, j
    Settings::values.disabled_addons[program_id] = disabled_addons;
 }

-jobjectArray Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getOverlayControlData(JNIEnv* env,
-                                                                              jobject obj) {
-    jobjectArray joverlayControlDataArray =
-        env->NewObjectArray(AndroidSettings::values.overlay_control_data.size(),
-                            IDCache::GetOverlayControlDataClass(), nullptr);
-    for (size_t i = 0; i < AndroidSettings::values.overlay_control_data.size(); ++i) {
-        const auto& control_data = AndroidSettings::values.overlay_control_data[i];
-        jobject jlandscapePosition =
-            env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
-                           ToJDouble(env, control_data.landscape_position.first),
-                           ToJDouble(env, control_data.landscape_position.second));
-        jobject jportraitPosition =
-            env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
-                           ToJDouble(env, control_data.portrait_position.first),
-                           ToJDouble(env, control_data.portrait_position.second));
-        jobject jfoldablePosition =
-            env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
-                           ToJDouble(env, control_data.foldable_position.first),
-                           ToJDouble(env, control_data.foldable_position.second));
-
-        jobject jcontrolData = env->NewObject(
-            IDCache::GetOverlayControlDataClass(), IDCache::GetOverlayControlDataConstructor(),
-            ToJString(env, control_data.id), control_data.enabled, jlandscapePosition,
-            jportraitPosition, jfoldablePosition);
-        env->SetObjectArrayElement(joverlayControlDataArray, i, jcontrolData);
-    }
-    return joverlayControlDataArray;
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_setOverlayControlData(
-    JNIEnv* env, jobject obj, jobjectArray joverlayControlDataArray) {
-    AndroidSettings::values.overlay_control_data.clear();
-    int size = env->GetArrayLength(joverlayControlDataArray);
-
-    if (size == 0) {
-        return;
-    }
-
-    for (int i = 0; i < size; ++i) {
-        jobject joverlayControlData = env->GetObjectArrayElement(joverlayControlDataArray, i);
-        jstring jidString = static_cast<jstring>(
-            env->GetObjectField(joverlayControlData, IDCache::GetOverlayControlDataIdField()));
-        bool enabled = static_cast<bool>(env->GetBooleanField(
-            joverlayControlData, IDCache::GetOverlayControlDataEnabledField()));
-
-        jobject jlandscapePosition = env->GetObjectField(
-            joverlayControlData, IDCache::GetOverlayControlDataLandscapePositionField());
-        std::pair<double, double> landscape_position = std::make_pair(
-            GetJDouble(env, env->GetObjectField(jlandscapePosition, IDCache::GetPairFirstField())),
-            GetJDouble(env,
-                       env->GetObjectField(jlandscapePosition, IDCache::GetPairSecondField())));
-
-        jobject jportraitPosition = env->GetObjectField(
-            joverlayControlData, IDCache::GetOverlayControlDataPortraitPositionField());
-        std::pair<double, double> portrait_position = std::make_pair(
-            GetJDouble(env, env->GetObjectField(jportraitPosition, IDCache::GetPairFirstField())),
-            GetJDouble(env, env->GetObjectField(jportraitPosition, IDCache::GetPairSecondField())));
-
-        jobject jfoldablePosition = env->GetObjectField(
-            joverlayControlData, IDCache::GetOverlayControlDataFoldablePositionField());
-        std::pair<double, double> foldable_position = std::make_pair(
-            GetJDouble(env, env->GetObjectField(jfoldablePosition, IDCache::GetPairFirstField())),
-            GetJDouble(env, env->GetObjectField(jfoldablePosition, IDCache::GetPairSecondField())));
-
-        AndroidSettings::values.overlay_control_data.push_back(AndroidSettings::OverlayControlData{
-            GetJString(env, jidString), enabled, landscape_position, portrait_position,
-            foldable_position});
-    }
-}
-
 } // extern "C"
--- a/src/android/app/src/main/res/layout/list_item_setting_switch.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting_switch.xml
@ -24,7 +24,7 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginEnd="24dp"
-                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
                android:orientation="vertical"
                android:layout_weight="1">

--- a/src/android/app/src/main/res/menu/menu_overlay_options.xml
+++ b/src/android/app/src/main/res/menu/menu_overlay_options.xml
@ -38,11 +38,6 @@
        android:title="@string/emulation_haptics"
        android:checkable="true" />

-    <item
-        android:id="@+id/menu_touchscreen"
-        android:title="@string/touchscreen"
-        android:checkable="true" />
-
    <item
        android:id="@+id/menu_reset_overlay"
        android:title="@string/emulation_touch_overlay_reset" />
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@ -212,19 +212,19 @@
        <item>B</item>
        <item>X</item>
        <item>Y</item>
-        <item>+</item>
-        <item>-</item>
-        <item>@string/gamepad_home</item>
-        <item>@string/gamepad_screenshot</item>
        <item>L</item>
        <item>R</item>
        <item>ZL</item>
        <item>ZR</item>
+        <item>+</item>
+        <item>-</item>
+        <item>@string/gamepad_d_pad</item>
        <item>@string/gamepad_left_stick</item>
        <item>@string/gamepad_right_stick</item>
        <item>L3</item>
        <item>R3</item>
-        <item>@string/gamepad_d_pad</item>
+        <item>@string/gamepad_home</item>
+        <item>@string/gamepad_screenshot</item>
    </string-array>

    <string-array name="themeEntries">
@ -267,21 +267,4 @@
        <item>3</item>
    </integer-array>

-    <string-array name="anisoEntries">
-        <item>@string/auto</item>
-        <item>@string/slider_default</item>
-        <item>@string/multiplier_two</item>
-        <item>@string/multiplier_four</item>
-        <item>@string/multiplier_eight</item>
-        <item>@string/multiplier_sixteen</item>
-    </string-array>
-    <integer-array name="anisoValues">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </integer-array>
-
 </resources>
--- a/src/android/app/src/main/res/values/integers.xml
+++ b/src/android/app/src/main/res/values/integers.xml
@ -3,111 +3,111 @@
    <integer name="grid_columns">1</integer>

    <!-- Default SWITCH landscape layout -->
-    <integer name="BUTTON_A_X">760</integer>
-    <integer name="BUTTON_A_Y">790</integer>
-    <integer name="BUTTON_B_X">710</integer>
-    <integer name="BUTTON_B_Y">900</integer>
-    <integer name="BUTTON_X_X">710</integer>
-    <integer name="BUTTON_X_Y">680</integer>
-    <integer name="BUTTON_Y_X">660</integer>
-    <integer name="BUTTON_Y_Y">790</integer>
-    <integer name="BUTTON_PLUS_X">540</integer>
-    <integer name="BUTTON_PLUS_Y">950</integer>
-    <integer name="BUTTON_MINUS_X">460</integer>
-    <integer name="BUTTON_MINUS_Y">950</integer>
-    <integer name="BUTTON_HOME_X">600</integer>
-    <integer name="BUTTON_HOME_Y">950</integer>
-    <integer name="BUTTON_CAPTURE_X">400</integer>
-    <integer name="BUTTON_CAPTURE_Y">950</integer>
-    <integer name="BUTTON_L_X">70</integer>
-    <integer name="BUTTON_L_Y">220</integer>
-    <integer name="BUTTON_R_X">930</integer>
-    <integer name="BUTTON_R_Y">220</integer>
-    <integer name="BUTTON_ZL_X">70</integer>
-    <integer name="BUTTON_ZL_Y">90</integer>
-    <integer name="BUTTON_ZR_X">930</integer>
-    <integer name="BUTTON_ZR_Y">90</integer>
-    <integer name="BUTTON_STICK_L_X">870</integer>
-    <integer name="BUTTON_STICK_L_Y">400</integer>
-    <integer name="BUTTON_STICK_R_X">960</integer>
-    <integer name="BUTTON_STICK_R_Y">430</integer>
-    <integer name="STICK_L_X">100</integer>
-    <integer name="STICK_L_Y">670</integer>
-    <integer name="STICK_R_X">900</integer>
-    <integer name="STICK_R_Y">670</integer>
-    <integer name="COMBINED_DPAD_X">260</integer>
-    <integer name="COMBINED_DPAD_Y">790</integer>
+    <integer name="SWITCH_BUTTON_A_X">760</integer>
+    <integer name="SWITCH_BUTTON_A_Y">790</integer>
+    <integer name="SWITCH_BUTTON_B_X">710</integer>
+    <integer name="SWITCH_BUTTON_B_Y">900</integer>
+    <integer name="SWITCH_BUTTON_X_X">710</integer>
+    <integer name="SWITCH_BUTTON_X_Y">680</integer>
+    <integer name="SWITCH_BUTTON_Y_X">660</integer>
+    <integer name="SWITCH_BUTTON_Y_Y">790</integer>
+    <integer name="SWITCH_STICK_L_X">100</integer>
+    <integer name="SWITCH_STICK_L_Y">670</integer>
+    <integer name="SWITCH_STICK_R_X">900</integer>
+    <integer name="SWITCH_STICK_R_Y">670</integer>
+    <integer name="SWITCH_TRIGGER_L_X">70</integer>
+    <integer name="SWITCH_TRIGGER_L_Y">220</integer>
+    <integer name="SWITCH_TRIGGER_R_X">930</integer>
+    <integer name="SWITCH_TRIGGER_R_Y">220</integer>
+    <integer name="SWITCH_TRIGGER_ZL_X">70</integer>
+    <integer name="SWITCH_TRIGGER_ZL_Y">90</integer>
+    <integer name="SWITCH_TRIGGER_ZR_X">930</integer>
+    <integer name="SWITCH_TRIGGER_ZR_Y">90</integer>
+    <integer name="SWITCH_BUTTON_MINUS_X">460</integer>
+    <integer name="SWITCH_BUTTON_MINUS_Y">950</integer>
+    <integer name="SWITCH_BUTTON_PLUS_X">540</integer>
+    <integer name="SWITCH_BUTTON_PLUS_Y">950</integer>
+    <integer name="SWITCH_BUTTON_HOME_X">600</integer>
+    <integer name="SWITCH_BUTTON_HOME_Y">950</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_X">400</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_Y">950</integer>
+    <integer name="SWITCH_BUTTON_DPAD_X">260</integer>
+    <integer name="SWITCH_BUTTON_DPAD_Y">790</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_X">870</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_Y">400</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_X">960</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_Y">430</integer>

    <!-- Default SWITCH portrait layout -->
-    <integer name="BUTTON_A_X_PORTRAIT">840</integer>
-    <integer name="BUTTON_A_Y_PORTRAIT">840</integer>
-    <integer name="BUTTON_B_X_PORTRAIT">740</integer>
-    <integer name="BUTTON_B_Y_PORTRAIT">880</integer>
-    <integer name="BUTTON_X_X_PORTRAIT">740</integer>
-    <integer name="BUTTON_X_Y_PORTRAIT">800</integer>
-    <integer name="BUTTON_Y_X_PORTRAIT">640</integer>
-    <integer name="BUTTON_Y_Y_PORTRAIT">840</integer>
-    <integer name="BUTTON_PLUS_Y_PORTRAIT">950</integer>
-    <integer name="BUTTON_MINUS_X_PORTRAIT">440</integer>
-    <integer name="BUTTON_MINUS_Y_PORTRAIT">950</integer>
-    <integer name="BUTTON_HOME_X_PORTRAIT">680</integer>
-    <integer name="BUTTON_HOME_Y_PORTRAIT">950</integer>
-    <integer name="BUTTON_CAPTURE_X_PORTRAIT">320</integer>
-    <integer name="BUTTON_CAPTURE_Y_PORTRAIT">950</integer>
-    <integer name="BUTTON_L_X_PORTRAIT">140</integer>
-    <integer name="BUTTON_L_Y_PORTRAIT">260</integer>
-    <integer name="BUTTON_R_X_PORTRAIT">860</integer>
-    <integer name="BUTTON_R_Y_PORTRAIT">260</integer>
-    <integer name="BUTTON_ZL_X_PORTRAIT">140</integer>
-    <integer name="BUTTON_ZL_Y_PORTRAIT">200</integer>
-    <integer name="BUTTON_ZR_X_PORTRAIT">860</integer>
-    <integer name="BUTTON_ZR_Y_PORTRAIT">200</integer>
-    <integer name="BUTTON_PLUS_X_PORTRAIT">560</integer>
-    <integer name="BUTTON_STICK_L_X_PORTRAIT">730</integer>
-    <integer name="BUTTON_STICK_L_Y_PORTRAIT">510</integer>
-    <integer name="BUTTON_STICK_R_X_PORTRAIT">900</integer>
-    <integer name="BUTTON_STICK_R_Y_PORTRAIT">540</integer>
-    <integer name="STICK_L_X_PORTRAIT">180</integer>
-    <integer name="STICK_L_Y_PORTRAIT">660</integer>
-    <integer name="STICK_R_X_PORTRAIT">820</integer>
-    <integer name="STICK_R_Y_PORTRAIT">660</integer>
-    <integer name="COMBINED_DPAD_X_PORTRAIT">240</integer>
-    <integer name="COMBINED_DPAD_Y_PORTRAIT">840</integer>
+    <integer name="SWITCH_BUTTON_A_X_PORTRAIT">840</integer>
+    <integer name="SWITCH_BUTTON_A_Y_PORTRAIT">840</integer>
+    <integer name="SWITCH_BUTTON_B_X_PORTRAIT">740</integer>
+    <integer name="SWITCH_BUTTON_B_Y_PORTRAIT">880</integer>
+    <integer name="SWITCH_BUTTON_X_X_PORTRAIT">740</integer>
+    <integer name="SWITCH_BUTTON_X_Y_PORTRAIT">800</integer>
+    <integer name="SWITCH_BUTTON_Y_X_PORTRAIT">640</integer>
+    <integer name="SWITCH_BUTTON_Y_Y_PORTRAIT">840</integer>
+    <integer name="SWITCH_STICK_L_X_PORTRAIT">180</integer>
+    <integer name="SWITCH_STICK_L_Y_PORTRAIT">660</integer>
+    <integer name="SWITCH_STICK_R_X_PORTRAIT">820</integer>
+    <integer name="SWITCH_STICK_R_Y_PORTRAIT">660</integer>
+    <integer name="SWITCH_TRIGGER_L_X_PORTRAIT">140</integer>
+    <integer name="SWITCH_TRIGGER_L_Y_PORTRAIT">260</integer>
+    <integer name="SWITCH_TRIGGER_R_X_PORTRAIT">860</integer>
+    <integer name="SWITCH_TRIGGER_R_Y_PORTRAIT">260</integer>
+    <integer name="SWITCH_TRIGGER_ZL_X_PORTRAIT">140</integer>
+    <integer name="SWITCH_TRIGGER_ZL_Y_PORTRAIT">200</integer>
+    <integer name="SWITCH_TRIGGER_ZR_X_PORTRAIT">860</integer>
+    <integer name="SWITCH_TRIGGER_ZR_Y_PORTRAIT">200</integer>
+    <integer name="SWITCH_BUTTON_MINUS_X_PORTRAIT">440</integer>
+    <integer name="SWITCH_BUTTON_MINUS_Y_PORTRAIT">950</integer>
+    <integer name="SWITCH_BUTTON_PLUS_X_PORTRAIT">560</integer>
+    <integer name="SWITCH_BUTTON_PLUS_Y_PORTRAIT">950</integer>
+    <integer name="SWITCH_BUTTON_HOME_X_PORTRAIT">680</integer>
+    <integer name="SWITCH_BUTTON_HOME_Y_PORTRAIT">950</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_X_PORTRAIT">320</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_Y_PORTRAIT">950</integer>
+    <integer name="SWITCH_BUTTON_DPAD_X_PORTRAIT">240</integer>
+    <integer name="SWITCH_BUTTON_DPAD_Y_PORTRAIT">840</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_X_PORTRAIT">730</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_Y_PORTRAIT">510</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_X_PORTRAIT">900</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_Y_PORTRAIT">540</integer>

    <!-- Default SWITCH foldable layout -->
-    <integer name="BUTTON_A_X_FOLDABLE">840</integer>
-    <integer name="BUTTON_A_Y_FOLDABLE">390</integer>
-    <integer name="BUTTON_B_X_FOLDABLE">740</integer>
-    <integer name="BUTTON_B_Y_FOLDABLE">430</integer>
-    <integer name="BUTTON_X_X_FOLDABLE">740</integer>
-    <integer name="BUTTON_X_Y_FOLDABLE">350</integer>
-    <integer name="BUTTON_Y_X_FOLDABLE">640</integer>
-    <integer name="BUTTON_Y_Y_FOLDABLE">390</integer>
-    <integer name="BUTTON_PLUS_X_FOLDABLE">560</integer>
-    <integer name="BUTTON_PLUS_Y_FOLDABLE">470</integer>
-    <integer name="BUTTON_MINUS_X_FOLDABLE">440</integer>
-    <integer name="BUTTON_MINUS_Y_FOLDABLE">470</integer>
-    <integer name="BUTTON_HOME_X_FOLDABLE">680</integer>
-    <integer name="BUTTON_HOME_Y_FOLDABLE">470</integer>
-    <integer name="BUTTON_CAPTURE_X_FOLDABLE">320</integer>
-    <integer name="BUTTON_CAPTURE_Y_FOLDABLE">470</integer>
-    <integer name="BUTTON_L_X_FOLDABLE">140</integer>
-    <integer name="BUTTON_L_Y_FOLDABLE">130</integer>
-    <integer name="BUTTON_R_X_FOLDABLE">860</integer>
-    <integer name="BUTTON_R_Y_FOLDABLE">130</integer>
-    <integer name="BUTTON_ZL_X_FOLDABLE">140</integer>
-    <integer name="BUTTON_ZL_Y_FOLDABLE">70</integer>
-    <integer name="BUTTON_ZR_X_FOLDABLE">860</integer>
-    <integer name="BUTTON_ZR_Y_FOLDABLE">70</integer>
-    <integer name="BUTTON_STICK_L_X_FOLDABLE">550</integer>
-    <integer name="BUTTON_STICK_L_Y_FOLDABLE">210</integer>
-    <integer name="BUTTON_STICK_R_X_FOLDABLE">550</integer>
-    <integer name="BUTTON_STICK_R_Y_FOLDABLE">280</integer>
-    <integer name="STICK_L_X_FOLDABLE">180</integer>
-    <integer name="STICK_L_Y_FOLDABLE">250</integer>
-    <integer name="STICK_R_X_FOLDABLE">820</integer>
-    <integer name="STICK_R_Y_FOLDABLE">250</integer>
-    <integer name="COMBINED_DPAD_X_FOLDABLE">240</integer>
-    <integer name="COMBINED_DPAD_Y_FOLDABLE">390</integer>
+    <integer name="SWITCH_BUTTON_A_X_FOLDABLE">840</integer>
+    <integer name="SWITCH_BUTTON_A_Y_FOLDABLE">390</integer>
+    <integer name="SWITCH_BUTTON_B_X_FOLDABLE">740</integer>
+    <integer name="SWITCH_BUTTON_B_Y_FOLDABLE">430</integer>
+    <integer name="SWITCH_BUTTON_X_X_FOLDABLE">740</integer>
+    <integer name="SWITCH_BUTTON_X_Y_FOLDABLE">350</integer>
+    <integer name="SWITCH_BUTTON_Y_X_FOLDABLE">640</integer>
+    <integer name="SWITCH_BUTTON_Y_Y_FOLDABLE">390</integer>
+    <integer name="SWITCH_STICK_L_X_FOLDABLE">180</integer>
+    <integer name="SWITCH_STICK_L_Y_FOLDABLE">250</integer>
+    <integer name="SWITCH_STICK_R_X_FOLDABLE">820</integer>
+    <integer name="SWITCH_STICK_R_Y_FOLDABLE">250</integer>
+    <integer name="SWITCH_TRIGGER_L_X_FOLDABLE">140</integer>
+    <integer name="SWITCH_TRIGGER_L_Y_FOLDABLE">130</integer>
+    <integer name="SWITCH_TRIGGER_R_X_FOLDABLE">860</integer>
+    <integer name="SWITCH_TRIGGER_R_Y_FOLDABLE">130</integer>
+    <integer name="SWITCH_TRIGGER_ZL_X_FOLDABLE">140</integer>
+    <integer name="SWITCH_TRIGGER_ZL_Y_FOLDABLE">70</integer>
+    <integer name="SWITCH_TRIGGER_ZR_X_FOLDABLE">860</integer>
+    <integer name="SWITCH_TRIGGER_ZR_Y_FOLDABLE">70</integer>
+    <integer name="SWITCH_BUTTON_MINUS_X_FOLDABLE">440</integer>
+    <integer name="SWITCH_BUTTON_MINUS_Y_FOLDABLE">470</integer>
+    <integer name="SWITCH_BUTTON_PLUS_X_FOLDABLE">560</integer>
+    <integer name="SWITCH_BUTTON_PLUS_Y_FOLDABLE">470</integer>
+    <integer name="SWITCH_BUTTON_HOME_X_FOLDABLE">680</integer>
+    <integer name="SWITCH_BUTTON_HOME_Y_FOLDABLE">470</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_X_FOLDABLE">320</integer>
+    <integer name="SWITCH_BUTTON_CAPTURE_Y_FOLDABLE">470</integer>
+    <integer name="SWITCH_BUTTON_DPAD_X_FOLDABLE">240</integer>
+    <integer name="SWITCH_BUTTON_DPAD_Y_FOLDABLE">390</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_X_FOLDABLE">550</integer>
+    <integer name="SWITCH_BUTTON_STICK_L_Y_FOLDABLE">210</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_X_FOLDABLE">550</integer>
+    <integer name="SWITCH_BUTTON_STICK_R_Y_FOLDABLE">280</integer>

 </resources>
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -225,8 +225,6 @@
    <string name="renderer_reactive_flushing_description">Improves rendering accuracy in some games at the cost of performance.</string>
    <string name="use_disk_shader_cache">Disk shader cache</string>
    <string name="use_disk_shader_cache_description">Reduces stuttering by locally storing and loading generated shaders.</string>
-    <string name="anisotropic_filtering">Anisotropic filtering</string>
-    <string name="anisotropic_filtering_description">Improves the quality of textures when viewed at oblique angles</string>

    <!-- Debug settings strings -->
    <string name="cpu">CPU</string>
@ -366,7 +364,6 @@
    <string name="emulation_pause">Pause emulation</string>
    <string name="emulation_unpause">Unpause emulation</string>
    <string name="emulation_input_overlay">Overlay options</string>
-    <string name="touchscreen">Touchscreen</string>

    <string name="load_settings">Loading settings…</string>

@ -509,12 +506,6 @@
    <string name="oboe">oboe</string>
    <string name="cubeb">cubeb</string>

-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">2x</string>
-    <string name="multiplier_four">4x</string>
-    <string name="multiplier_eight">8x</string>
-    <string name="multiplier_sixteen">16x</string>
-
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Black backgrounds</string>
    <string name="use_black_backgrounds_description">When using the dark theme, apply black backgrounds.</string>
--- a/src/android/build.gradle.kts
+++ b/src/android/build.gradle.kts
@ -5,7 +5,7 @@
 plugins {
    id("com.android.application") version "8.1.2" apply false
    id("com.android.library") version "8.1.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.20" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.21" apply false
 }

 tasks.register("clean").configure {
--- a/src/audio_core/device/device_session.cpp
+++ b/src/audio_core/device/device_session.cpp
@ -18,7 +18,9 @@ constexpr auto INCREMENT_TIME{5ms};
 DeviceSession::DeviceSession(Core::System& system_)
    : system{system_}, thread_event{Core::Timing::CreateEvent(
                           "AudioOutSampleTick",
-                           [this](s64 time, std::chrono::nanoseconds) { return ThreadFunc(); })} {}
+                           [this](std::uintptr_t, s64 time, std::chrono::nanoseconds) {
+                               return ThreadFunc();
+                           })} {}

 DeviceSession::~DeviceSession() {
    Finalize();
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@ -199,8 +199,6 @@ const char* TranslateCategory(Category category) {
    case Category::CpuDebug:
    case Category::CpuUnsafe:
        return "Cpu";
-    case Category::Overlay:
-        return "Overlay";
    case Category::Renderer:
    case Category::RendererAdvanced:
    case Category::RendererDebug:
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@ -18,7 +18,6 @@ enum class Category : u32 {
    Cpu,
    CpuDebug,
    CpuUnsafe,
-    Overlay,
    Renderer,
    RendererAdvanced,
    RendererDebug,
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -988,8 +988,6 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
        arm/dynarmic/dynarmic_cp15.h
        arm/dynarmic/dynarmic_exclusive_monitor.cpp
        arm/dynarmic/dynarmic_exclusive_monitor.h
-        hle/service/jit/jit_code_memory.cpp
-        hle/service/jit/jit_code_memory.h
        hle/service/jit/jit_context.cpp
        hle/service/jit/jit_context.h
        hle/service/jit/jit.cpp
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@ -29,6 +29,7 @@ std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callbac
 struct CoreTiming::Event {
    s64 time;
    u64 fifo_order;
+    std::uintptr_t user_data;
    std::weak_ptr<EventType> type;
    s64 reschedule_time;
    heap_t::handle_type handle{};
@ -66,15 +67,17 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
    event_fifo_id = 0;
    shutting_down = false;
    cpu_ticks = 0;
+    const auto empty_timed_callback = [](std::uintptr_t, u64, std::chrono::nanoseconds)
+        -> std::optional<std::chrono::nanoseconds> { return std::nullopt; };
+    ev_lost = CreateEvent("_lost_event", empty_timed_callback);
    if (is_multicore) {
        timer_thread = std::make_unique<std::jthread>(ThreadEntry, std::ref(*this));
    }
 }

 void CoreTiming::ClearPendingEvents() {
-    std::scoped_lock lock{advance_lock, basic_lock};
+    std::scoped_lock lock{basic_lock};
    event_queue.clear();
-    event.Set();
 }

 void CoreTiming::Pause(bool is_paused) {
@ -116,12 +119,14 @@ bool CoreTiming::HasPendingEvents() const {
 }

 void CoreTiming::ScheduleEvent(std::chrono::nanoseconds ns_into_future,
-                               const std::shared_ptr<EventType>& event_type, bool absolute_time) {
+                               const std::shared_ptr<EventType>& event_type,
+                               std::uintptr_t user_data, bool absolute_time) {
    {
        std::scoped_lock scope{basic_lock};
        const auto next_time{absolute_time ? ns_into_future : GetGlobalTimeNs() + ns_into_future};

-        auto h{event_queue.emplace(Event{next_time.count(), event_fifo_id++, event_type, 0})};
+        auto h{event_queue.emplace(
+            Event{next_time.count(), event_fifo_id++, user_data, event_type, 0})};
        (*h).handle = h;
    }

@ -131,13 +136,13 @@ void CoreTiming::ScheduleEvent(std::chrono::nanoseconds ns_into_future,
 void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
                                      std::chrono::nanoseconds resched_time,
                                      const std::shared_ptr<EventType>& event_type,
-                                      bool absolute_time) {
+                                      std::uintptr_t user_data, bool absolute_time) {
    {
        std::scoped_lock scope{basic_lock};
        const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time};

-        auto h{event_queue.emplace(
-            Event{next_time.count(), event_fifo_id++, event_type, resched_time.count()})};
+        auto h{event_queue.emplace(Event{next_time.count(), event_fifo_id++, user_data, event_type,
+                                         resched_time.count()})};
        (*h).handle = h;
    }

@ -145,14 +150,14 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
 }

 void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
-                                 UnscheduleEventType type) {
+                                 std::uintptr_t user_data, bool wait) {
    {
        std::scoped_lock lk{basic_lock};

        std::vector<heap_t::handle_type> to_remove;
        for (auto itr = event_queue.begin(); itr != event_queue.end(); itr++) {
            const Event& e = *itr;
-            if (e.type.lock().get() == event_type.get()) {
+            if (e.type.lock().get() == event_type.get() && e.user_data == user_data) {
                to_remove.push_back(itr->handle);
            }
        }
@ -160,12 +165,10 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
        for (auto h : to_remove) {
            event_queue.erase(h);
        }
-
-        event_type->sequence_number++;
    }

    // Force any in-progress events to finish
-    if (type == UnscheduleEventType::Wait) {
+    if (wait) {
        std::scoped_lock lk{advance_lock};
    }
 }
@ -205,31 +208,28 @@ std::optional<s64> CoreTiming::Advance() {
        const Event& evt = event_queue.top();

        if (const auto event_type{evt.type.lock()}) {
-            const auto evt_time = evt.time;
-            const auto evt_sequence_num = event_type->sequence_number;
-
            if (evt.reschedule_time == 0) {
+                const auto evt_user_data = evt.user_data;
+                const auto evt_time = evt.time;
+
                event_queue.pop();

                basic_lock.unlock();

                event_type->callback(
-                    evt_time, std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt_time});
+                    evt_user_data, evt_time,
+                    std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt_time});

                basic_lock.lock();
            } else {
                basic_lock.unlock();

                const auto new_schedule_time{event_type->callback(
-                    evt_time, std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt_time})};
+                    evt.user_data, evt.time,
+                    std::chrono::nanoseconds{GetGlobalTimeNs().count() - evt.time})};

                basic_lock.lock();

-                if (evt_sequence_num != event_type->sequence_number) {
-                    // Heap handle is invalidated after external modification.
-                    continue;
-                }
-
                const auto next_schedule_time{new_schedule_time.has_value()
                                                  ? new_schedule_time.value().count()
                                                  : evt.reschedule_time};
@ -241,8 +241,8 @@ std::optional<s64> CoreTiming::Advance() {
                    next_time = pause_end_time + next_schedule_time;
                }

-                event_queue.update(evt.handle, Event{next_time, event_fifo_id++, evt.type,
-                                                     next_schedule_time, evt.handle});
+                event_queue.update(evt.handle, Event{next_time, event_fifo_id++, evt.user_data,
+                                                     evt.type, next_schedule_time, evt.handle});
            }
        }

--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@ -22,25 +22,17 @@ namespace Core::Timing {

 /// A callback that may be scheduled for a particular core timing event.
 using TimedCallback = std::function<std::optional<std::chrono::nanoseconds>(
-    s64 time, std::chrono::nanoseconds ns_late)>;
+    std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)>;

 /// Contains the characteristics of a particular event.
 struct EventType {
    explicit EventType(TimedCallback&& callback_, std::string&& name_)
-        : callback{std::move(callback_)}, name{std::move(name_)}, sequence_number{0} {}
+        : callback{std::move(callback_)}, name{std::move(name_)} {}

    /// The event's callback function.
    TimedCallback callback;
    /// A pointer to the name of the event.
    const std::string name;
-    /// A monotonic sequence number, incremented when this event is
-    /// changed externally.
-    size_t sequence_number;
-};
-
-enum class UnscheduleEventType {
-    Wait,
-    NoWait,
 };

 /**
@ -97,17 +89,23 @@ public:

    /// Schedules an event in core timing
    void ScheduleEvent(std::chrono::nanoseconds ns_into_future,
-                       const std::shared_ptr<EventType>& event_type, bool absolute_time = false);
+                       const std::shared_ptr<EventType>& event_type, std::uintptr_t user_data = 0,
+                       bool absolute_time = false);

    /// Schedules an event which will automatically re-schedule itself with the given time, until
    /// unscheduled
    void ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
                              std::chrono::nanoseconds resched_time,
                              const std::shared_ptr<EventType>& event_type,
-                              bool absolute_time = false);
+                              std::uintptr_t user_data = 0, bool absolute_time = false);

-    void UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
-                         UnscheduleEventType type = UnscheduleEventType::Wait);
+    void UnscheduleEvent(const std::shared_ptr<EventType>& event_type, std::uintptr_t user_data,
+                         bool wait = true);
+
+    void UnscheduleEventWithoutWait(const std::shared_ptr<EventType>& event_type,
+                                    std::uintptr_t user_data) {
+        UnscheduleEvent(event_type, user_data, false);
+    }

    void AddTicks(u64 ticks_to_add);

@ -160,6 +158,7 @@ private:
    heap_t event_queue;
    u64 event_fifo_id = 0;

+    std::shared_ptr<EventType> ev_lost;
    Common::Event event{};
    Common::Event pause_event{};
    mutable std::mutex basic_lock;
--- a/src/core/file_sys/ips_layer.cpp
+++ b/src/core/file_sys/ips_layer.cpp
@ -73,9 +73,6 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) {
        return nullptr;

    auto in_data = in->ReadAllBytes();
-    if (in_data.size() == 0) {
-        return nullptr;
-    }

    std::vector<u8> temp(type == IPSFileType::IPS ? 3 : 4);
    u64 offset = 5; // After header
@ -91,10 +88,6 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) {
        else
            real_offset = (temp[0] << 16) | (temp[1] << 8) | temp[2];

-        if (real_offset > in_data.size()) {
-            return nullptr;
-        }
-
        u16 data_size{};
        if (ips->ReadObject(&data_size, offset) != sizeof(u16))
            return nullptr;
--- a/src/core/hle/kernel/k_capabilities.cpp
+++ b/src/core/hle/kernel/k_capabilities.cpp
@ -185,10 +185,6 @@ Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) {
        case RegionType::NoMapping:
            break;
        case RegionType::KernelTraceBuffer:
-            if constexpr (!IsKTraceEnabled) {
-                break;
-            }
-            [[fallthrough]];
        case RegionType::OnMemoryBootImage:
        case RegionType::DTB:
            R_TRY(f(MemoryRegions[static_cast<u32>(type)], perm));
@ -334,6 +330,8 @@ Result KCapabilities::SetCapabilities(std::span<const u32> caps, KProcessPageTab

            // Map the range.
            R_TRY(this->MapRange_(cap, size_cap, page_table));
+        } else if (GetCapabilityType(cap) == CapabilityType::MapRegion && !IsKTraceEnabled) {
+            continue;
        } else {
            R_TRY(this->SetCapability(cap, set_flags, set_svc, page_table));
        }
--- a/src/core/hle/kernel/k_hardware_timer.cpp
+++ b/src/core/hle/kernel/k_hardware_timer.cpp
@ -10,15 +10,15 @@ namespace Kernel {

 void KHardwareTimer::Initialize() {
    // Create the timing callback to register with CoreTiming.
-    m_event_type = Core::Timing::CreateEvent("KHardwareTimer::Callback",
-                                             [this](s64, std::chrono::nanoseconds) {
-                                                 this->DoTask();
-                                                 return std::nullopt;
-                                             });
+    m_event_type = Core::Timing::CreateEvent(
+        "KHardwareTimer::Callback", [](std::uintptr_t timer_handle, s64, std::chrono::nanoseconds) {
+            reinterpret_cast<KHardwareTimer*>(timer_handle)->DoTask();
+            return std::nullopt;
+        });
 }

 void KHardwareTimer::Finalize() {
-    m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type);
+    m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type, reinterpret_cast<uintptr_t>(this));
    m_wakeup_time = std::numeric_limits<s64>::max();
    m_event_type.reset();
 }
@ -57,12 +57,13 @@ void KHardwareTimer::EnableInterrupt(s64 wakeup_time) {

    m_wakeup_time = wakeup_time;
    m_kernel.System().CoreTiming().ScheduleEvent(std::chrono::nanoseconds{m_wakeup_time},
-                                                 m_event_type, true);
+                                                 m_event_type, reinterpret_cast<uintptr_t>(this),
+                                                 true);
 }

 void KHardwareTimer::DisableInterrupt() {
-    m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type,
-                                                   Core::Timing::UnscheduleEventType::NoWait);
+    m_kernel.System().CoreTiming().UnscheduleEventWithoutWait(m_event_type,
+                                                              reinterpret_cast<uintptr_t>(this));
    m_wakeup_time = std::numeric_limits<s64>::max();
 }

--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@ -238,7 +238,7 @@ struct KernelCore::Impl {
    void InitializePreemption(KernelCore& kernel) {
        preemption_event = Core::Timing::CreateEvent(
            "PreemptionCallback",
-            [this, &kernel](s64 time,
+            [this, &kernel](std::uintptr_t, s64 time,
                            std::chrono::nanoseconds) -> std::optional<std::chrono::nanoseconds> {
                {
                    KScopedSchedulerLock lock(kernel);
--- a/src/core/hle/service/hid/hidbus.cpp
+++ b/src/core/hle/service/hid/hidbus.cpp
@ -49,10 +49,10 @@ HidBus::HidBus(Core::System& system_)
    // Register update callbacks
    hidbus_update_event = Core::Timing::CreateEvent(
        "Hidbus::UpdateCallback",
-        [this](s64 time,
+        [this](std::uintptr_t user_data, s64 time,
               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
            const auto guard = LockService();
-            UpdateHidbus(ns_late);
+            UpdateHidbus(user_data, ns_late);
            return std::nullopt;
        });

@ -61,10 +61,10 @@ HidBus::HidBus(Core::System& system_)
 }

 HidBus::~HidBus() {
-    system.CoreTiming().UnscheduleEvent(hidbus_update_event);
+    system.CoreTiming().UnscheduleEvent(hidbus_update_event, 0);
 }

-void HidBus::UpdateHidbus(std::chrono::nanoseconds ns_late) {
+void HidBus::UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
    if (is_hidbus_enabled) {
        for (std::size_t i = 0; i < devices.size(); ++i) {
            if (!devices[i].is_device_initializated) {
--- a/src/core/hle/service/hid/hidbus.h
+++ b/src/core/hle/service/hid/hidbus.h
@ -108,7 +108,7 @@ private:
    void DisableJoyPollingReceiveMode(HLERequestContext& ctx);
    void SetStatusManagerType(HLERequestContext& ctx);

-    void UpdateHidbus(std::chrono::nanoseconds ns_late);
+    void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
    std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const;

    template <typename T>
--- a/src/core/hle/service/hid/resource_manager.cpp
+++ b/src/core/hle/service/hid/resource_manager.cpp
@ -227,7 +227,8 @@ void ResourceManager::EnableTouchScreen(u64 aruid, bool is_enabled) {
    applet_resource->EnableTouchScreen(aruid, is_enabled);
 }

-void ResourceManager::UpdateControllers(std::chrono::nanoseconds ns_late) {
+void ResourceManager::UpdateControllers(std::uintptr_t user_data,
+                                        std::chrono::nanoseconds ns_late) {
    auto& core_timing = system.CoreTiming();
    debug_pad->OnUpdate(core_timing);
    digitizer->OnUpdate(core_timing);
@ -240,19 +241,20 @@ void ResourceManager::UpdateControllers(std::chrono::nanoseconds ns_late) {
    capture_button->OnUpdate(core_timing);
 }

-void ResourceManager::UpdateNpad(std::chrono::nanoseconds ns_late) {
+void ResourceManager::UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
    auto& core_timing = system.CoreTiming();
    npad->OnUpdate(core_timing);
 }

-void ResourceManager::UpdateMouseKeyboard(std::chrono::nanoseconds ns_late) {
+void ResourceManager::UpdateMouseKeyboard(std::uintptr_t user_data,
+                                          std::chrono::nanoseconds ns_late) {
    auto& core_timing = system.CoreTiming();
    mouse->OnUpdate(core_timing);
    debug_mouse->OnUpdate(core_timing);
    keyboard->OnUpdate(core_timing);
 }

-void ResourceManager::UpdateMotion(std::chrono::nanoseconds ns_late) {
+void ResourceManager::UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
    auto& core_timing = system.CoreTiming();
    six_axis->OnUpdate(core_timing);
    seven_six_axis->OnUpdate(core_timing);
@ -271,34 +273,34 @@ IAppletResource::IAppletResource(Core::System& system_, std::shared_ptr<Resource
    // Register update callbacks
    npad_update_event = Core::Timing::CreateEvent(
        "HID::UpdatePadCallback",
-        [this, resource](
-            s64 time, std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
+            -> std::optional<std::chrono::nanoseconds> {
            const auto guard = LockService();
-            resource->UpdateNpad(ns_late);
+            resource->UpdateNpad(user_data, ns_late);
            return std::nullopt;
        });
    default_update_event = Core::Timing::CreateEvent(
        "HID::UpdateDefaultCallback",
-        [this, resource](
-            s64 time, std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
+            -> std::optional<std::chrono::nanoseconds> {
            const auto guard = LockService();
-            resource->UpdateControllers(ns_late);
+            resource->UpdateControllers(user_data, ns_late);
            return std::nullopt;
        });
    mouse_keyboard_update_event = Core::Timing::CreateEvent(
        "HID::UpdateMouseKeyboardCallback",
-        [this, resource](
-            s64 time, std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
+            -> std::optional<std::chrono::nanoseconds> {
            const auto guard = LockService();
-            resource->UpdateMouseKeyboard(ns_late);
+            resource->UpdateMouseKeyboard(user_data, ns_late);
            return std::nullopt;
        });
    motion_update_event = Core::Timing::CreateEvent(
        "HID::UpdateMotionCallback",
-        [this, resource](
-            s64 time, std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+        [this, resource](std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)
+            -> std::optional<std::chrono::nanoseconds> {
            const auto guard = LockService();
-            resource->UpdateMotion(ns_late);
+            resource->UpdateMotion(user_data, ns_late);
            return std::nullopt;
        });

@ -312,10 +314,10 @@ IAppletResource::IAppletResource(Core::System& system_, std::shared_ptr<Resource
 }

 IAppletResource::~IAppletResource() {
-    system.CoreTiming().UnscheduleEvent(npad_update_event);
-    system.CoreTiming().UnscheduleEvent(default_update_event);
-    system.CoreTiming().UnscheduleEvent(mouse_keyboard_update_event);
-    system.CoreTiming().UnscheduleEvent(motion_update_event);
+    system.CoreTiming().UnscheduleEvent(npad_update_event, 0);
+    system.CoreTiming().UnscheduleEvent(default_update_event, 0);
+    system.CoreTiming().UnscheduleEvent(mouse_keyboard_update_event, 0);
+    system.CoreTiming().UnscheduleEvent(motion_update_event, 0);
    resource_manager->FreeAppletResourceId(aruid);
 }

--- a/src/core/hle/service/hid/resource_manager.h
+++ b/src/core/hle/service/hid/resource_manager.h
@ -81,10 +81,10 @@ public:
    void EnablePadInput(u64 aruid, bool is_enabled);
    void EnableTouchScreen(u64 aruid, bool is_enabled);

-    void UpdateControllers(std::chrono::nanoseconds ns_late);
-    void UpdateNpad(std::chrono::nanoseconds ns_late);
-    void UpdateMouseKeyboard(std::chrono::nanoseconds ns_late);
-    void UpdateMotion(std::chrono::nanoseconds ns_late);
+    void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
+    void UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
+    void UpdateMouseKeyboard(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
+    void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);

 private:
    Result CreateAppletResourceImpl(u64 aruid);
--- a/src/core/hle/service/jit/jit.cpp
+++ b/src/core/hle/service/jit/jit.cpp
@ -4,11 +4,11 @@
 #include "core/arm/debug.h"
 #include "core/arm/symbols.h"
 #include "core/core.h"
+#include "core/hle/kernel/k_code_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/result.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/jit/jit.h"
-#include "core/hle/service/jit/jit_code_memory.h"
 #include "core/hle/service/jit/jit_context.h"
 #include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
@ -23,12 +23,10 @@ struct CodeRange {

 class IJitEnvironment final : public ServiceFramework<IJitEnvironment> {
 public:
-    explicit IJitEnvironment(Core::System& system_,
-                             Kernel::KScopedAutoObject<Kernel::KProcess>&& process_,
-                             CodeMemory&& user_rx_, CodeMemory&& user_ro_)
-        : ServiceFramework{system_, "IJitEnvironment"}, process{std::move(process_)},
-          user_rx{std::move(user_rx_)}, user_ro{std::move(user_ro_)},
-          context{system_.ApplicationMemory()} {
+    explicit IJitEnvironment(Core::System& system_, Kernel::KProcess& process_, CodeRange user_rx,
+                             CodeRange user_ro)
+        : ServiceFramework{system_, "IJitEnvironment"}, process{&process_},
+          context{process->GetMemory()} {
        // clang-format off
        static const FunctionInfo functions[] = {
            {0, &IJitEnvironment::GenerateCode, "GenerateCode"},
@ -41,13 +39,10 @@ public:
        RegisterHandlers(functions);

        // Identity map user code range into sysmodule context
-        configuration.user_rx_memory.size = user_rx.GetSize();
-        configuration.user_rx_memory.offset = user_rx.GetAddress();
-        configuration.user_ro_memory.size = user_ro.GetSize();
-        configuration.user_ro_memory.offset = user_ro.GetAddress();
-
-        configuration.sys_rx_memory = configuration.user_rx_memory;
-        configuration.sys_ro_memory = configuration.user_ro_memory;
+        configuration.user_ro_memory = user_ro;
+        configuration.user_rx_memory = user_rx;
+        configuration.sys_ro_memory = user_ro;
+        configuration.sys_rx_memory = user_rx;
    }

    void GenerateCode(HLERequestContext& ctx) {
@ -323,8 +318,6 @@ private:
    }

    Kernel::KScopedAutoObject<Kernel::KProcess> process;
-    CodeMemory user_rx;
-    CodeMemory user_ro;
    GuestCallbacks callbacks;
    JITConfiguration configuration;
    JITContext context;
@ -342,7 +335,6 @@ public:
        RegisterHandlers(functions);
    }

-private:
    void CreateJitEnvironment(HLERequestContext& ctx) {
        LOG_DEBUG(Service_JIT, "called");

@ -388,35 +380,20 @@ private:
            return;
        }

-        CodeMemory rx, ro;
-        Result res;
+        const CodeRange user_rx{
+            .offset = GetInteger(rx_mem->GetSourceAddress()),
+            .size = parameters.rx_size,
+        };

-        res = rx.Initialize(*process, *rx_mem, parameters.rx_size,
-                            Kernel::Svc::MemoryPermission::ReadExecute, generate_random);
-        if (R_FAILED(res)) {
-            LOG_ERROR(Service_JIT, "rx_mem could not be mapped for handle=0x{:08X}", rx_mem_handle);
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(res);
-            return;
-        }
-
-        res = ro.Initialize(*process, *ro_mem, parameters.ro_size,
-                            Kernel::Svc::MemoryPermission::Read, generate_random);
-        if (R_FAILED(res)) {
-            LOG_ERROR(Service_JIT, "ro_mem could not be mapped for handle=0x{:08X}", ro_mem_handle);
-            IPC::ResponseBuilder rb{ctx, 2};
-            rb.Push(res);
-            return;
-        }
+        const CodeRange user_ro{
+            .offset = GetInteger(ro_mem->GetSourceAddress()),
+            .size = parameters.ro_size,
+        };

        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IJitEnvironment>(system, std::move(process), std::move(rx),
-                                             std::move(ro));
+        rb.PushIpcInterface<IJitEnvironment>(system, *process, user_rx, user_ro);
    }
-
-private:
-    std::mt19937_64 generate_random{};
 };

 void LoopProcess(Core::System& system) {
--- a/src/core/hle/service/jit/jit_code_memory.cpp
+++ b/src/core/hle/service/jit/jit_code_memory.cpp
@ -1,54 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/jit/jit_code_memory.h"
-
-namespace Service::JIT {
-
-Result CodeMemory::Initialize(Kernel::KProcess& process, Kernel::KCodeMemory& code_memory,
-                              size_t size, Kernel::Svc::MemoryPermission perm,
-                              std::mt19937_64& generate_random) {
-    auto& page_table = process.GetPageTable();
-    const u64 alias_code_start =
-        GetInteger(page_table.GetAliasCodeRegionStart()) / Kernel::PageSize;
-    const u64 alias_code_size = page_table.GetAliasCodeRegionSize() / Kernel::PageSize;
-
-    // NOTE: This will retry indefinitely until mapping the code memory succeeds.
-    while (true) {
-        // Generate a new trial address.
-        const u64 mapped_address =
-            (alias_code_start + (generate_random() % alias_code_size)) * Kernel::PageSize;
-
-        // Try to map the address
-        R_TRY_CATCH(code_memory.MapToOwner(mapped_address, size, perm)) {
-            R_CATCH(Kernel::ResultInvalidMemoryRegion) {
-                // If we could not map here, retry.
-                continue;
-            }
-        }
-        R_END_TRY_CATCH;
-
-        // Set members.
-        m_code_memory = std::addressof(code_memory);
-        m_size = size;
-        m_address = mapped_address;
-        m_perm = perm;
-
-        // Open a new reference to the code memory.
-        m_code_memory->Open();
-
-        // We succeeded.
-        R_SUCCEED();
-    }
-}
-
-void CodeMemory::Finalize() {
-    if (m_code_memory) {
-        R_ASSERT(m_code_memory->UnmapFromOwner(m_address, m_size));
-        m_code_memory->Close();
-    }
-
-    m_code_memory = nullptr;
-}
-
-} // namespace Service::JIT
--- a/src/core/hle/service/jit/jit_code_memory.h
+++ b/src/core/hle/service/jit/jit_code_memory.h
@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <random>
-
-#include "core/hle/kernel/k_code_memory.h"
-
-namespace Service::JIT {
-
-class CodeMemory {
-public:
-    YUZU_NON_COPYABLE(CodeMemory);
-
-    explicit CodeMemory() = default;
-
-    CodeMemory(CodeMemory&& rhs) {
-        std::swap(m_code_memory, rhs.m_code_memory);
-        std::swap(m_size, rhs.m_size);
-        std::swap(m_address, rhs.m_address);
-        std::swap(m_perm, rhs.m_perm);
-    }
-
-    ~CodeMemory() {
-        this->Finalize();
-    }
-
-public:
-    Result Initialize(Kernel::KProcess& process, Kernel::KCodeMemory& code_memory, size_t size,
-                      Kernel::Svc::MemoryPermission perm, std::mt19937_64& generate_random);
-    void Finalize();
-
-    size_t GetSize() const {
-        return m_size;
-    }
-
-    u64 GetAddress() const {
-        return m_address;
-    }
-
-private:
-    Kernel::KCodeMemory* m_code_memory{};
-    size_t m_size{};
-    u64 m_address{};
-    Kernel::Svc::MemoryPermission m_perm{};
-};
-
-} // namespace Service::JIT
--- a/src/core/hle/service/nvnflinger/nvnflinger.cpp
+++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp
@ -67,7 +67,7 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_
    // Schedule the screen composition events
    multi_composition_event = Core::Timing::CreateEvent(
        "ScreenComposition",
-        [this](s64 time,
+        [this](std::uintptr_t, s64 time,
               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
            vsync_signal.Set();
            return std::chrono::nanoseconds(GetNextTicks());
@ -75,7 +75,7 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_

    single_composition_event = Core::Timing::CreateEvent(
        "ScreenComposition",
-        [this](s64 time,
+        [this](std::uintptr_t, s64 time,
               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
            const auto lock_guard = Lock();
            Compose();
@ -93,11 +93,11 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_

 Nvnflinger::~Nvnflinger() {
    if (system.IsMulticore()) {
-        system.CoreTiming().UnscheduleEvent(multi_composition_event);
+        system.CoreTiming().UnscheduleEvent(multi_composition_event, {});
        vsync_thread.request_stop();
        vsync_signal.Set();
    } else {
-        system.CoreTiming().UnscheduleEvent(single_composition_event);
+        system.CoreTiming().UnscheduleEvent(single_composition_event, {});
    }

    ShutdownLayers();
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@ -190,15 +190,15 @@ CheatEngine::CheatEngine(System& system_, std::vector<CheatEntry> cheats_,
 }

 CheatEngine::~CheatEngine() {
-    core_timing.UnscheduleEvent(event);
+    core_timing.UnscheduleEvent(event, 0);
 }

 void CheatEngine::Initialize() {
    event = Core::Timing::CreateEvent(
        "CheatEngine::FrameCallback::" + Common::HexToString(metadata.main_nso_build_id),
-        [this](s64 time,
+        [this](std::uintptr_t user_data, s64 time,
               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
-            FrameCallback(ns_late);
+            FrameCallback(user_data, ns_late);
            return std::nullopt;
        });
    core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event);
@ -239,7 +239,7 @@ void CheatEngine::Reload(std::vector<CheatEntry> reload_cheats) {

 MICROPROFILE_DEFINE(Cheat_Engine, "Add-Ons", "Cheat Engine", MP_RGB(70, 200, 70));

-void CheatEngine::FrameCallback(std::chrono::nanoseconds ns_late) {
+void CheatEngine::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) {
    if (is_pending_reload.exchange(false)) {
        vm.LoadProgram(cheats);
    }
--- a/src/core/memory/cheat_engine.h
+++ b/src/core/memory/cheat_engine.h
@ -70,7 +70,7 @@ public:
    void Reload(std::vector<CheatEntry> reload_cheats);

 private:
-    void FrameCallback(std::chrono::nanoseconds ns_late);
+    void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);

    DmntCheatVm vm;
    CheatProcessMetadata metadata;
--- a/src/core/tools/freezer.cpp
+++ b/src/core/tools/freezer.cpp
@ -51,17 +51,18 @@ void MemoryWriteWidth(Core::Memory::Memory& memory, u32 width, VAddr addr, u64 v

 Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_)
    : core_timing{core_timing_}, memory{memory_} {
-    event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback",
-                                      [this](s64 time, std::chrono::nanoseconds ns_late)
-                                          -> std::optional<std::chrono::nanoseconds> {
-                                          FrameCallback(ns_late);
-                                          return std::nullopt;
-                                      });
+    event = Core::Timing::CreateEvent(
+        "MemoryFreezer::FrameCallback",
+        [this](std::uintptr_t user_data, s64 time,
+               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+            FrameCallback(user_data, ns_late);
+            return std::nullopt;
+        });
    core_timing.ScheduleEvent(memory_freezer_ns, event);
 }

 Freezer::~Freezer() {
-    core_timing.UnscheduleEvent(event);
+    core_timing.UnscheduleEvent(event, 0);
 }

 void Freezer::SetActive(bool is_active) {
@ -158,7 +159,7 @@ Freezer::Entries::const_iterator Freezer::FindEntry(VAddr address) const {
                        [address](const Entry& entry) { return entry.address == address; });
 }

-void Freezer::FrameCallback(std::chrono::nanoseconds ns_late) {
+void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) {
    if (!IsActive()) {
        LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events.");
        return;
--- a/src/core/tools/freezer.h
+++ b/src/core/tools/freezer.h
@ -77,7 +77,7 @@ private:
    Entries::iterator FindEntry(VAddr address);
    Entries::const_iterator FindEntry(VAddr address) const;

-    void FrameCallback(std::chrono::nanoseconds ns_late);
+    void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
    void FillEntryReads();

    std::atomic_bool active{false};
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
@ -403,63 +403,59 @@ void Config::SavePlayerValues(const std::size_t player_index) {
            // No custom profile selected
            return;
        }
-        WriteStringSetting(std::string(player_prefix).append("profile_name"), player.profile_name,
-                           std::make_optional(std::string("")));
+        WriteSetting(std::string(player_prefix).append("profile_name"), player.profile_name,
+                     std::make_optional(std::string("")));
    }

-    WriteIntegerSetting(
-        std::string(player_prefix).append("type"), static_cast<u8>(player.controller_type),
-        std::make_optional(static_cast<u8>(Settings::ControllerType::ProController)));
+    WriteSetting(std::string(player_prefix).append("type"), static_cast<u8>(player.controller_type),
+                 std::make_optional(static_cast<u8>(Settings::ControllerType::ProController)));

    if (!player_prefix.empty() || !Settings::IsConfiguringGlobal()) {
-        WriteBooleanSetting(std::string(player_prefix).append("connected"), player.connected,
-                            std::make_optional(player_index == 0));
-        WriteIntegerSetting(std::string(player_prefix).append("vibration_enabled"),
-                            player.vibration_enabled, std::make_optional(true));
-        WriteIntegerSetting(std::string(player_prefix).append("vibration_strength"),
-                            player.vibration_strength, std::make_optional(100));
-        WriteIntegerSetting(std::string(player_prefix).append("body_color_left"),
-                            player.body_color_left,
-                            std::make_optional(Settings::JOYCON_BODY_NEON_BLUE));
-        WriteIntegerSetting(std::string(player_prefix).append("body_color_right"),
-                            player.body_color_right,
-                            std::make_optional(Settings::JOYCON_BODY_NEON_RED));
-        WriteIntegerSetting(std::string(player_prefix).append("button_color_left"),
-                            player.button_color_left,
-                            std::make_optional(Settings::JOYCON_BUTTONS_NEON_BLUE));
-        WriteIntegerSetting(std::string(player_prefix).append("button_color_right"),
-                            player.button_color_right,
-                            std::make_optional(Settings::JOYCON_BUTTONS_NEON_RED));
+        WriteSetting(std::string(player_prefix).append("connected"), player.connected,
+                     std::make_optional(player_index == 0));
+        WriteSetting(std::string(player_prefix).append("vibration_enabled"),
+                     player.vibration_enabled, std::make_optional(true));
+        WriteSetting(std::string(player_prefix).append("vibration_strength"),
+                     player.vibration_strength, std::make_optional(100));
+        WriteSetting(std::string(player_prefix).append("body_color_left"), player.body_color_left,
+                     std::make_optional(Settings::JOYCON_BODY_NEON_BLUE));
+        WriteSetting(std::string(player_prefix).append("body_color_right"), player.body_color_right,
+                     std::make_optional(Settings::JOYCON_BODY_NEON_RED));
+        WriteSetting(std::string(player_prefix).append("button_color_left"),
+                     player.button_color_left,
+                     std::make_optional(Settings::JOYCON_BUTTONS_NEON_BLUE));
+        WriteSetting(std::string(player_prefix).append("button_color_right"),
+                     player.button_color_right,
+                     std::make_optional(Settings::JOYCON_BUTTONS_NEON_RED));
    }
 }

 void Config::SaveTouchscreenValues() {
    const auto& touchscreen = Settings::values.touchscreen;

-    WriteBooleanSetting(std::string("touchscreen_enabled"), touchscreen.enabled,
-                        std::make_optional(true));
+    WriteSetting(std::string("touchscreen_enabled"), touchscreen.enabled, std::make_optional(true));

-    WriteIntegerSetting(std::string("touchscreen_angle"), touchscreen.rotation_angle,
-                        std::make_optional(static_cast<u32>(0)));
-    WriteIntegerSetting(std::string("touchscreen_diameter_x"), touchscreen.diameter_x,
-                        std::make_optional(static_cast<u32>(15)));
-    WriteIntegerSetting(std::string("touchscreen_diameter_y"), touchscreen.diameter_y,
-                        std::make_optional(static_cast<u32>(15)));
+    WriteSetting(std::string("touchscreen_angle"), touchscreen.rotation_angle,
+                 std::make_optional(static_cast<u32>(0)));
+    WriteSetting(std::string("touchscreen_diameter_x"), touchscreen.diameter_x,
+                 std::make_optional(static_cast<u32>(15)));
+    WriteSetting(std::string("touchscreen_diameter_y"), touchscreen.diameter_y,
+                 std::make_optional(static_cast<u32>(15)));
 }

 void Config::SaveMotionTouchValues() {
    BeginArray(std::string("touch_from_button_maps"));
    for (std::size_t p = 0; p < Settings::values.touch_from_button_maps.size(); ++p) {
        SetArrayIndex(static_cast<int>(p));
-        WriteStringSetting(std::string("name"), Settings::values.touch_from_button_maps[p].name,
-                           std::make_optional(std::string("default")));
+        WriteSetting(std::string("name"), Settings::values.touch_from_button_maps[p].name,
+                     std::make_optional(std::string("default")));

        BeginArray(std::string("entries"));
        for (std::size_t q = 0; q < Settings::values.touch_from_button_maps[p].buttons.size();
             ++q) {
            SetArrayIndex(static_cast<int>(q));
-            WriteStringSetting(std::string("bind"),
-                               Settings::values.touch_from_button_maps[p].buttons[q]);
+            WriteSetting(std::string("bind"),
+                         Settings::values.touch_from_button_maps[p].buttons[q]);
        }
        EndArray(); // entries
    }
@ -524,16 +520,16 @@ void Config::SaveCoreValues() {
 void Config::SaveDataStorageValues() {
    BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));

-    WriteStringSetting(std::string("nand_directory"), FS::GetYuzuPathString(FS::YuzuPath::NANDDir),
-                       std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
-    WriteStringSetting(std::string("sdmc_directory"), FS::GetYuzuPathString(FS::YuzuPath::SDMCDir),
-                       std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::SDMCDir)));
-    WriteStringSetting(std::string("load_directory"), FS::GetYuzuPathString(FS::YuzuPath::LoadDir),
-                       std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::LoadDir)));
-    WriteStringSetting(std::string("dump_directory"), FS::GetYuzuPathString(FS::YuzuPath::DumpDir),
-                       std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
-    WriteStringSetting(std::string("tas_directory"), FS::GetYuzuPathString(FS::YuzuPath::TASDir),
-                       std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::TASDir)));
+    WriteSetting(std::string("nand_directory"), FS::GetYuzuPathString(FS::YuzuPath::NANDDir),
+                 std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
+    WriteSetting(std::string("sdmc_directory"), FS::GetYuzuPathString(FS::YuzuPath::SDMCDir),
+                 std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::SDMCDir)));
+    WriteSetting(std::string("load_directory"), FS::GetYuzuPathString(FS::YuzuPath::LoadDir),
+                 std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::LoadDir)));
+    WriteSetting(std::string("dump_directory"), FS::GetYuzuPathString(FS::YuzuPath::DumpDir),
+                 std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
+    WriteSetting(std::string("tas_directory"), FS::GetYuzuPathString(FS::YuzuPath::TASDir),
+                 std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::TASDir)));

    WriteCategory(Settings::Category::DataStorage);

@ -544,7 +540,7 @@ void Config::SaveDebuggingValues() {
    BeginGroup(Settings::TranslateCategory(Settings::Category::Debugging));

    // Intentionally not using the QT default setting as this is intended to be changed in the ini
-    WriteBooleanSetting(std::string("record_frame_times"), Settings::values.record_frame_times);
+    WriteSetting(std::string("record_frame_times"), Settings::values.record_frame_times);

    WriteCategory(Settings::Category::Debugging);
    WriteCategory(Settings::Category::DebuggingGraphics);
@ -568,13 +564,11 @@ void Config::SaveDisabledAddOnValues() {
    BeginArray(std::string(""));
    for (const auto& elem : Settings::values.disabled_addons) {
        SetArrayIndex(i);
-        WriteIntegerSetting(std::string("title_id"), elem.first,
-                            std::make_optional(static_cast<u64>(0)));
+        WriteSetting(std::string("title_id"), elem.first, std::make_optional(static_cast<u64>(0)));
        BeginArray(std::string("disabled"));
        for (std::size_t j = 0; j < elem.second.size(); ++j) {
            SetArrayIndex(static_cast<int>(j));
-            WriteStringSetting(std::string("d"), elem.second[j],
-                               std::make_optional(std::string("")));
+            WriteSetting(std::string("d"), elem.second[j], std::make_optional(std::string("")));
        }
        EndArray(); // disabled
        ++i;
@ -615,8 +609,8 @@ void Config::SaveRendererValues() {
 void Config::SaveScreenshotValues() {
    BeginGroup(Settings::TranslateCategory(Settings::Category::Screenshots));

-    WriteStringSetting(std::string("screenshot_path"),
-                       FS::GetYuzuPathString(FS::YuzuPath::ScreenshotsDir));
+    WriteSetting(std::string("screenshot_path"),
+                 FS::GetYuzuPathString(FS::YuzuPath::ScreenshotsDir));
    WriteCategory(Settings::Category::Screenshots);

    EndGroup();
@ -752,70 +746,46 @@ bool Config::Exists(const std::string& section, const std::string& key) const {
    return !value.empty();
 }

-void Config::WriteBooleanSetting(const std::string& key, const bool& value,
-                                 const std::optional<bool>& default_value,
-                                 const std::optional<bool>& use_global) {
-    std::optional<std::string> string_default = std::nullopt;
-    if (default_value.has_value()) {
-        string_default = std::make_optional(ToString(default_value.value()));
-    }
-    WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
-}
-
-template <typename T>
-std::enable_if_t<std::is_integral_v<T>> Config::WriteIntegerSetting(
-    const std::string& key, const T& value, const std::optional<T>& default_value,
-    const std::optional<bool>& use_global) {
-    std::optional<std::string> string_default = std::nullopt;
-    if (default_value.has_value()) {
-        string_default = std::make_optional(ToString(default_value.value()));
-    }
-    WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
-}
-
-void Config::WriteDoubleSetting(const std::string& key, const double& value,
-                                const std::optional<double>& default_value,
-                                const std::optional<bool>& use_global) {
-    std::optional<std::string> string_default = std::nullopt;
-    if (default_value.has_value()) {
-        string_default = std::make_optional(ToString(default_value.value()));
-    }
-    WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
-}
-
-void Config::WriteStringSetting(const std::string& key, const std::string& value,
-                                const std::optional<std::string>& default_value,
-                                const std::optional<bool>& use_global) {
-    std::optional string_default = default_value;
-    if (default_value.has_value()) {
-        string_default.value().append(AdjustOutputString(default_value.value()));
-    }
-    WritePreparedSetting(key, AdjustOutputString(value), string_default, use_global);
-}
-
-void Config::WritePreparedSetting(const std::string& key, const std::string& adjusted_value,
-                                  const std::optional<std::string>& adjusted_default_value,
-                                  const std::optional<bool>& use_global) {
+template <typename Type>
+void Config::WriteSetting(const std::string& key, const Type& value,
+                          const std::optional<Type>& default_value,
+                          const std::optional<bool>& use_global) {
    std::string full_key = GetFullKey(key, false);
-    if (adjusted_default_value.has_value() && use_global.has_value()) {
+
+    std::string saved_value;
+    std::string string_default;
+    if constexpr (std::is_same_v<Type, std::string>) {
+        saved_value.append(AdjustOutputString(value));
+        if (default_value.has_value()) {
+            string_default.append(AdjustOutputString(default_value.value()));
+        }
+    } else {
+        saved_value.append(AdjustOutputString(ToString(value)));
+        if (default_value.has_value()) {
+            string_default.append(ToString(default_value.value()));
+        }
+    }
+
+    if (default_value.has_value() && use_global.has_value()) {
        if (!global) {
-            WriteString(std::string(full_key).append("\\global"), ToString(use_global.value()));
+            WriteSettingInternal(std::string(full_key).append("\\global"),
+                                 ToString(use_global.value()));
        }
        if (global || use_global.value() == false) {
-            WriteString(std::string(full_key).append("\\default"),
-                        ToString(adjusted_default_value == adjusted_value));
-            WriteString(full_key, adjusted_value);
+            WriteSettingInternal(std::string(full_key).append("\\default"),
+                                 ToString(string_default == saved_value));
+            WriteSettingInternal(full_key, saved_value);
        }
-    } else if (adjusted_default_value.has_value() && !use_global.has_value()) {
-        WriteString(std::string(full_key).append("\\default"),
-                    ToString(adjusted_default_value == adjusted_value));
-        WriteString(full_key, adjusted_value);
+    } else if (default_value.has_value() && !use_global.has_value()) {
+        WriteSettingInternal(std::string(full_key).append("\\default"),
+                             ToString(string_default == saved_value));
+        WriteSettingInternal(full_key, saved_value);
    } else {
-        WriteString(full_key, adjusted_value);
+        WriteSettingInternal(full_key, saved_value);
    }
 }

-void Config::WriteString(const std::string& key, const std::string& value) {
+void Config::WriteSettingInternal(const std::string& key, const std::string& value) {
    config->SetValue(GetSection().c_str(), key.c_str(), value.c_str());
 }

@ -891,17 +861,17 @@ void Config::WriteSettingGeneric(const Settings::BasicSetting* const setting) {
    std::string key = AdjustKey(setting->GetLabel());
    if (setting->Switchable()) {
        if (!global) {
-            WriteBooleanSetting(std::string(key).append("\\use_global"), setting->UsingGlobal());
+            WriteSetting(std::string(key).append("\\use_global"), setting->UsingGlobal());
        }
        if (global || !setting->UsingGlobal()) {
-            WriteBooleanSetting(std::string(key).append("\\default"),
-                                setting->ToString() == setting->DefaultToString());
-            WriteStringSetting(key, setting->ToString());
+            WriteSetting(std::string(key).append("\\default"),
+                         setting->ToString() == setting->DefaultToString());
+            WriteSetting(key, setting->ToString());
        }
    } else if (global) {
-        WriteBooleanSetting(std::string(key).append("\\default"),
-                            setting->ToString() == setting->DefaultToString());
-        WriteStringSetting(key, setting->ToString());
+        WriteSetting(std::string(key).append("\\default"),
+                     setting->ToString() == setting->DefaultToString());
+        WriteSetting(key, setting->ToString());
    }
 }

--- a/src/frontend_common/config.h
+++ b/src/frontend_common/config.h
@ -154,20 +154,11 @@ protected:
     * @param use_global Specifies if the custom or global config should be in use, for custom
     * configs
     */
-    void WriteBooleanSetting(const std::string& key, const bool& value,
-                             const std::optional<bool>& default_value = std::nullopt,
-                             const std::optional<bool>& use_global = std::nullopt);
-    template <typename T>
-    std::enable_if_t<std::is_integral_v<T>> WriteIntegerSetting(
-        const std::string& key, const T& value,
-        const std::optional<T>& default_value = std::nullopt,
-        const std::optional<bool>& use_global = std::nullopt);
-    void WriteDoubleSetting(const std::string& key, const double& value,
-                            const std::optional<double>& default_value = std::nullopt,
-                            const std::optional<bool>& use_global = std::nullopt);
-    void WriteStringSetting(const std::string& key, const std::string& value,
-                            const std::optional<std::string>& default_value = std::nullopt,
-                            const std::optional<bool>& use_global = std::nullopt);
+    template <typename Type = int>
+    void WriteSetting(const std::string& key, const Type& value,
+                      const std::optional<Type>& default_value = std::nullopt,
+                      const std::optional<bool>& use_global = std::nullopt);
+    void WriteSettingInternal(const std::string& key, const std::string& value);

    void ReadCategory(Settings::Category category);
    void WriteCategory(Settings::Category category);
@ -184,10 +175,8 @@ protected:
            return value_ ? "true" : "false";
        } else if constexpr (std::is_same_v<T, u64>) {
            return std::to_string(static_cast<u64>(value_));
-        } else if constexpr (std::is_same_v<T, s64>) {
-            return std::to_string(static_cast<s64>(value_));
        } else {
-            return std::to_string(value_);
+            return std::to_string(static_cast<s64>(value_));
        }
    }

@ -208,13 +197,9 @@ protected:
    const bool global;

 private:
-    void WritePreparedSetting(const std::string& key, const std::string& adjusted_value,
-                              const std::optional<std::string>& adjusted_default_value,
-                              const std::optional<bool>& use_global);
-    void WriteString(const std::string& key, const std::string& value);
-
-    inline static std::array<char, 18> special_characters = {
-        '!', '#', '$', '%', '^', '&', '*', '|', ';', '\'', '\"', ',', '<', '>', '?', '`', '~', '='};
+    inline static std::array<char, 19> special_characters = {'!', '#', '$',  '%',  '^', '&', '*',
+                                                             '|', ';', '\'', '\"', ',', '<', '.',
+                                                             '>', '?', '`',  '~',  '='};

    struct ConfigArray {
        std::string name;
--- a/src/tests/core/core_timing.cpp
+++ b/src/tests/core/core_timing.cpp
@ -16,16 +16,20 @@

 namespace {
 // Numbers are chosen randomly to make sure the correct one is given.
+constexpr std::array<u64, 5> CB_IDS{{42, 144, 93, 1026, UINT64_C(0xFFFF7FFFF7FFFF)}};
 constexpr std::array<u64, 5> calls_order{{2, 0, 1, 4, 3}};
 std::array<s64, 5> delays{};
-std::bitset<5> callbacks_ran_flags;
+
+std::bitset<CB_IDS.size()> callbacks_ran_flags;
 u64 expected_callback = 0;

 template <unsigned int IDX>
-std::optional<std::chrono::nanoseconds> HostCallbackTemplate(s64 time,
+std::optional<std::chrono::nanoseconds> HostCallbackTemplate(std::uintptr_t user_data, s64 time,
                                                             std::chrono::nanoseconds ns_late) {
-    static_assert(IDX < callbacks_ran_flags.size(), "IDX out of range");
+    static_assert(IDX < CB_IDS.size(), "IDX out of range");
    callbacks_ran_flags.set(IDX);
+    REQUIRE(CB_IDS[IDX] == user_data);
+    REQUIRE(CB_IDS[IDX] == CB_IDS[calls_order[expected_callback]]);
    delays[IDX] = ns_late.count();
    ++expected_callback;
    return std::nullopt;
@ -72,7 +76,7 @@ TEST_CASE("CoreTiming[BasicOrder]", "[core]") {
        const u64 order = calls_order[i];
        const auto future_ns = std::chrono::nanoseconds{static_cast<s64>(i * one_micro + 100)};

-        core_timing.ScheduleEvent(future_ns, events[order]);
+        core_timing.ScheduleEvent(future_ns, events[order], CB_IDS[order]);
    }
    /// test pause
    REQUIRE(callbacks_ran_flags.none());
@ -114,7 +118,7 @@ TEST_CASE("CoreTiming[BasicOrderNoPausing]", "[core]") {
    for (std::size_t i = 0; i < events.size(); i++) {
        const u64 order = calls_order[i];
        const auto future_ns = std::chrono::nanoseconds{static_cast<s64>(i * one_micro + 100)};
-        core_timing.ScheduleEvent(future_ns, events[order]);
+        core_timing.ScheduleEvent(future_ns, events[order], CB_IDS[order]);
    }

    const u64 end = core_timing.GetGlobalTimeNs().count();
--- a/src/yuzu/configuration/qt_config.cpp
+++ b/src/yuzu/configuration/qt_config.cpp
@ -348,45 +348,43 @@ void QtConfig::SaveQtPlayerValues(const std::size_t player_index) {

    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]),
-                           player.buttons[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]),
+                     player.buttons[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
            default_analogs[i][3], default_stick_mod[i], 0.5f);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]),
-                           player.analogs[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]),
+                     player.analogs[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]),
-                           player.motions[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]),
+                     player.motions[i], std::make_optional(default_param));
    }
 }

 void QtConfig::SaveDebugControlValues() {
    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
-        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]),
-                           Settings::values.debug_pad_buttons[i],
-                           std::make_optional(default_param));
+        WriteSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]),
+                     Settings::values.debug_pad_buttons[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
            default_analogs[i][3], default_stick_mod[i], 0.5f);
-        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]),
-                           Settings::values.debug_pad_analogs[i],
-                           std::make_optional(default_param));
+        WriteSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]),
+                     Settings::values.debug_pad_analogs[i], std::make_optional(default_param));
    }
 }

 void QtConfig::SaveHidbusValues() {
    const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
        0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
-    WriteStringSetting(std::string("ring_controller"), Settings::values.ringcon_analogs,
-                       std::make_optional(default_param));
+    WriteSetting(std::string("ring_controller"), Settings::values.ringcon_analogs,
+                 std::make_optional(default_param));
 }

 void QtConfig::SaveQtControlValues() {
@ -411,20 +409,19 @@ void QtConfig::SavePathValues() {

    WriteCategory(Settings::Category::Paths);

-    WriteStringSetting(std::string("romsPath"), UISettings::values.roms_path);
+    WriteSetting(std::string("romsPath"), UISettings::values.roms_path);
    BeginArray(std::string("gamedirs"));
    for (int i = 0; i < UISettings::values.game_dirs.size(); ++i) {
        SetArrayIndex(i);
        const auto& game_dir = UISettings::values.game_dirs[i];
-        WriteStringSetting(std::string("path"), game_dir.path);
-        WriteBooleanSetting(std::string("deep_scan"), game_dir.deep_scan,
-                            std::make_optional(false));
-        WriteBooleanSetting(std::string("expanded"), game_dir.expanded, std::make_optional(true));
+        WriteSetting(std::string("path"), game_dir.path);
+        WriteSetting(std::string("deep_scan"), game_dir.deep_scan, std::make_optional(false));
+        WriteSetting(std::string("expanded"), game_dir.expanded, std::make_optional(true));
    }
    EndArray();

-    WriteStringSetting(std::string("recentFiles"),
-                       UISettings::values.recent_files.join(QStringLiteral(", ")).toStdString());
+    WriteSetting(std::string("recentFiles"),
+                 UISettings::values.recent_files.join(QStringLiteral(", ")).toStdString());

    EndGroup();
 }
@ -441,14 +438,14 @@ void QtConfig::SaveShortcutValues() {
        BeginGroup(group);
        BeginGroup(name);

-        WriteStringSetting(std::string("KeySeq"), shortcut.keyseq,
-                           std::make_optional(default_hotkey.keyseq));
-        WriteStringSetting(std::string("Controller_KeySeq"), shortcut.controller_keyseq,
-                           std::make_optional(default_hotkey.controller_keyseq));
-        WriteIntegerSetting(std::string("Context"), shortcut.context,
-                            std::make_optional(default_hotkey.context));
-        WriteBooleanSetting(std::string("Repeat"), shortcut.repeat,
-                            std::make_optional(default_hotkey.repeat));
+        WriteSetting(std::string("KeySeq"), shortcut.keyseq,
+                     std::make_optional(default_hotkey.keyseq));
+        WriteSetting(std::string("Controller_KeySeq"), shortcut.controller_keyseq,
+                     std::make_optional(default_hotkey.controller_keyseq));
+        WriteSetting(std::string("Context"), shortcut.context,
+                     std::make_optional(default_hotkey.context));
+        WriteSetting(std::string("Repeat"), shortcut.repeat,
+                     std::make_optional(default_hotkey.repeat));

        EndGroup(); // name
        EndGroup(); // group
@ -463,10 +460,9 @@ void QtConfig::SaveUIValues() {
    WriteCategory(Settings::Category::Ui);
    WriteCategory(Settings::Category::UiGeneral);

-    WriteStringSetting(
-        std::string("theme"), UISettings::values.theme,
-        std::make_optional(std::string(
-            UISettings::themes[static_cast<size_t>(UISettings::default_theme)].second)));
+    WriteSetting(std::string("theme"), UISettings::values.theme,
+                 std::make_optional(std::string(
+                     UISettings::themes[static_cast<size_t>(UISettings::default_theme)].second)));

    SaveUIGamelistValues();
    SaveUILayoutValues();
@ -486,7 +482,7 @@ void QtConfig::SaveUIGamelistValues() {
    BeginArray(std::string("favorites"));
    for (int i = 0; i < UISettings::values.favorited_ids.size(); i++) {
        SetArrayIndex(i);
-        WriteIntegerSetting(std::string("program_id"), UISettings::values.favorited_ids[i]);
+        WriteSetting(std::string("program_id"), UISettings::values.favorited_ids[i]);
    }
    EndArray(); // favorites

@ -510,15 +506,14 @@ void QtConfig::SaveMultiplayerValues() {
    BeginArray(std::string("username_ban_list"));
    for (std::size_t i = 0; i < UISettings::values.multiplayer_ban_list.first.size(); ++i) {
        SetArrayIndex(static_cast<int>(i));
-        WriteStringSetting(std::string("username"),
-                           UISettings::values.multiplayer_ban_list.first[i]);
+        WriteSetting(std::string("username"), UISettings::values.multiplayer_ban_list.first[i]);
    }
    EndArray(); // username_ban_list

    BeginArray(std::string("ip_ban_list"));
    for (std::size_t i = 0; i < UISettings::values.multiplayer_ban_list.second.size(); ++i) {
        SetArrayIndex(static_cast<int>(i));
-        WriteStringSetting(std::string("ip"), UISettings::values.multiplayer_ban_list.second[i]);
+        WriteSetting(std::string("ip"), UISettings::values.multiplayer_ban_list.second[i]);
    }
    EndArray(); // ip_ban_list

--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@ -5342,10 +5342,6 @@ int main(int argc, char* argv[]) {
    if (QString::fromLocal8Bit(qgetenv("DISPLAY")).isEmpty()) {
        qputenv("DISPLAY", ":0");
    }
-
-    // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop
-    // suffix.
-    QGuiApplication::setDesktopFileName(QStringLiteral("org.yuzu_emu.yuzu"));
 #endif

    SetHighDPIAttributes();
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@ -20,7 +20,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Co
    : input_subsystem{input_subsystem_}, system{system_} {
    input_subsystem->Initialize();
    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) {
-        LOG_CRITICAL(Frontend, "Failed to initialize SDL2: {}, Exiting...", SDL_GetError());
+        LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting...");
        exit(1);
    }
    SDL_SetMainReady();
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@ -28,8 +28,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
    SDL_SysWMinfo wm;
    SDL_VERSION(&wm.version);
    if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) {
-        LOG_CRITICAL(Frontend, "Failed to get information from the window manager: {}",
-                     SDL_GetError());
+        LOG_CRITICAL(Frontend, "Failed to get information from the window manager");
        std::exit(EXIT_FAILURE);
    }

--- a/src/yuzu_cmd/sdl_config.cpp
+++ b/src/yuzu_cmd/sdl_config.cpp
@ -213,45 +213,43 @@ void SdlConfig::SaveSdlPlayerValues(const std::size_t player_index) {

    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]),
-                           player.buttons[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]),
+                     player.buttons[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
            default_analogs[i][3], default_stick_mod[i], 0.5f);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]),
-                           player.analogs[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]),
+                     player.analogs[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
-        WriteStringSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]),
-                           player.motions[i], std::make_optional(default_param));
+        WriteSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]),
+                     player.motions[i], std::make_optional(default_param));
    }
 }

 void SdlConfig::SaveDebugControlValues() {
    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
-        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]),
-                           Settings::values.debug_pad_buttons[i],
-                           std::make_optional(default_param));
+        WriteSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]),
+                     Settings::values.debug_pad_buttons[i], std::make_optional(default_param));
    }
    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
            default_analogs[i][3], default_stick_mod[i], 0.5f);
-        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]),
-                           Settings::values.debug_pad_analogs[i],
-                           std::make_optional(default_param));
+        WriteSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]),
+                     Settings::values.debug_pad_analogs[i], std::make_optional(default_param));
    }
 }

 void SdlConfig::SaveHidbusValues() {
    const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
        0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
-    WriteStringSetting(std::string("ring_controller"), Settings::values.ringcon_analogs,
-                       std::make_optional(default_param));
+    WriteSetting(std::string("ring_controller"), Settings::values.ringcon_analogs,
+                 std::make_optional(default_param));
 }

 std::vector<Settings::BasicSetting*>& SdlConfig::FindRelevantList(Settings::Category category) {
Author	SHA1	Message	Date
yuzubot	6a3c15f6e1	Android #174	2023-12-28 00:57:01 +00:00
yuzubot	b057a0295d	Merge PR 12487	2023-12-28 00:57:01 +00:00
yuzubot	b7ad90dc18	Merge PR 12479	2023-12-28 00:57:01 +00:00
yuzubot	f2737fa6d4	Merge PR 12466	2023-12-28 00:57:01 +00:00