infra: Workaround Microsoft.NET.ILLink.Tasks restore failure on Flathub

This package seems to be required for triming now but isn't restored by default.
This changes the flatpak pusher to publish so we are sure that the package is in the cache.

Signed-off-by: Mary Guillemard <mary@mary.zone>

.editorconfig

@@ -233,6 +233,29 @@ dotnet_naming_style.IPascalCase.required_suffix =
 dotnet_naming_style.IPascalCase.word_separator =
 dotnet_naming_style.IPascalCase.capitalization = pascal_case
 
+# TODO:
+# .NET 8 migration (new warnings are caused by the NET 8 C# compiler and analyzer)
+# The following info messages might need to be fixed in the source code instead of hiding the actual message
+# Without the following lines, dotnet format would fail
+# Disable "Collection initialization can be simplified"
+dotnet_diagnostic.IDE0028.severity = none
+dotnet_diagnostic.IDE0300.severity = none
+dotnet_diagnostic.IDE0301.severity = none
+dotnet_diagnostic.IDE0302.severity = none
+dotnet_diagnostic.IDE0305.severity = none
+# Disable "'new' expression can be simplified"
+dotnet_diagnostic.IDE0090.severity = none
+# Disable "Use primary constructor"
+dotnet_diagnostic.IDE0290.severity = none
+# Disable "Member '' does not access instance data and can be marked as static"
+dotnet_diagnostic.CA1822.severity = none
+# Disable "Change type of field '' from '' to '' for improved performance"
+dotnet_diagnostic.CA1859.severity = none
+# Disable "Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array"
+dotnet_diagnostic.CA1861.severity = none
+# Disable "Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase'"
+dotnet_diagnostic.CA1862.severity = none
+
 [src/Ryujinx.HLE/HOS/Services/**.cs]
 # Disable "mark members as static" rule for services
 dotnet_diagnostic.CA1822.severity = none

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
 
         - os: windows-latest
           OS_NAME: Windows x64
-          DOTNET_RUNTIME_IDENTIFIER: win10-x64
+          DOTNET_RUNTIME_IDENTIFIER: win-x64
           RELEASE_ZIP_OS_NAME: win_x64
 
       fail-fast: false
@@ -155,4 +155,4 @@ jobs:
         with:
           name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
           path: "publish_headless/*.tar.gz"
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request'

.github/workflows/flatpak.yml

@@ -49,7 +49,9 @@ jobs:
         run: python -m pip install PyYAML lxml
 
       - name: Restore Nuget packages
-        run: dotnet restore Ryujinx/${{ env.RYUJINX_PROJECT_FILE }}
+        # With .NET 8.0.100, Microsoft.NET.ILLink.Tasks isn't restored by default and only seems to appears when publishing.
+        # So we just publish to grab the dependencies
+        run: dotnet publish -c Release -r linux-x64 Ryujinx/${{ env.RYUJINX_PROJECT_FILE }} --self-contained
 
       - name: Generate nuget_sources.json
         shell: python

.github/workflows/release.yml

@@ -25,7 +25,7 @@ env:
 jobs:
   tag:
     name: Create tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Get version info
         id: version_info
@@ -59,7 +59,7 @@ jobs:
 
           - os: windows-latest
             OS_NAME: Windows x64
-            DOTNET_RUNTIME_IDENTIFIER: win10-x64
+            DOTNET_RUNTIME_IDENTIFIER: win-x64
             RELEASE_ZIP_OS_NAME: win_x64
     steps:
       - uses: actions/checkout@v4
@@ -156,11 +156,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 14
+      - name: Setup LLVM 15
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 15
 
       - name: Install rcodesign
         run: |
@@ -215,4 +215,4 @@ jobs:
     needs: release
     with:
       ryujinx_version: "1.1.${{ github.run_number }}"
-    secrets: inherit
+    secrets: inherit

Directory.Packages.props

@@ -18,12 +18,13 @@
     <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
     <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
     <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.3.0-beta.4" />
-    <PackageVersion Include="LibHac" Version="0.18.0" />
+    <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
+    <PackageVersion Include="NetCoreServer" Version="7.0.0" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.1.0" />
     <PackageVersion Include="OpenTK.Core" Version="4.7.7" />
@@ -44,10 +45,10 @@
     <PackageVersion Include="SixLabors.ImageSharp" Version="1.0.4" />
     <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
     <PackageVersion Include="SPB" Version="0.0.4-build28" />
-    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
-    <PackageVersion Include="System.IO.Hashing" Version="7.0.0" />
-    <PackageVersion Include="System.Management" Version="7.0.2" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
+    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+    <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
 </Project>

README.md

@@ -68,7 +68,7 @@ The latest automatic build for Windows, macOS, and Linux can be found on the [Of
 If you wish to build the emulator yourself, follow these steps:
 
 ### Step 1
-Install the X64 version of [.NET 7.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/7.0).
+Install the X64 version of [.NET 8.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/8.0).
 
 ### Step 2
 Either use `git clone https://github.com/Ryujinx/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
@@ -141,4 +141,5 @@ See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](distribution/legal/THIRDPARTY
 
 - [LibHac](https://github.com/Thealexbarney/LibHac) is used for our file-system.
 - [AmiiboAPI](https://www.amiiboapi.com) is used in our Amiibo emulation.
+- [ldn_mitm](https://github.com/spacemeowx2/ldn_mitm) is used for one of our available multiplayer modes.
 - [ShellLink](https://github.com/securifybv/ShellLink) is used for Windows shortcut generation.

distribution/legal/THIRDPARTY.md

@@ -710,4 +710,4 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
   ```
-</details>
+</details>

distribution/macos/Info.plist

@@ -43,7 +43,7 @@
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.games</string>
     <key>LSMinimumSystemVersion</key>
-    <string>11.0</string>
+    <string>12.0</string>
     <key>UTExportedTypeDeclarations</key>
     <array>
       <dict>
@@ -155,4 +155,4 @@
         <string>200000</string>
     </dict>
 </dict>
-</plist>
+</plist>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.200",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
-}
+}

src/ARMeilleure/ARMeilleure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/ARMeilleure/Decoders/Decoder.cs

@@ -38,7 +38,9 @@ namespace ARMeilleure.Decoders
                 {
                     block = new Block(blkAddress);
 
-                    if ((dMode != DecoderMode.MultipleBlocks && visited.Count >= 1) || opsCount > instructionLimit || !memory.IsMapped(blkAddress))
+                    if ((dMode != DecoderMode.MultipleBlocks && visited.Count >= 1) ||
+                        opsCount > instructionLimit ||
+                        (visited.Count > 0 && !memory.IsMapped(blkAddress)))
                     {
                         block.Exit = true;
                         block.EndAddress = blkAddress;

src/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio.Backends.SDL2/Ryujinx.Audio.Backends.SDL2.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,11 +15,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.dll</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win-x64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.dylib</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win10-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.so</TargetPath>
     </ContentWithTargetPath>

src/Ryujinx.Audio/Renderer/Utils/SpanIOHelper.cs

@@ -25,7 +25,7 @@ namespace Ryujinx.Audio.Renderer.Utils
                 throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
             }
 
-            MemoryMarshal.Write(backingMemory.Span[..size], ref data);
+            MemoryMarshal.Write(backingMemory.Span[..size], in data);
 
             backingMemory = backingMemory[size..];
         }
@@ -45,7 +45,7 @@ namespace Ryujinx.Audio.Renderer.Utils
                 throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
             }
 
-            MemoryMarshal.Write(backingMemory[..size], ref data);
+            MemoryMarshal.Write(backingMemory[..size], in data);
 
             backingMemory = backingMemory[size..];
         }

src/Ryujinx.Audio/Ryujinx.Audio.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Ava/AppHost.cs

@@ -190,6 +190,7 @@ namespace Ryujinx.Ava
             ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;
             ConfigurationState.Instance.Graphics.EnableColorSpacePassthrough.Event += UpdateColorSpacePassthrough;
 
+            ConfigurationState.Instance.System.EnableInternetAccess.Event += UpdateEnableInternetAccessState;
             ConfigurationState.Instance.Multiplayer.LanInterfaceId.Event += UpdateLanInterfaceIdState;
             ConfigurationState.Instance.Multiplayer.Mode.Event += UpdateMultiplayerModeState;
 
@@ -408,6 +409,11 @@ namespace Ryujinx.Ava
             });
         }
 
+        private void UpdateEnableInternetAccessState(object sender, ReactiveEventArgs<bool> e)
+        {
+            Device.Configuration.EnableInternetAccess = e.NewValue;
+        }
+
         private void UpdateLanInterfaceIdState(object sender, ReactiveEventArgs<string> e)
         {
             Device.Configuration.MultiplayerLanInterfaceId = e.NewValue;
@@ -710,7 +716,7 @@ namespace Ryujinx.Ava
 
             ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText, appMetadata =>
             {
-                appMetadata.LastPlayed = DateTime.UtcNow;
+                appMetadata.UpdatePreGame();
             });
 
             return true;

src/Ryujinx.Ava/Assets/Locales/en_US.json

@@ -14,7 +14,7 @@
   "MenuBarFileOpenEmuFolder": "Open Ryujinx Folder",
   "MenuBarFileOpenLogsFolder": "Open Logs Folder",
   "MenuBarFileExit": "_Exit",
-  "MenuBarOptions": "Options",
+  "MenuBarOptions": "_Options",
   "MenuBarOptionsToggleFullscreen": "Toggle Fullscreen",
   "MenuBarOptionsStartGamesInFullscreen": "Start Games in Fullscreen Mode",
   "MenuBarOptionsStopEmulation": "Stop Emulation",
@@ -30,7 +30,7 @@
   "MenuBarToolsManageFileTypes": "Manage file types",
   "MenuBarToolsInstallFileTypes": "Install file types",
   "MenuBarToolsUninstallFileTypes": "Uninstall file types",
-  "MenuBarHelp": "Help",
+  "MenuBarHelp": "_Help",
   "MenuBarHelpCheckForUpdates": "Check for Updates",
   "MenuBarHelpAbout": "About",
   "MenuSearch": "Search...",
@@ -263,105 +263,6 @@
   "ControllerSettingsMotionGyroDeadzone": "Gyro Deadzone:",
   "ControllerSettingsSave": "Save",
   "ControllerSettingsClose": "Close",
-  "KeyUnknown": "Unknown",
-  "KeyShiftLeft": "Shift Left",
-  "KeyShiftRight": "Shift Right",
-  "KeyControlLeft": "Control Left",
-  "KeyControlRight": "Control Right",
-  "KeyAltLeft": "Alt Left",
-  "KeyAltRight": "Alt Right",
-  "KeyOptLeft": "⌥ Left",
-  "KeyOptRight": "⌥ Right",
-  "KeyWinLeft": "⊞ Left",
-  "KeyWinRight": "⊞ Right",
-  "KeyCmdLeft": "⌘ Left",
-  "KeyCmdRight": "⌘ Right",
-  "KeyMenu": "Menu",
-  "KeyUp": "Up",
-  "KeyDown": "Down",
-  "KeyLeft": "Left",
-  "KeyRight": "Right",
-  "KeyEnter": "Enter",
-  "KeyEscape": "Escape",
-  "KeySpace": "Space",
-  "KeyTab": "Tab",
-  "KeyBackSpace": "Backspace",
-  "KeyInsert": "Insert",
-  "KeyDelete": "Delete",
-  "KeyPageUp": "Page Up",
-  "KeyPageDown": "Page Down",
-  "KeyHome": "Home",
-  "KeyEnd": "End",
-  "KeyCapsLock": "Caps Lock",
-  "KeyScrollLock": "Scroll Lock",
-  "KeyPrintScreen": "Print Screen",
-  "KeyPause": "Pause",
-  "KeyNumLock": "Num Lock",
-  "KeyClear": "Clear",
-  "KeyKeypad0": "Keypad 0",
-  "KeyKeypad1": "Keypad 1",
-  "KeyKeypad2": "Keypad 2",
-  "KeyKeypad3": "Keypad 3",
-  "KeyKeypad4": "Keypad 4",
-  "KeyKeypad5": "Keypad 5",
-  "KeyKeypad6": "Keypad 6",
-  "KeyKeypad7": "Keypad 7",
-  "KeyKeypad8": "Keypad 8",
-  "KeyKeypad9": "Keypad 9",
-  "KeyKeypadDivide": "Keypad Divide",
-  "KeyKeypadMultiply": "Keypad Multiply",
-  "KeyKeypadSubtract": "Keypad Subtract",
-  "KeyKeypadAdd": "Keypad Add",
-  "KeyKeypadDecimal": "Keypad Decimal",
-  "KeyKeypadEnter": "Keypad Enter",
-  "KeyNumber0": "0",
-  "KeyNumber1": "1",
-  "KeyNumber2": "2",
-  "KeyNumber3": "3",
-  "KeyNumber4": "4",
-  "KeyNumber5": "5",
-  "KeyNumber6": "6",
-  "KeyNumber7": "7",
-  "KeyNumber8": "8",
-  "KeyNumber9": "9",
-  "KeyTilde": "~",
-  "KeyGrave": "`",
-  "KeyMinus": "-",
-  "KeyPlus": "+",
-  "KeyBracketLeft": "[",
-  "KeyBracketRight": "]",
-  "KeySemicolon": ";",
-  "KeyQuote": "\"",
-  "KeyComma": ",",
-  "KeyPeriod": ".",
-  "KeySlash": "/",
-  "KeyBackSlash": "\\",
-  "KeyUnbound": "Unbound",
-  "GamepadLeftStick": "Left Stick Button",
-  "GamepadRightStick": "Right Stick Button",
-  "GamepadLeftShoulder": "Left Shoulder",
-  "GamepadRightShoulder": "Right Shoulder",
-  "GamepadLeftTrigger": "Left Trigger",
-  "GamepadRightTrigger": "Right Trigger",
-  "GamepadDpadUp": "Up",
-  "GamepadDpadDown": "Down",
-  "GamepadDpadLeft": "Left",
-  "GamepadDpadRight": "Right",
-  "GamepadMinus": "-",
-  "GamepadPlus": "+",
-  "GamepadGuide": "Guide",
-  "GamepadMisc1": "Misc",
-  "GamepadPaddle1": "Paddle 1",
-  "GamepadPaddle2": "Paddle 2",
-  "GamepadPaddle3": "Paddle 3",
-  "GamepadPaddle4": "Paddle 4",
-  "GamepadTouchpad": "Touchpad",
-  "GamepadSingleLeftTrigger0": "Left Trigger 0",
-  "GamepadSingleRightTrigger0": "Right Trigger 0",
-  "GamepadSingleLeftTrigger1": "Left Trigger 1",
-  "GamepadSingleRightTrigger1": "Right Trigger 1",
-  "StickLeft": "Left Stick",
-  "StickRight": "Right Stick",
   "UserProfilesSelectedUserProfile": "Selected User Profile:",
   "UserProfilesSaveProfileName": "Save Profile Name",
   "UserProfilesChangeProfileImage": "Change Profile Image",
@@ -749,7 +650,7 @@
   "UserEditorTitle": "Edit User",
   "UserEditorTitleCreate": "Create User",
   "SettingsTabNetworkInterface": "Network Interface:",
-  "NetworkInterfaceTooltip": "The network interface used for LAN features",
+  "NetworkInterfaceTooltip": "The network interface used for LAN/LDN features",
   "NetworkInterfaceDefault": "Default",
   "PackagingShaders": "Packaging Shaders",
   "AboutChangelogButton": "View Changelog on GitHub",

src/Ryujinx.Ava/Assets/Styles/Styles.xaml

@@ -15,7 +15,8 @@
                             <MenuItem Header="Test 2" />
                             <MenuItem Header="Test 3">
                                 <MenuItem.Icon>
-                                    <CheckBox Margin="0" />
+                                    <CheckBox Margin="0"
+                                              IsChecked="{ReflectionBinding Checkbox, Mode=TwoWay}" />
                                 </MenuItem.Icon>
                             </MenuItem>
                         </MenuItem>
@@ -392,4 +393,4 @@
         <x:Double x:Key="ContentDialogMaxWidth">600</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
-</Styles>
+</Styles>

src/Ryujinx.Ava/Common/ApplicationHelper.cs

@@ -173,7 +173,7 @@ namespace Ryujinx.Ava.Common
                 string extension = Path.GetExtension(titleFilePath).ToLower();
                 if (extension == ".nsp" || extension == ".pfs0" || extension == ".xci")
                 {
-                    PartitionFileSystem pfs;
+                    IFileSystem pfs;
 
                     if (extension == ".xci")
                     {
@@ -181,7 +181,9 @@ namespace Ryujinx.Ava.Common
                     }
                     else
                     {
-                        pfs = new PartitionFileSystem(file.AsStorage());
+                        var pfsTemp = new PartitionFileSystem();
+                        pfsTemp.Initialize(file.AsStorage()).ThrowIfFailure();
+                        pfs = pfsTemp;
                     }
 
                     foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))

src/Ryujinx.Ava/Program.cs

@@ -6,13 +6,13 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.SystemInfo;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.Ui.Common;
 using Ryujinx.Ui.Common.Configuration;
 using Ryujinx.Ui.Common.Helper;
+using Ryujinx.Ui.Common.SystemInfo;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;

src/Ryujinx.Ava/Ryujinx.Ava.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>1.0.0-dirty</Version>
@@ -25,6 +25,16 @@
     <TrimMode>partial</TrimMode>
   </PropertyGroup>
 
+  <!--
+    FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
+    See:
+      https://github.com/amwx/FluentAvalonia/issues/481
+      https://devblogs.microsoft.com/dotnet/system-text-json-in-dotnet-8/
+  -->
+  <PropertyGroup>
+    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Avalonia" />
     <PackageReference Include="Avalonia.Desktop" />
@@ -40,7 +50,7 @@
     <PackageReference Include="OpenTK.Core" />
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
+    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />

src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml

@@ -12,6 +12,11 @@
         Click="ToggleFavorite_Click"
         Header="{locale:Locale GameListContextMenuToggleFavorite}"
         ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
+	<MenuItem
+		Click="CreateApplicationShortcut_Click"
+		Header="{locale:Locale GameListContextMenuCreateShortcut}"
+        IsEnabled="{Binding CreateShortcutEnabled}"
+		ToolTip.Tip="{locale:Locale GameListContextMenuCreateShortcutToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenUserSaveDirectory_Click"
@@ -82,9 +87,4 @@
             Header="{locale:Locale GameListContextMenuExtractDataLogo}"
             ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
     </MenuItem>
-	<MenuItem
-		Click="CreateApplicationShortcut_Click"
-		Header="{locale:Locale GameListContextMenuCreateShortcut}"
-        IsEnabled="{Binding CreateShortcutEnabled}"
-		ToolTip.Tip="{locale:Locale GameListContextMenuCreateShortcutToolTip}" />
 </MenuFlyout>

src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml

@@ -126,17 +126,17 @@
                                     Spacing="5">
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding TimePlayed}"
+                                        Text="{Binding TimePlayedString}"
                                         TextAlignment="Right"
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayed, Converter={helpers:NullableDateTimeConverter}}"
+                                        Text="{Binding LastPlayedString, Converter={helpers:LocalizedNeverConverter}}"
                                         TextAlignment="Right"
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding FileSize}"
+                                        Text="{Binding FileSizeString}"
                                         TextAlignment="Right"
                                         TextWrapping="Wrap" />
                                 </StackPanel>

src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs

@@ -1,8 +1,11 @@
+using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.LogicalTree;
 using Avalonia.Threading;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Helpers
@@ -12,12 +15,12 @@ namespace Ryujinx.Ava.UI.Helpers
         internal class ButtonAssignedEventArgs : EventArgs
         {
             public ToggleButton Button { get; }
-            public ButtonValue? ButtonValue { get; }
+            public bool IsAssigned { get; }
 
-            public ButtonAssignedEventArgs(ToggleButton button, ButtonValue? buttonValue)
+            public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
             {
                 Button = button;
-                ButtonValue = buttonValue;
+                IsAssigned = isAssigned;
             }
         }
 
@@ -75,11 +78,15 @@ namespace Ryujinx.Ava.UI.Helpers
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                ButtonValue? pressedButton = assigner.GetPressedButton();
+                string pressedButton = assigner.GetPressedButton();
 
                 if (_shouldUnbind)
                 {
-                    pressedButton = null;
+                    SetButtonText(ToggledButton, "Unbound");
+                }
+                else if (pressedButton != "")
+                {
+                    SetButtonText(ToggledButton, pressedButton);
                 }
 
                 _shouldUnbind = false;
@@ -87,8 +94,17 @@ namespace Ryujinx.Ava.UI.Helpers
 
                 ToggledButton.IsChecked = false;
 
-                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
+                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton != null));
 
+                static void SetButtonText(ToggleButton button, string text)
+                {
+                    ILogical textBlock = button.GetLogicalDescendants().First(x => x is TextBlock);
+
+                    if (textBlock != null && textBlock is TextBlock block)
+                    {
+                        block.Text = text;
+                    }
+                }
             });
         }
 

src/Ryujinx.Ava/UI/Helpers/KeyValueConverter.cs

@@ -1,9 +1,7 @@
 using Avalonia.Data.Converters;
-using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 
 namespace Ryujinx.Ava.UI.Helpers
@@ -12,158 +10,37 @@ namespace Ryujinx.Ava.UI.Helpers
     {
         public static KeyValueConverter Instance = new();
 
-        private static readonly Dictionary<Key, LocaleKeys> _keysMap = new()
-        {
-            { Key.Unknown, LocaleKeys.KeyUnknown },
-            { Key.ShiftLeft, LocaleKeys.KeyShiftLeft },
-            { Key.ShiftRight, LocaleKeys.KeyShiftRight },
-            { Key.ControlLeft, LocaleKeys.KeyControlLeft },
-            { Key.ControlRight, LocaleKeys.KeyControlRight },
-            { Key.AltLeft, OperatingSystem.IsMacOS() ? LocaleKeys.KeyOptLeft : LocaleKeys.KeyAltLeft },
-            { Key.AltRight, OperatingSystem.IsMacOS() ? LocaleKeys.KeyOptRight : LocaleKeys.KeyAltRight },
-            { Key.WinLeft, OperatingSystem.IsMacOS() ? LocaleKeys.KeyCmdLeft : LocaleKeys.KeyWinLeft },
-            { Key.WinRight, OperatingSystem.IsMacOS() ? LocaleKeys.KeyCmdRight : LocaleKeys.KeyWinRight },
-            { Key.Up, LocaleKeys.KeyUp },
-            { Key.Down, LocaleKeys.KeyDown },
-            { Key.Left, LocaleKeys.KeyLeft },
-            { Key.Right, LocaleKeys.KeyRight },
-            { Key.Enter, LocaleKeys.KeyEnter },
-            { Key.Escape, LocaleKeys.KeyEscape },
-            { Key.Space, LocaleKeys.KeySpace },
-            { Key.Tab, LocaleKeys.KeyTab },
-            { Key.BackSpace, LocaleKeys.KeyBackSpace },
-            { Key.Insert, LocaleKeys.KeyInsert },
-            { Key.Delete, LocaleKeys.KeyDelete },
-            { Key.PageUp, LocaleKeys.KeyPageUp },
-            { Key.PageDown, LocaleKeys.KeyPageDown },
-            { Key.Home, LocaleKeys.KeyHome },
-            { Key.End, LocaleKeys.KeyEnd },
-            { Key.CapsLock, LocaleKeys.KeyCapsLock },
-            { Key.ScrollLock, LocaleKeys.KeyScrollLock },
-            { Key.PrintScreen, LocaleKeys.KeyPrintScreen },
-            { Key.Pause, LocaleKeys.KeyPause },
-            { Key.NumLock, LocaleKeys.KeyNumLock },
-            { Key.Clear, LocaleKeys.KeyClear },
-            { Key.Keypad0, LocaleKeys.KeyKeypad0 },
-            { Key.Keypad1, LocaleKeys.KeyKeypad1 },
-            { Key.Keypad2, LocaleKeys.KeyKeypad2 },
-            { Key.Keypad3, LocaleKeys.KeyKeypad3 },
-            { Key.Keypad4, LocaleKeys.KeyKeypad4 },
-            { Key.Keypad5, LocaleKeys.KeyKeypad5 },
-            { Key.Keypad6, LocaleKeys.KeyKeypad6 },
-            { Key.Keypad7, LocaleKeys.KeyKeypad7 },
-            { Key.Keypad8, LocaleKeys.KeyKeypad8 },
-            { Key.Keypad9, LocaleKeys.KeyKeypad9 },
-            { Key.KeypadDivide, LocaleKeys.KeyKeypadDivide },
-            { Key.KeypadMultiply, LocaleKeys.KeyKeypadMultiply },
-            { Key.KeypadSubtract, LocaleKeys.KeyKeypadSubtract },
-            { Key.KeypadAdd, LocaleKeys.KeyKeypadAdd },
-            { Key.KeypadDecimal, LocaleKeys.KeyKeypadDecimal },
-            { Key.KeypadEnter, LocaleKeys.KeyKeypadEnter },
-            { Key.Number0, LocaleKeys.KeyNumber0 },
-            { Key.Number1, LocaleKeys.KeyNumber1 },
-            { Key.Number2, LocaleKeys.KeyNumber2 },
-            { Key.Number3, LocaleKeys.KeyNumber3 },
-            { Key.Number4, LocaleKeys.KeyNumber4 },
-            { Key.Number5, LocaleKeys.KeyNumber5 },
-            { Key.Number6, LocaleKeys.KeyNumber6 },
-            { Key.Number7, LocaleKeys.KeyNumber7 },
-            { Key.Number8, LocaleKeys.KeyNumber8 },
-            { Key.Number9, LocaleKeys.KeyNumber9 },
-            { Key.Tilde, LocaleKeys.KeyTilde },
-            { Key.Grave, LocaleKeys.KeyGrave },
-            { Key.Minus, LocaleKeys.KeyMinus },
-            { Key.Plus, LocaleKeys.KeyPlus },
-            { Key.BracketLeft, LocaleKeys.KeyBracketLeft },
-            { Key.BracketRight, LocaleKeys.KeyBracketRight },
-            { Key.Semicolon, LocaleKeys.KeySemicolon },
-            { Key.Quote, LocaleKeys.KeyQuote },
-            { Key.Comma, LocaleKeys.KeyComma },
-            { Key.Period, LocaleKeys.KeyPeriod },
-            { Key.Slash, LocaleKeys.KeySlash },
-            { Key.BackSlash, LocaleKeys.KeyBackSlash },
-            { Key.Unbound, LocaleKeys.KeyUnbound },
-        };
-
-        private static readonly Dictionary<GamepadInputId, LocaleKeys> _gamepadInputIdMap = new()
-        {
-            { GamepadInputId.LeftStick, LocaleKeys.GamepadLeftStick },
-            { GamepadInputId.RightStick, LocaleKeys.GamepadRightStick },
-            { GamepadInputId.LeftShoulder, LocaleKeys.GamepadLeftShoulder },
-            { GamepadInputId.RightShoulder, LocaleKeys.GamepadRightShoulder },
-            { GamepadInputId.LeftTrigger, LocaleKeys.GamepadLeftTrigger },
-            { GamepadInputId.RightTrigger, LocaleKeys.GamepadRightTrigger },
-            { GamepadInputId.DpadUp, LocaleKeys.GamepadDpadUp},
-            { GamepadInputId.DpadDown, LocaleKeys.GamepadDpadDown},
-            { GamepadInputId.DpadLeft, LocaleKeys.GamepadDpadLeft},
-            { GamepadInputId.DpadRight, LocaleKeys.GamepadDpadRight},
-            { GamepadInputId.Minus, LocaleKeys.GamepadMinus},
-            { GamepadInputId.Plus, LocaleKeys.GamepadPlus},
-            { GamepadInputId.Guide, LocaleKeys.GamepadGuide},
-            { GamepadInputId.Misc1, LocaleKeys.GamepadMisc1},
-            { GamepadInputId.Paddle1, LocaleKeys.GamepadPaddle1},
-            { GamepadInputId.Paddle2, LocaleKeys.GamepadPaddle2},
-            { GamepadInputId.Paddle3, LocaleKeys.GamepadPaddle3},
-            { GamepadInputId.Paddle4, LocaleKeys.GamepadPaddle4},
-            { GamepadInputId.Touchpad, LocaleKeys.GamepadTouchpad},
-            { GamepadInputId.SingleLeftTrigger0, LocaleKeys.GamepadSingleLeftTrigger0},
-            { GamepadInputId.SingleRightTrigger0, LocaleKeys.GamepadSingleRightTrigger0},
-            { GamepadInputId.SingleLeftTrigger1, LocaleKeys.GamepadSingleLeftTrigger1},
-            { GamepadInputId.SingleRightTrigger1, LocaleKeys.GamepadSingleRightTrigger1},
-            { GamepadInputId.Unbound, LocaleKeys.KeyUnbound},
-        };
-
-        private static readonly Dictionary<StickInputId, LocaleKeys> _stickInputIdMap = new()
-        {
-            { StickInputId.Left, LocaleKeys.StickLeft},
-            { StickInputId.Right, LocaleKeys.StickRight},
-            { StickInputId.Unbound, LocaleKeys.KeyUnbound},
-        };
-
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            string keyString = "";
-
-            if (value is Key key)
+            if (value == null)
             {
-                if (_keysMap.TryGetValue(key, out LocaleKeys localeKey))
-                {
-                    keyString = LocaleManager.Instance[localeKey];
-                }
-                else
-                {
-                    keyString = key.ToString();
-                }
-            }
-            else if (value is GamepadInputId gamepadInputId)
-            {
-                if (_gamepadInputIdMap.TryGetValue(gamepadInputId, out LocaleKeys localeKey))
-                {
-                    keyString = LocaleManager.Instance[localeKey];
-                }
-                else
-                {
-                    keyString = gamepadInputId.ToString();
-                }
-            }
-            else if (value is StickInputId stickInputId)
-            {
-                if (_stickInputIdMap.TryGetValue(stickInputId, out LocaleKeys localeKey))
-                {
-                    keyString = LocaleManager.Instance[localeKey];
-                }
-                else
-                {
-                    keyString = stickInputId.ToString();
-                }
+                return null;
             }
 
-            return keyString;
+            return value.ToString();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotSupportedException();
+            object key = null;
+
+            if (value != null)
+            {
+                if (targetType == typeof(Key))
+                {
+                    key = Enum.Parse<Key>(value.ToString());
+                }
+                else if (targetType == typeof(GamepadInputId))
+                {
+                    key = Enum.Parse<GamepadInputId>(value.ToString());
+                }
+                else if (targetType == typeof(StickInputId))
+                {
+                    key = Enum.Parse<StickInputId>(value.ToString());
+                }
+            }
+
+            return key;
         }
     }
 }

src/Ryujinx.Ava/UI/Helpers/LocalizedNeverConverter.cs

@@ -0,0 +1,43 @@
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Xaml;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ui.Common.Helper;
+using System;
+using System.Globalization;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    /// <summary>
+    /// This <see cref="IValueConverter"/> makes sure that the string "Never" that's returned by <see cref="ValueFormatUtils.FormatDateTime"/> is properly localized in the Avalonia UI.
+    /// After the Avalonia UI has been made the default and the GTK UI is removed, <see cref="ValueFormatUtils"/> should be updated to directly return a localized string.
+    /// </summary>
+    internal class LocalizedNeverConverter : MarkupExtension, IValueConverter
+    {
+        private static readonly LocalizedNeverConverter _instance = new();
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is not string valStr)
+            {
+                return "";
+            }
+
+            if (valStr == "Never")
+            {
+                return LocaleManager.Instance[LocaleKeys.Never];
+            }
+
+            return valStr;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return _instance;
+        }
+    }
+}

src/Ryujinx.Ava/UI/Helpers/NullableDateTimeConverter.cs

@@ -1,38 +0,0 @@
-using Avalonia.Data.Converters;
-using Avalonia.Markup.Xaml;
-using Ryujinx.Ava.Common.Locale;
-using System;
-using System.Globalization;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    internal class NullableDateTimeConverter : MarkupExtension, IValueConverter
-    {
-        private static readonly NullableDateTimeConverter _instance = new();
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null)
-            {
-                return LocaleManager.Instance[LocaleKeys.Never];
-            }
-
-            if (value is DateTime dateTime)
-            {
-                return dateTime.ToLocalTime().ToString(culture);
-            }
-
-            throw new NotSupportedException();
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return _instance;
-        }
-    }
-}

src/Ryujinx.Ava/UI/Helpers/Win32NativeInterop.cs

@@ -86,7 +86,7 @@ namespace Ryujinx.Ava.UI.Helpers
         public static partial IntPtr SetCursor(IntPtr handle);
 
         [LibraryImport("user32.dll")]
-        public static partial IntPtr CreateCursor(IntPtr hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, byte[] pvAndPlane, byte[] pvXorPlane);
+        public static partial IntPtr CreateCursor(IntPtr hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, [In] byte[] pvAndPlane, [In] byte[] pvXorPlane);
 
         [LibraryImport("user32.dll", SetLastError = true, EntryPoint = "RegisterClassExW")]
         public static partial ushort RegisterClassEx(ref WndClassEx param);

src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs

@@ -13,20 +13,19 @@ namespace Ryujinx.Ava.UI.Models.Generic
 
         public int Compare(ApplicationData x, ApplicationData y)
         {
-            var aValue = x.LastPlayed;
-            var bValue = y.LastPlayed;
+            DateTime aValue = DateTime.UnixEpoch, bValue = DateTime.UnixEpoch;
 
-            if (!aValue.HasValue)
+            if (x?.LastPlayed != null)
             {
-                aValue = DateTime.UnixEpoch;
+                aValue = x.LastPlayed.Value;
             }
 
-            if (!bValue.HasValue)
+            if (y?.LastPlayed != null)
             {
-                bValue = DateTime.UnixEpoch;
+                bValue = y.LastPlayed.Value;
             }
 
-            return (IsAscending ? 1 : -1) * DateTime.Compare(bValue.Value, aValue.Value);
+            return (IsAscending ? 1 : -1) * DateTime.Compare(aValue, bValue);
         }
     }
 }

src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs

@@ -0,0 +1,31 @@
+using Ryujinx.Ui.App.Common;
+using System;
+using System.Collections.Generic;
+
+namespace Ryujinx.Ava.UI.Models.Generic
+{
+    internal class TimePlayedSortComparer : IComparer<ApplicationData>
+    {
+        public TimePlayedSortComparer() { }
+        public TimePlayedSortComparer(bool isAscending) { IsAscending = isAscending; }
+
+        public bool IsAscending { get; }
+
+        public int Compare(ApplicationData x, ApplicationData y)
+        {
+            TimeSpan aValue = TimeSpan.Zero, bValue = TimeSpan.Zero;
+
+            if (x?.TimePlayed != null)
+            {
+                aValue = x.TimePlayed;
+            }
+
+            if (y?.TimePlayed != null)
+            {
+                bValue = y.TimePlayed;
+            }
+
+            return (IsAscending ? 1 : -1) * TimeSpan.Compare(aValue, bValue);
+        }
+    }
+}

src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs

@@ -1,580 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Controller;
-using Ryujinx.Common.Configuration.Hid.Controller.Motion;
-using System;
-
-namespace Ryujinx.Ava.UI.Models.Input
-{
-    public class ControllerInputConfig : BaseModel
-    {
-        public bool EnableCemuHookMotion { get; set; }
-        public string DsuServerHost { get; set; }
-        public int DsuServerPort { get; set; }
-        public int Slot { get; set; }
-        public int AltSlot { get; set; }
-        public bool MirrorInput { get; set; }
-        public int Sensitivity { get; set; }
-        public double GyroDeadzone { get; set; }
-
-        public float WeakRumble { get; set; }
-        public float StrongRumble { get; set; }
-
-        public string Id { get; set; }
-        public ControllerType ControllerType { get; set; }
-        public PlayerIndex PlayerIndex { get; set; }
-
-        private StickInputId _leftJoystick;
-        public StickInputId LeftJoystick
-        {
-            get => _leftJoystick;
-            set
-            {
-                _leftJoystick = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _leftInvertStickX;
-        public bool LeftInvertStickX
-        {
-            get => _leftInvertStickX;
-            set
-            {
-                _leftInvertStickX = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _leftInvertStickY;
-        public bool LeftInvertStickY
-        {
-            get => _leftInvertStickY;
-            set
-            {
-                _leftInvertStickY = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _leftRotate90;
-        public bool LeftRotate90
-        {
-            get => _leftRotate90;
-            set
-            {
-                _leftRotate90 = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _leftStickButton;
-        public GamepadInputId LeftStickButton
-        {
-            get => _leftStickButton;
-            set
-            {
-                _leftStickButton = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private StickInputId _rightJoystick;
-        public StickInputId RightJoystick
-        {
-            get => _rightJoystick;
-            set
-            {
-                _rightJoystick = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _rightInvertStickX;
-        public bool RightInvertStickX
-        {
-            get => _rightInvertStickX;
-            set
-            {
-                _rightInvertStickX = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _rightInvertStickY;
-        public bool RightInvertStickY
-        {
-            get => _rightInvertStickY;
-            set
-            {
-                _rightInvertStickY = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _rightRotate90;
-        public bool RightRotate90
-        {
-            get => _rightRotate90;
-            set
-            {
-                _rightRotate90 = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _rightStickButton;
-        public GamepadInputId RightStickButton
-        {
-            get => _rightStickButton;
-            set
-            {
-                _rightStickButton = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _dpadUp;
-        public GamepadInputId DpadUp
-        {
-            get => _dpadUp;
-            set
-            {
-                _dpadUp = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _dpadDown;
-        public GamepadInputId DpadDown
-        {
-            get => _dpadDown;
-            set
-            {
-                _dpadDown = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _dpadLeft;
-        public GamepadInputId DpadLeft
-        {
-            get => _dpadLeft;
-            set
-            {
-                _dpadLeft = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _dpadRight;
-        public GamepadInputId DpadRight
-        {
-            get => _dpadRight;
-            set
-            {
-                _dpadRight = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonL;
-        public GamepadInputId ButtonL
-        {
-            get => _buttonL;
-            set
-            {
-                _buttonL = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonMinus;
-        public GamepadInputId ButtonMinus
-        {
-            get => _buttonMinus;
-            set
-            {
-                _buttonMinus = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _leftButtonSl;
-        public GamepadInputId LeftButtonSl
-        {
-            get => _leftButtonSl;
-            set
-            {
-                _leftButtonSl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _leftButtonSr;
-        public GamepadInputId LeftButtonSr
-        {
-            get => _leftButtonSr;
-            set
-            {
-                _leftButtonSr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonZl;
-        public GamepadInputId ButtonZl
-        {
-            get => _buttonZl;
-            set
-            {
-                _buttonZl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonA;
-        public GamepadInputId ButtonA
-        {
-            get => _buttonA;
-            set
-            {
-                _buttonA = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonB;
-        public GamepadInputId ButtonB
-        {
-            get => _buttonB;
-            set
-            {
-                _buttonB = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonX;
-        public GamepadInputId ButtonX
-        {
-            get => _buttonX;
-            set
-            {
-                _buttonX = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonY;
-        public GamepadInputId ButtonY
-        {
-            get => _buttonY;
-            set
-            {
-                _buttonY = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonR;
-        public GamepadInputId ButtonR
-        {
-            get => _buttonR;
-            set
-            {
-                _buttonR = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonPlus;
-        public GamepadInputId ButtonPlus
-        {
-            get => _buttonPlus;
-            set
-            {
-                _buttonPlus = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _rightButtonSl;
-        public GamepadInputId RightButtonSl
-        {
-            get => _rightButtonSl;
-            set
-            {
-                _rightButtonSl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _rightButtonSr;
-        public GamepadInputId RightButtonSr
-        {
-            get => _rightButtonSr;
-            set
-            {
-                _rightButtonSr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputId _buttonZr;
-        public GamepadInputId ButtonZr
-        {
-            get => _buttonZr;
-            set
-            {
-                _buttonZr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private float _deadzoneLeft;
-        public float DeadzoneLeft
-        {
-            get => _deadzoneLeft;
-            set
-            {
-                _deadzoneLeft = MathF.Round(value, 3);
-                OnPropertyChanged();
-            }
-        }
-
-        private float _deadzoneRight;
-        public float DeadzoneRight
-        {
-            get => _deadzoneRight;
-            set
-            {
-                _deadzoneRight = MathF.Round(value, 3);
-                OnPropertyChanged();
-            }
-        }
-
-        private float _rangeLeft;
-        public float RangeLeft
-        {
-            get => _rangeLeft;
-            set
-            {
-                _rangeLeft = MathF.Round(value, 3);
-                OnPropertyChanged();
-            }
-        }
-
-        private float _rangeRight;
-        public float RangeRight
-        {
-            get => _rangeRight;
-            set
-            {
-                _rangeRight = MathF.Round(value, 3);
-                OnPropertyChanged();
-            }
-        }
-
-        private float _triggerThreshold;
-        public float TriggerThreshold
-        {
-            get => _triggerThreshold;
-            set
-            {
-                _triggerThreshold = MathF.Round(value, 3);
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _enableMotion;
-        public bool EnableMotion
-        {
-            get => _enableMotion;
-            set
-            {
-                _enableMotion = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _enableRumble;
-        public bool EnableRumble
-        {
-            get => _enableRumble;
-            set
-            {
-                _enableRumble = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public ControllerInputConfig(InputConfig config)
-        {
-            if (config != null)
-            {
-                Id = config.Id;
-                ControllerType = config.ControllerType;
-                PlayerIndex = config.PlayerIndex;
-
-                if (config is not StandardControllerInputConfig controllerInput)
-                {
-                    return;
-                }
-
-                LeftJoystick = controllerInput.LeftJoyconStick.Joystick;
-                LeftInvertStickX = controllerInput.LeftJoyconStick.InvertStickX;
-                LeftInvertStickY = controllerInput.LeftJoyconStick.InvertStickY;
-                LeftRotate90 = controllerInput.LeftJoyconStick.Rotate90CW;
-                LeftStickButton = controllerInput.LeftJoyconStick.StickButton;
-
-                RightJoystick = controllerInput.RightJoyconStick.Joystick;
-                RightInvertStickX = controllerInput.RightJoyconStick.InvertStickX;
-                RightInvertStickY = controllerInput.RightJoyconStick.InvertStickY;
-                RightRotate90 = controllerInput.RightJoyconStick.Rotate90CW;
-                RightStickButton = controllerInput.RightJoyconStick.StickButton;
-
-                DpadUp = controllerInput.LeftJoycon.DpadUp;
-                DpadDown = controllerInput.LeftJoycon.DpadDown;
-                DpadLeft = controllerInput.LeftJoycon.DpadLeft;
-                DpadRight = controllerInput.LeftJoycon.DpadRight;
-                ButtonL = controllerInput.LeftJoycon.ButtonL;
-                ButtonMinus = controllerInput.LeftJoycon.ButtonMinus;
-                LeftButtonSl = controllerInput.LeftJoycon.ButtonSl;
-                LeftButtonSr = controllerInput.LeftJoycon.ButtonSr;
-                ButtonZl = controllerInput.LeftJoycon.ButtonZl;
-
-                ButtonA = controllerInput.RightJoycon.ButtonA;
-                ButtonB = controllerInput.RightJoycon.ButtonB;
-                ButtonX = controllerInput.RightJoycon.ButtonX;
-                ButtonY = controllerInput.RightJoycon.ButtonY;
-                ButtonR = controllerInput.RightJoycon.ButtonR;
-                ButtonPlus = controllerInput.RightJoycon.ButtonPlus;
-                RightButtonSl = controllerInput.RightJoycon.ButtonSl;
-                RightButtonSr = controllerInput.RightJoycon.ButtonSr;
-                ButtonZr = controllerInput.RightJoycon.ButtonZr;
-
-                DeadzoneLeft = controllerInput.DeadzoneLeft;
-                DeadzoneRight = controllerInput.DeadzoneRight;
-                RangeLeft = controllerInput.RangeLeft;
-                RangeRight = controllerInput.RangeRight;
-                TriggerThreshold = controllerInput.TriggerThreshold;
-
-                if (controllerInput.Motion != null)
-                {
-                    EnableMotion = controllerInput.Motion.EnableMotion;
-                    GyroDeadzone = controllerInput.Motion.GyroDeadzone;
-                    Sensitivity = controllerInput.Motion.Sensitivity;
-
-                    if (controllerInput.Motion is CemuHookMotionConfigController cemuHook)
-                    {
-                        EnableCemuHookMotion = true;
-                        DsuServerHost = cemuHook.DsuServerHost;
-                        DsuServerPort = cemuHook.DsuServerPort;
-                        Slot = cemuHook.Slot;
-                        AltSlot = cemuHook.AltSlot;
-                        MirrorInput = cemuHook.MirrorInput;
-                    }
-                }
-
-                if (controllerInput.Rumble != null)
-                {
-                    EnableRumble = controllerInput.Rumble.EnableRumble;
-                    WeakRumble = controllerInput.Rumble.WeakRumble;
-                    StrongRumble = controllerInput.Rumble.StrongRumble;
-                }
-            }
-        }
-
-        public InputConfig GetConfig()
-        {
-            var config = new StandardControllerInputConfig
-            {
-                Id = Id,
-                Backend = InputBackendType.GamepadSDL2,
-                PlayerIndex = PlayerIndex,
-                ControllerType = ControllerType,
-                LeftJoycon = new LeftJoyconCommonConfig<GamepadInputId>
-                {
-                    DpadUp = DpadUp,
-                    DpadDown = DpadDown,
-                    DpadLeft = DpadLeft,
-                    DpadRight = DpadRight,
-                    ButtonL = ButtonL,
-                    ButtonMinus = ButtonMinus,
-                    ButtonSl = LeftButtonSl,
-                    ButtonSr = LeftButtonSr,
-                    ButtonZl = ButtonZl
-                },
-                RightJoycon = new RightJoyconCommonConfig<GamepadInputId>
-                {
-                    ButtonA = ButtonA,
-                    ButtonB = ButtonB,
-                    ButtonX = ButtonX,
-                    ButtonY = ButtonY,
-                    ButtonPlus = ButtonPlus,
-                    ButtonSl = RightButtonSl,
-                    ButtonSr = RightButtonSr,
-                    ButtonR = ButtonR,
-                    ButtonZr = ButtonZr
-                },
-                LeftJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
-                {
-                    Joystick = LeftJoystick,
-                    InvertStickX = LeftInvertStickX,
-                    InvertStickY = LeftInvertStickY,
-                    Rotate90CW = LeftRotate90,
-                    StickButton = LeftStickButton
-                },
-                RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
-                {
-                    Joystick = RightJoystick,
-                    InvertStickX = RightInvertStickX,
-                    InvertStickY = RightInvertStickY,
-                    Rotate90CW = RightRotate90,
-                    StickButton = RightStickButton
-                },
-                Rumble = new RumbleConfigController
-                {
-                    EnableRumble = EnableRumble,
-                    WeakRumble = WeakRumble,
-                    StrongRumble = StrongRumble
-                },
-                Version = InputConfig.CurrentVersion,
-                DeadzoneLeft = DeadzoneLeft,
-                DeadzoneRight = DeadzoneRight,
-                RangeLeft = RangeLeft,
-                RangeRight = RangeRight,
-                TriggerThreshold = TriggerThreshold
-            };
-
-            if (EnableCemuHookMotion)
-            {
-                config.Motion = new CemuHookMotionConfigController
-                {
-                    EnableMotion = EnableMotion,
-                    MotionBackend = MotionInputBackendType.CemuHook,
-                    GyroDeadzone = GyroDeadzone,
-                    Sensitivity = Sensitivity,
-                    DsuServerHost = DsuServerHost,
-                    DsuServerPort = DsuServerPort,
-                    Slot = Slot,
-                    AltSlot = AltSlot,
-                    MirrorInput = MirrorInput
-                };
-            }
-            else
-            {
-                config.Motion = new MotionConfigController
-                {
-                    EnableMotion = EnableMotion,
-                    MotionBackend = MotionInputBackendType.GamepadDriver,
-                    GyroDeadzone = GyroDeadzone,
-                    Sensitivity = Sensitivity
-                };
-            }
-
-            return config;
-        }
-    }
-}

src/Ryujinx.Ava/UI/Models/Input/KeyboardInputConfig.cs

@@ -1,422 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Keyboard;
-
-namespace Ryujinx.Ava.UI.Models.Input
-{
-    public class KeyboardInputConfig : BaseModel
-    {
-        public string Id { get; set; }
-        public ControllerType ControllerType { get; set; }
-        public PlayerIndex PlayerIndex { get; set; }
-
-        private Key _leftStickUp;
-        public Key LeftStickUp
-        {
-            get => _leftStickUp;
-            set
-            {
-                _leftStickUp = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftStickDown;
-        public Key LeftStickDown
-        {
-            get => _leftStickDown;
-            set
-            {
-                _leftStickDown = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftStickLeft;
-        public Key LeftStickLeft
-        {
-            get => _leftStickLeft;
-            set
-            {
-                _leftStickLeft = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftStickRight;
-        public Key LeftStickRight
-        {
-            get => _leftStickRight;
-            set
-            {
-                _leftStickRight = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftStickButton;
-        public Key LeftStickButton
-        {
-            get => _leftStickButton;
-            set
-            {
-                _leftStickButton = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightStickUp;
-        public Key RightStickUp
-        {
-            get => _rightStickUp;
-            set
-            {
-                _rightStickUp = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightStickDown;
-        public Key RightStickDown
-        {
-            get => _rightStickDown;
-            set
-            {
-                _rightStickDown = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightStickLeft;
-        public Key RightStickLeft
-        {
-            get => _rightStickLeft;
-            set
-            {
-                _rightStickLeft = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightStickRight;
-        public Key RightStickRight
-        {
-            get => _rightStickRight;
-            set
-            {
-                _rightStickRight = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightStickButton;
-        public Key RightStickButton
-        {
-            get => _rightStickButton;
-            set
-            {
-                _rightStickButton = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _dpadUp;
-        public Key DpadUp
-        {
-            get => _dpadUp;
-            set
-            {
-                _dpadUp = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _dpadDown;
-        public Key DpadDown
-        {
-            get => _dpadDown;
-            set
-            {
-                _dpadDown = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _dpadLeft;
-        public Key DpadLeft
-        {
-            get => _dpadLeft;
-            set
-            {
-                _dpadLeft = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _dpadRight;
-        public Key DpadRight
-        {
-            get => _dpadRight;
-            set
-            {
-                _dpadRight = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonL;
-        public Key ButtonL
-        {
-            get => _buttonL;
-            set
-            {
-                _buttonL = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonMinus;
-        public Key ButtonMinus
-        {
-            get => _buttonMinus;
-            set
-            {
-                _buttonMinus = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftButtonSl;
-        public Key LeftButtonSl
-        {
-            get => _leftButtonSl;
-            set
-            {
-                _leftButtonSl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _leftButtonSr;
-        public Key LeftButtonSr
-        {
-            get => _leftButtonSr;
-            set
-            {
-                _leftButtonSr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonZl;
-        public Key ButtonZl
-        {
-            get => _buttonZl;
-            set
-            {
-                _buttonZl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonA;
-        public Key ButtonA
-        {
-            get => _buttonA;
-            set
-            {
-                _buttonA = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonB;
-        public Key ButtonB
-        {
-            get => _buttonB;
-            set
-            {
-                _buttonB = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonX;
-        public Key ButtonX
-        {
-            get => _buttonX;
-            set
-            {
-                _buttonX = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonY;
-        public Key ButtonY
-        {
-            get => _buttonY;
-            set
-            {
-                _buttonY = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonR;
-        public Key ButtonR
-        {
-            get => _buttonR;
-            set
-            {
-                _buttonR = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonPlus;
-        public Key ButtonPlus
-        {
-            get => _buttonPlus;
-            set
-            {
-                _buttonPlus = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightButtonSl;
-        public Key RightButtonSl
-        {
-            get => _rightButtonSl;
-            set
-            {
-                _rightButtonSl = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _rightButtonSr;
-        public Key RightButtonSr
-        {
-            get => _rightButtonSr;
-            set
-            {
-                _rightButtonSr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private Key _buttonZr;
-        public Key ButtonZr
-        {
-            get => _buttonZr;
-            set
-            {
-                _buttonZr = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public KeyboardInputConfig(InputConfig config)
-        {
-            if (config != null)
-            {
-                Id = config.Id;
-                ControllerType = config.ControllerType;
-                PlayerIndex = config.PlayerIndex;
-
-                if (config is not StandardKeyboardInputConfig keyboardConfig)
-                {
-                    return;
-                }
-
-                LeftStickUp = keyboardConfig.LeftJoyconStick.StickUp;
-                LeftStickDown = keyboardConfig.LeftJoyconStick.StickDown;
-                LeftStickLeft = keyboardConfig.LeftJoyconStick.StickLeft;
-                LeftStickRight = keyboardConfig.LeftJoyconStick.StickRight;
-                LeftStickButton = keyboardConfig.LeftJoyconStick.StickButton;
-
-                RightStickUp = keyboardConfig.RightJoyconStick.StickUp;
-                RightStickDown = keyboardConfig.RightJoyconStick.StickDown;
-                RightStickLeft = keyboardConfig.RightJoyconStick.StickLeft;
-                RightStickRight = keyboardConfig.RightJoyconStick.StickRight;
-                RightStickButton = keyboardConfig.RightJoyconStick.StickButton;
-
-                DpadUp = keyboardConfig.LeftJoycon.DpadUp;
-                DpadDown = keyboardConfig.LeftJoycon.DpadDown;
-                DpadLeft = keyboardConfig.LeftJoycon.DpadLeft;
-                DpadRight = keyboardConfig.LeftJoycon.DpadRight;
-                ButtonL = keyboardConfig.LeftJoycon.ButtonL;
-                ButtonMinus = keyboardConfig.LeftJoycon.ButtonMinus;
-                LeftButtonSl = keyboardConfig.LeftJoycon.ButtonSl;
-                LeftButtonSr = keyboardConfig.LeftJoycon.ButtonSr;
-                ButtonZl = keyboardConfig.LeftJoycon.ButtonZl;
-
-                ButtonA = keyboardConfig.RightJoycon.ButtonA;
-                ButtonB = keyboardConfig.RightJoycon.ButtonB;
-                ButtonX = keyboardConfig.RightJoycon.ButtonX;
-                ButtonY = keyboardConfig.RightJoycon.ButtonY;
-                ButtonR = keyboardConfig.RightJoycon.ButtonR;
-                ButtonPlus = keyboardConfig.RightJoycon.ButtonPlus;
-                RightButtonSl = keyboardConfig.RightJoycon.ButtonSl;
-                RightButtonSr = keyboardConfig.RightJoycon.ButtonSr;
-                ButtonZr = keyboardConfig.RightJoycon.ButtonZr;
-            }
-        }
-
-        public InputConfig GetConfig()
-        {
-            var config = new StandardKeyboardInputConfig
-            {
-                Id = Id,
-                Backend = InputBackendType.WindowKeyboard,
-                PlayerIndex = PlayerIndex,
-                ControllerType = ControllerType,
-                LeftJoycon = new LeftJoyconCommonConfig<Key>
-                {
-                    DpadUp = DpadUp,
-                    DpadDown = DpadDown,
-                    DpadLeft = DpadLeft,
-                    DpadRight = DpadRight,
-                    ButtonL = ButtonL,
-                    ButtonMinus = ButtonMinus,
-                    ButtonZl = ButtonZl,
-                    ButtonSl = LeftButtonSl,
-                    ButtonSr = LeftButtonSr
-                },
-                RightJoycon = new RightJoyconCommonConfig<Key>
-                {
-                    ButtonA = ButtonA,
-                    ButtonB = ButtonB,
-                    ButtonX = ButtonX,
-                    ButtonY = ButtonY,
-                    ButtonPlus = ButtonPlus,
-                    ButtonSl = RightButtonSl,
-                    ButtonSr = RightButtonSr,
-                    ButtonR = ButtonR,
-                    ButtonZr = ButtonZr
-                },
-                LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
-                {
-                    StickUp = LeftStickUp,
-                    StickDown = LeftStickDown,
-                    StickRight = LeftStickRight,
-                    StickLeft = LeftStickLeft,
-                    StickButton = LeftStickButton
-                },
-                RightJoyconStick = new JoyconConfigKeyboardStick<Key>
-                {
-                    StickUp = RightStickUp,
-                    StickDown = RightStickDown,
-                    StickLeft = RightStickLeft,
-                    StickRight = RightStickRight,
-                    StickButton = RightStickButton
-                },
-                Version = InputConfig.CurrentVersion
-            };
-
-            return config;
-        }
-    }
-}

src/Ryujinx.Ava/UI/Models/InputConfiguration.cs

@@ -0,0 +1,456 @@
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Configuration.Hid.Controller.Motion;
+using Ryujinx.Common.Configuration.Hid.Keyboard;
+using System;
+
+namespace Ryujinx.Ava.UI.Models
+{
+    internal class InputConfiguration<TKey, TStick> : BaseModel
+    {
+        private float _deadzoneRight;
+        private float _triggerThreshold;
+        private float _deadzoneLeft;
+        private double _gyroDeadzone;
+        private int _sensitivity;
+        private bool _enableMotion;
+        private float _weakRumble;
+        private float _strongRumble;
+        private float _rangeLeft;
+        private float _rangeRight;
+
+        public InputBackendType Backend { get; set; }
+
+        /// <summary>
+        /// Controller id
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        ///  Controller's Type
+        /// </summary>
+        public ControllerType ControllerType { get; set; }
+
+        /// <summary>
+        ///  Player's Index for the controller
+        /// </summary>
+        public PlayerIndex PlayerIndex { get; set; }
+
+        public TStick LeftJoystick { get; set; }
+        public bool LeftInvertStickX { get; set; }
+        public bool LeftInvertStickY { get; set; }
+        public bool RightRotate90 { get; set; }
+        public TKey LeftControllerStickButton { get; set; }
+
+        public TStick RightJoystick { get; set; }
+        public bool RightInvertStickX { get; set; }
+        public bool RightInvertStickY { get; set; }
+        public bool LeftRotate90 { get; set; }
+        public TKey RightControllerStickButton { get; set; }
+
+        public float DeadzoneLeft
+        {
+            get => _deadzoneLeft;
+            set
+            {
+                _deadzoneLeft = MathF.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public float RangeLeft
+        {
+            get => _rangeLeft;
+            set
+            {
+                _rangeLeft = MathF.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public float DeadzoneRight
+        {
+            get => _deadzoneRight;
+            set
+            {
+                _deadzoneRight = MathF.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public float RangeRight
+        {
+            get => _rangeRight;
+            set
+            {
+                _rangeRight = MathF.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public float TriggerThreshold
+        {
+            get => _triggerThreshold;
+            set
+            {
+                _triggerThreshold = MathF.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public MotionInputBackendType MotionBackend { get; set; }
+
+        public TKey ButtonMinus { get; set; }
+        public TKey ButtonL { get; set; }
+        public TKey ButtonZl { get; set; }
+        public TKey LeftButtonSl { get; set; }
+        public TKey LeftButtonSr { get; set; }
+        public TKey DpadUp { get; set; }
+        public TKey DpadDown { get; set; }
+        public TKey DpadLeft { get; set; }
+        public TKey DpadRight { get; set; }
+
+        public TKey ButtonPlus { get; set; }
+        public TKey ButtonR { get; set; }
+        public TKey ButtonZr { get; set; }
+        public TKey RightButtonSl { get; set; }
+        public TKey RightButtonSr { get; set; }
+        public TKey ButtonX { get; set; }
+        public TKey ButtonB { get; set; }
+        public TKey ButtonY { get; set; }
+        public TKey ButtonA { get; set; }
+
+        public TKey LeftStickUp { get; set; }
+        public TKey LeftStickDown { get; set; }
+        public TKey LeftStickLeft { get; set; }
+        public TKey LeftStickRight { get; set; }
+        public TKey LeftKeyboardStickButton { get; set; }
+
+        public TKey RightStickUp { get; set; }
+        public TKey RightStickDown { get; set; }
+        public TKey RightStickLeft { get; set; }
+        public TKey RightStickRight { get; set; }
+        public TKey RightKeyboardStickButton { get; set; }
+
+        public int Sensitivity
+        {
+            get => _sensitivity;
+            set
+            {
+                _sensitivity = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public double GyroDeadzone
+        {
+            get => _gyroDeadzone;
+            set
+            {
+                _gyroDeadzone = Math.Round(value, 3);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public bool EnableMotion
+        {
+            get => _enableMotion; set
+            {
+                _enableMotion = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public bool EnableCemuHookMotion { get; set; }
+        public int Slot { get; set; }
+        public int AltSlot { get; set; }
+        public bool MirrorInput { get; set; }
+        public string DsuServerHost { get; set; }
+        public int DsuServerPort { get; set; }
+
+        public bool EnableRumble { get; set; }
+        public float WeakRumble
+        {
+            get => _weakRumble; set
+            {
+                _weakRumble = value;
+
+                OnPropertyChanged();
+            }
+        }
+        public float StrongRumble
+        {
+            get => _strongRumble; set
+            {
+                _strongRumble = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public InputConfiguration(InputConfig config)
+        {
+            if (config != null)
+            {
+                Backend = config.Backend;
+                Id = config.Id;
+                ControllerType = config.ControllerType;
+                PlayerIndex = config.PlayerIndex;
+
+                if (config is StandardKeyboardInputConfig keyboardConfig)
+                {
+                    LeftStickUp = (TKey)(object)keyboardConfig.LeftJoyconStick.StickUp;
+                    LeftStickDown = (TKey)(object)keyboardConfig.LeftJoyconStick.StickDown;
+                    LeftStickLeft = (TKey)(object)keyboardConfig.LeftJoyconStick.StickLeft;
+                    LeftStickRight = (TKey)(object)keyboardConfig.LeftJoyconStick.StickRight;
+                    LeftKeyboardStickButton = (TKey)(object)keyboardConfig.LeftJoyconStick.StickButton;
+
+                    RightStickUp = (TKey)(object)keyboardConfig.RightJoyconStick.StickUp;
+                    RightStickDown = (TKey)(object)keyboardConfig.RightJoyconStick.StickDown;
+                    RightStickLeft = (TKey)(object)keyboardConfig.RightJoyconStick.StickLeft;
+                    RightStickRight = (TKey)(object)keyboardConfig.RightJoyconStick.StickRight;
+                    RightKeyboardStickButton = (TKey)(object)keyboardConfig.RightJoyconStick.StickButton;
+
+                    ButtonA = (TKey)(object)keyboardConfig.RightJoycon.ButtonA;
+                    ButtonB = (TKey)(object)keyboardConfig.RightJoycon.ButtonB;
+                    ButtonX = (TKey)(object)keyboardConfig.RightJoycon.ButtonX;
+                    ButtonY = (TKey)(object)keyboardConfig.RightJoycon.ButtonY;
+                    ButtonR = (TKey)(object)keyboardConfig.RightJoycon.ButtonR;
+                    RightButtonSl = (TKey)(object)keyboardConfig.RightJoycon.ButtonSl;
+                    RightButtonSr = (TKey)(object)keyboardConfig.RightJoycon.ButtonSr;
+                    ButtonZr = (TKey)(object)keyboardConfig.RightJoycon.ButtonZr;
+                    ButtonPlus = (TKey)(object)keyboardConfig.RightJoycon.ButtonPlus;
+
+                    DpadUp = (TKey)(object)keyboardConfig.LeftJoycon.DpadUp;
+                    DpadDown = (TKey)(object)keyboardConfig.LeftJoycon.DpadDown;
+                    DpadLeft = (TKey)(object)keyboardConfig.LeftJoycon.DpadLeft;
+                    DpadRight = (TKey)(object)keyboardConfig.LeftJoycon.DpadRight;
+                    ButtonMinus = (TKey)(object)keyboardConfig.LeftJoycon.ButtonMinus;
+                    LeftButtonSl = (TKey)(object)keyboardConfig.LeftJoycon.ButtonSl;
+                    LeftButtonSr = (TKey)(object)keyboardConfig.LeftJoycon.ButtonSr;
+                    ButtonZl = (TKey)(object)keyboardConfig.LeftJoycon.ButtonZl;
+                    ButtonL = (TKey)(object)keyboardConfig.LeftJoycon.ButtonL;
+                }
+                else if (config is StandardControllerInputConfig controllerConfig)
+                {
+                    LeftJoystick = (TStick)(object)controllerConfig.LeftJoyconStick.Joystick;
+                    LeftInvertStickX = controllerConfig.LeftJoyconStick.InvertStickX;
+                    LeftInvertStickY = controllerConfig.LeftJoyconStick.InvertStickY;
+                    LeftRotate90 = controllerConfig.LeftJoyconStick.Rotate90CW;
+                    LeftControllerStickButton = (TKey)(object)controllerConfig.LeftJoyconStick.StickButton;
+
+                    RightJoystick = (TStick)(object)controllerConfig.RightJoyconStick.Joystick;
+                    RightInvertStickX = controllerConfig.RightJoyconStick.InvertStickX;
+                    RightInvertStickY = controllerConfig.RightJoyconStick.InvertStickY;
+                    RightRotate90 = controllerConfig.RightJoyconStick.Rotate90CW;
+                    RightControllerStickButton = (TKey)(object)controllerConfig.RightJoyconStick.StickButton;
+
+                    ButtonA = (TKey)(object)controllerConfig.RightJoycon.ButtonA;
+                    ButtonB = (TKey)(object)controllerConfig.RightJoycon.ButtonB;
+                    ButtonX = (TKey)(object)controllerConfig.RightJoycon.ButtonX;
+                    ButtonY = (TKey)(object)controllerConfig.RightJoycon.ButtonY;
+                    ButtonR = (TKey)(object)controllerConfig.RightJoycon.ButtonR;
+                    RightButtonSl = (TKey)(object)controllerConfig.RightJoycon.ButtonSl;
+                    RightButtonSr = (TKey)(object)controllerConfig.RightJoycon.ButtonSr;
+                    ButtonZr = (TKey)(object)controllerConfig.RightJoycon.ButtonZr;
+                    ButtonPlus = (TKey)(object)controllerConfig.RightJoycon.ButtonPlus;
+
+                    DpadUp = (TKey)(object)controllerConfig.LeftJoycon.DpadUp;
+                    DpadDown = (TKey)(object)controllerConfig.LeftJoycon.DpadDown;
+                    DpadLeft = (TKey)(object)controllerConfig.LeftJoycon.DpadLeft;
+                    DpadRight = (TKey)(object)controllerConfig.LeftJoycon.DpadRight;
+                    ButtonMinus = (TKey)(object)controllerConfig.LeftJoycon.ButtonMinus;
+                    LeftButtonSl = (TKey)(object)controllerConfig.LeftJoycon.ButtonSl;
+                    LeftButtonSr = (TKey)(object)controllerConfig.LeftJoycon.ButtonSr;
+                    ButtonZl = (TKey)(object)controllerConfig.LeftJoycon.ButtonZl;
+                    ButtonL = (TKey)(object)controllerConfig.LeftJoycon.ButtonL;
+
+                    DeadzoneLeft = controllerConfig.DeadzoneLeft;
+                    DeadzoneRight = controllerConfig.DeadzoneRight;
+                    RangeLeft = controllerConfig.RangeLeft;
+                    RangeRight = controllerConfig.RangeRight;
+                    TriggerThreshold = controllerConfig.TriggerThreshold;
+
+                    if (controllerConfig.Motion != null)
+                    {
+                        EnableMotion = controllerConfig.Motion.EnableMotion;
+                        MotionBackend = controllerConfig.Motion.MotionBackend;
+                        GyroDeadzone = controllerConfig.Motion.GyroDeadzone;
+                        Sensitivity = controllerConfig.Motion.Sensitivity;
+
+                        if (controllerConfig.Motion is CemuHookMotionConfigController cemuHook)
+                        {
+                            EnableCemuHookMotion = true;
+                            DsuServerHost = cemuHook.DsuServerHost;
+                            DsuServerPort = cemuHook.DsuServerPort;
+                            Slot = cemuHook.Slot;
+                            AltSlot = cemuHook.AltSlot;
+                            MirrorInput = cemuHook.MirrorInput;
+                        }
+
+                        if (controllerConfig.Rumble != null)
+                        {
+                            EnableRumble = controllerConfig.Rumble.EnableRumble;
+                            WeakRumble = controllerConfig.Rumble.WeakRumble;
+                            StrongRumble = controllerConfig.Rumble.StrongRumble;
+                        }
+                    }
+                }
+            }
+        }
+
+        public InputConfiguration()
+        {
+        }
+
+        public InputConfig GetConfig()
+        {
+            if (Backend == InputBackendType.WindowKeyboard)
+            {
+                return new StandardKeyboardInputConfig
+                {
+                    Id = Id,
+                    Backend = Backend,
+                    PlayerIndex = PlayerIndex,
+                    ControllerType = ControllerType,
+                    LeftJoycon = new LeftJoyconCommonConfig<Key>
+                    {
+                        DpadUp = (Key)(object)DpadUp,
+                        DpadDown = (Key)(object)DpadDown,
+                        DpadLeft = (Key)(object)DpadLeft,
+                        DpadRight = (Key)(object)DpadRight,
+                        ButtonL = (Key)(object)ButtonL,
+                        ButtonZl = (Key)(object)ButtonZl,
+                        ButtonSl = (Key)(object)LeftButtonSl,
+                        ButtonSr = (Key)(object)LeftButtonSr,
+                        ButtonMinus = (Key)(object)ButtonMinus,
+                    },
+                    RightJoycon = new RightJoyconCommonConfig<Key>
+                    {
+                        ButtonA = (Key)(object)ButtonA,
+                        ButtonB = (Key)(object)ButtonB,
+                        ButtonX = (Key)(object)ButtonX,
+                        ButtonY = (Key)(object)ButtonY,
+                        ButtonPlus = (Key)(object)ButtonPlus,
+                        ButtonSl = (Key)(object)RightButtonSl,
+                        ButtonSr = (Key)(object)RightButtonSr,
+                        ButtonR = (Key)(object)ButtonR,
+                        ButtonZr = (Key)(object)ButtonZr,
+                    },
+                    LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
+                    {
+                        StickUp = (Key)(object)LeftStickUp,
+                        StickDown = (Key)(object)LeftStickDown,
+                        StickRight = (Key)(object)LeftStickRight,
+                        StickLeft = (Key)(object)LeftStickLeft,
+                        StickButton = (Key)(object)LeftKeyboardStickButton,
+                    },
+                    RightJoyconStick = new JoyconConfigKeyboardStick<Key>
+                    {
+                        StickUp = (Key)(object)RightStickUp,
+                        StickDown = (Key)(object)RightStickDown,
+                        StickLeft = (Key)(object)RightStickLeft,
+                        StickRight = (Key)(object)RightStickRight,
+                        StickButton = (Key)(object)RightKeyboardStickButton,
+                    },
+                    Version = InputConfig.CurrentVersion,
+                };
+
+            }
+
+            if (Backend == InputBackendType.GamepadSDL2)
+            {
+                var config = new StandardControllerInputConfig
+                {
+                    Id = Id,
+                    Backend = Backend,
+                    PlayerIndex = PlayerIndex,
+                    ControllerType = ControllerType,
+                    LeftJoycon = new LeftJoyconCommonConfig<GamepadInputId>
+                    {
+                        DpadUp = (GamepadInputId)(object)DpadUp,
+                        DpadDown = (GamepadInputId)(object)DpadDown,
+                        DpadLeft = (GamepadInputId)(object)DpadLeft,
+                        DpadRight = (GamepadInputId)(object)DpadRight,
+                        ButtonL = (GamepadInputId)(object)ButtonL,
+                        ButtonZl = (GamepadInputId)(object)ButtonZl,
+                        ButtonSl = (GamepadInputId)(object)LeftButtonSl,
+                        ButtonSr = (GamepadInputId)(object)LeftButtonSr,
+                        ButtonMinus = (GamepadInputId)(object)ButtonMinus,
+                    },
+                    RightJoycon = new RightJoyconCommonConfig<GamepadInputId>
+                    {
+                        ButtonA = (GamepadInputId)(object)ButtonA,
+                        ButtonB = (GamepadInputId)(object)ButtonB,
+                        ButtonX = (GamepadInputId)(object)ButtonX,
+                        ButtonY = (GamepadInputId)(object)ButtonY,
+                        ButtonPlus = (GamepadInputId)(object)ButtonPlus,
+                        ButtonSl = (GamepadInputId)(object)RightButtonSl,
+                        ButtonSr = (GamepadInputId)(object)RightButtonSr,
+                        ButtonR = (GamepadInputId)(object)ButtonR,
+                        ButtonZr = (GamepadInputId)(object)ButtonZr,
+                    },
+                    LeftJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
+                    {
+                        Joystick = (StickInputId)(object)LeftJoystick,
+                        InvertStickX = LeftInvertStickX,
+                        InvertStickY = LeftInvertStickY,
+                        Rotate90CW = LeftRotate90,
+                        StickButton = (GamepadInputId)(object)LeftControllerStickButton,
+                    },
+                    RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
+                    {
+                        Joystick = (StickInputId)(object)RightJoystick,
+                        InvertStickX = RightInvertStickX,
+                        InvertStickY = RightInvertStickY,
+                        Rotate90CW = RightRotate90,
+                        StickButton = (GamepadInputId)(object)RightControllerStickButton,
+                    },
+                    Rumble = new RumbleConfigController
+                    {
+                        EnableRumble = EnableRumble,
+                        WeakRumble = WeakRumble,
+                        StrongRumble = StrongRumble,
+                    },
+                    Version = InputConfig.CurrentVersion,
+                    DeadzoneLeft = DeadzoneLeft,
+                    DeadzoneRight = DeadzoneRight,
+                    RangeLeft = RangeLeft,
+                    RangeRight = RangeRight,
+                    TriggerThreshold = TriggerThreshold,
+                    Motion = EnableCemuHookMotion
+                        ? new CemuHookMotionConfigController
+                        {
+                            DsuServerHost = DsuServerHost,
+                            DsuServerPort = DsuServerPort,
+                            Slot = Slot,
+                            AltSlot = AltSlot,
+                            MirrorInput = MirrorInput,
+                            MotionBackend = MotionInputBackendType.CemuHook,
+                        }
+                        : new StandardMotionConfigController
+                        {
+                            MotionBackend = MotionInputBackendType.GamepadDriver,
+                        },
+                };
+
+                config.Motion.Sensitivity = Sensitivity;
+                config.Motion.EnableMotion = EnableMotion;
+                config.Motion.GyroDeadzone = GyroDeadzone;
+
+                return config;
+            }
+
+            return null;
+        }
+    }
+}

src/Ryujinx.Ava/UI/Models/SaveModel.cs

@@ -4,7 +4,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.Ui.App.Common;
-using System;
+using Ryujinx.Ui.Common.Helper;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -38,26 +38,7 @@ namespace Ryujinx.Ava.UI.Models
 
         public bool SizeAvailable { get; set; }
 
-        public string SizeString => GetSizeString();
-
-        private string GetSizeString()
-        {
-            const int Scale = 1024;
-            string[] orders = { "GiB", "MiB", "KiB" };
-            long max = (long)Math.Pow(Scale, orders.Length);
-
-            foreach (string order in orders)
-            {
-                if (Size > max)
-                {
-                    return $"{decimal.Divide(Size, max):##.##} {order}";
-                }
-
-                max /= Scale;
-            }
-
-            return "0 KiB";
-        }
+        public string SizeString => ValueFormatUtils.FormatFileSize(Size);
 
         public SaveModel(SaveDataInfo info)
         {

src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs

@@ -8,7 +8,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.Models.Input;
+using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -30,9 +30,9 @@ using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.Gamepad
 using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
-namespace Ryujinx.Ava.UI.ViewModels.Input
+namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class InputViewModel : BaseModel, IDisposable
+    public class ControllerInputViewModel : BaseModel, IDisposable
     {
         private const string Disabled = "disabled";
         private const string ProControllerResource = "Ryujinx.Ui.Common/Resources/Controller_ProCon.svg";
@@ -48,7 +48,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controllerNumber;
         private string _controllerImage;
         private int _device;
-        private object _configViewModel;
+        private object _configuration;
         private string _profileName;
         private bool _isLoaded;
 
@@ -71,14 +71,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsLeft { get; set; }
 
         public bool IsModified { get; set; }
-        public event Action NotifyChangesEvent;
 
-        public object ConfigViewModel
+        public object Configuration
         {
-            get => _configViewModel;
+            get => _configuration;
             set
             {
-                _configViewModel = value;
+                _configuration = value;
 
                 OnPropertyChanged();
             }
@@ -233,7 +232,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public InputConfig Config { get; set; }
 
-        public InputViewModel(UserControl owner) : this()
+        public ControllerInputViewModel(UserControl owner) : this()
         {
             if (Program.PreviewerDetached)
             {
@@ -245,6 +244,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 _mainWindow.InputManager.GamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
                 _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
+
                 _mainWindow.ViewModel.AppHost?.NpadManager.BlockInputUpdates();
 
                 _isLoaded = false;
@@ -255,7 +255,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        public InputViewModel()
+        public ControllerInputViewModel()
         {
             PlayerIndexes = new ObservableCollection<PlayerModel>();
             Controllers = new ObservableCollection<ControllerModel>();
@@ -282,12 +282,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             if (Config is StandardKeyboardInputConfig keyboardInputConfig)
             {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
+                Configuration = new InputConfiguration<Key, ConfigStickInputId>(keyboardInputConfig);
             }
 
             if (Config is StandardControllerInputConfig controllerInputConfig)
             {
-                ConfigViewModel = new ControllerInputViewModel(this, new ControllerInputConfig(controllerInputConfig));
+                Configuration = new InputConfiguration<ConfigGamepadInputId, ConfigStickInputId>(controllerInputConfig);
             }
         }
 
@@ -323,6 +323,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
+        public async void ShowMotionConfig()
+        {
+            await MotionInputView.Show(this);
+        }
+
+        public async void ShowRumbleConfig()
+        {
+            await RumbleInputView.Show(this);
+        }
+
         private void LoadInputDriver()
         {
             if (_device < 0)
@@ -730,7 +740,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 return;
             }
 
-            if (ConfigViewModel == null)
+            if (Configuration == null)
             {
                 return;
             }
@@ -741,37 +751,35 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 return;
             }
+
+            bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
+
+            if (validFileName)
+            {
+                string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+
+                InputConfig config = null;
+
+                if (IsKeyboard)
+                {
+                    config = (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig();
+                }
+                else if (IsController)
+                {
+                    config = (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
+                }
+
+                config.ControllerType = Controllers[_controller].Type;
+
+                string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+
+                await File.WriteAllTextAsync(path, jsonString);
+
+                LoadProfiles();
+            }
             else
             {
-                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
-
-                if (validFileName)
-                {
-                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-
-                    InputConfig config = null;
-
-                    if (IsKeyboard)
-                    {
-                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
-                    }
-                    else if (IsController)
-                    {
-                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-                    }
-
-                    config.ControllerType = Controllers[_controller].Type;
-
-                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
-
-                    await File.WriteAllTextAsync(path, jsonString);
-
-                    LoadProfiles();
-                }
-                else
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                }
+                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
             }
         }
 
@@ -822,18 +830,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 if (device.Type == DeviceType.Keyboard)
                 {
-                    var inputConfig = (ConfigViewModel as KeyboardInputViewModel).Config;
+                    var inputConfig = Configuration as InputConfiguration<Key, ConfigStickInputId>;
                     inputConfig.Id = device.Id;
                 }
                 else
                 {
-                    var inputConfig = (ConfigViewModel as ControllerInputViewModel).Config;
+                    var inputConfig = Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>;
                     inputConfig.Id = device.Id.Split(" ")[0];
                 }
 
                 var config = !IsController
-                    ? (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig()
-                    : (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                    ? (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig()
+                    : (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
                 config.ControllerType = Controllers[_controller].Type;
                 config.PlayerIndex = _playerId;
 
@@ -864,13 +872,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public void NotifyChanges()
         {
-            OnPropertyChanged(nameof(ConfigViewModel));
+            OnPropertyChanged(nameof(Configuration));
             OnPropertyChanged(nameof(IsController));
             OnPropertyChanged(nameof(ShowSettings));
             OnPropertyChanged(nameof(IsKeyboard));
             OnPropertyChanged(nameof(IsRight));
             OnPropertyChanged(nameof(IsLeft));
-            NotifyChangesEvent?.Invoke();
         }
 
         public void Dispose()

src/Ryujinx.Ava/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -126,7 +126,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 {
                     using FileStream containerFile = File.OpenRead(downloadableContentContainer.ContainerPath);
 
-                    PartitionFileSystem partitionFileSystem = new(containerFile.AsStorage());
+                    PartitionFileSystem partitionFileSystem = new();
+                    partitionFileSystem.Initialize(containerFile.AsStorage()).ThrowIfFailure();
 
                     _virtualFileSystem.ImportTickets(partitionFileSystem);
 
@@ -232,7 +233,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             using FileStream containerFile = File.OpenRead(path);
 
-            PartitionFileSystem partitionFileSystem = new(containerFile.AsStorage());
+            PartitionFileSystem partitionFileSystem = new();
+            partitionFileSystem.Initialize(containerFile.AsStorage()).ThrowIfFailure();
             bool containsDownloadableContent = false;
 
             _virtualFileSystem.ImportTickets(partitionFileSystem);

src/Ryujinx.Ava/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,84 +0,0 @@
-using Avalonia.Svg.Skia;
-using Ryujinx.Ava.UI.Models.Input;
-using Ryujinx.Ava.UI.Views.Input;
-
-namespace Ryujinx.Ava.UI.ViewModels.Input
-{
-    public class ControllerInputViewModel : BaseModel
-    {
-        private ControllerInputConfig _config;
-        public ControllerInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _isLeft;
-        public bool IsLeft
-        {
-            get => _isLeft;
-            set
-            {
-                _isLeft = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(HasSides));
-            }
-        }
-
-        private bool _isRight;
-        public bool IsRight
-        {
-            get => _isRight;
-            set
-            {
-                _isRight = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(HasSides));
-            }
-        }
-
-        public bool HasSides => IsLeft ^ IsRight;
-
-        private SvgImage _image;
-        public SvgImage Image
-        {
-            get => _image;
-            set
-            {
-                _image = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public InputViewModel parentModel;
-
-        public ControllerInputViewModel(InputViewModel model, ControllerInputConfig config)
-        {
-            parentModel = model;
-            model.NotifyChangesEvent += OnParentModelChanged;
-            OnParentModelChanged();
-            Config = config;
-        }
-
-        public async void ShowMotionConfig()
-        {
-            await MotionInputView.Show(this);
-        }
-
-        public async void ShowRumbleConfig()
-        {
-            await RumbleInputView.Show(this);
-        }
-
-        public void OnParentModelChanged()
-        {
-            IsLeft = parentModel.IsLeft;
-            IsRight = parentModel.IsRight;
-            Image = parentModel.Image;
-        }
-    }
-}

src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs

@@ -1,73 +0,0 @@
-using Avalonia.Svg.Skia;
-using Ryujinx.Ava.UI.Models.Input;
-
-namespace Ryujinx.Ava.UI.ViewModels.Input
-{
-    public class KeyboardInputViewModel : BaseModel
-    {
-        private KeyboardInputConfig _config;
-        public KeyboardInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _isLeft;
-        public bool IsLeft
-        {
-            get => _isLeft;
-            set
-            {
-                _isLeft = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(HasSides));
-            }
-        }
-
-        private bool _isRight;
-        public bool IsRight
-        {
-            get => _isRight;
-            set
-            {
-                _isRight = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(HasSides));
-            }
-        }
-
-        public bool HasSides => IsLeft ^ IsRight;
-
-        private SvgImage _image;
-        public SvgImage Image
-        {
-            get => _image;
-            set
-            {
-                _image = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public InputViewModel parentModel;
-
-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
-        {
-            parentModel = model;
-            model.NotifyChangesEvent += OnParentModelChanged;
-            OnParentModelChanged();
-            Config = config;
-        }
-
-        public void OnParentModelChanged()
-        {
-            IsLeft = parentModel.IsLeft;
-            IsRight = parentModel.IsRight;
-            Image = parentModel.Image;
-        }
-    }
-}

src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs

@@ -930,21 +930,20 @@ namespace Ryujinx.Ava.UI.ViewModels
             return SortMode switch
             {
 #pragma warning disable IDE0055 // Disable formatting
+                ApplicationSort.Title           => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.TitleName)
+                                                               : SortExpressionComparer<ApplicationData>.Descending(app => app.TitleName),
+                ApplicationSort.Developer       => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Developer)
+                                                               : SortExpressionComparer<ApplicationData>.Descending(app => app.Developer),
                 ApplicationSort.LastPlayed      => new LastPlayedSortComparer(IsAscending),
-                ApplicationSort.FileSize        => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.FileSizeBytes)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.FileSizeBytes),
-                ApplicationSort.TotalTimePlayed => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.TimePlayedNum)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.TimePlayedNum),
-                ApplicationSort.Title           => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.TitleName)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.TitleName),
+                ApplicationSort.TotalTimePlayed => new TimePlayedSortComparer(IsAscending),
+                ApplicationSort.FileType        => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.FileExtension)
+                                                               : SortExpressionComparer<ApplicationData>.Descending(app => app.FileExtension),
+                ApplicationSort.FileSize        => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.FileSize)
+                                                               : SortExpressionComparer<ApplicationData>.Descending(app => app.FileSize),
+                ApplicationSort.Path            => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Path)
+                                                               : SortExpressionComparer<ApplicationData>.Descending(app => app.Path),
                 ApplicationSort.Favorite        => !IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Favorite)
                                                                 : SortExpressionComparer<ApplicationData>.Descending(app => app.Favorite),
-                ApplicationSort.Developer       => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Developer)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.Developer),
-                ApplicationSort.FileType        => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.FileExtension)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.FileExtension),
-                ApplicationSort.Path            => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Path)
-                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.Path),
                 _ => null,
 #pragma warning restore IDE0055
             };
@@ -1549,13 +1548,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata =>
             {
-                if (appMetadata.LastPlayed.HasValue)
-                {
-                    double sessionTimePlayed = DateTime.UtcNow.Subtract(appMetadata.LastPlayed.Value).TotalSeconds;
-                    appMetadata.TimePlayed += Math.Round(sessionTimePlayed, MidpointRounding.AwayFromZero);
-                }
-
-                appMetadata.LastPlayed = DateTime.UtcNow;
+                appMetadata.UpdatePostGame();
             });
         }
 

src/Ryujinx.Ava/UI/ViewModels/MotionInputViewModel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.UI.ViewModels.Input
+namespace Ryujinx.Ava.UI.ViewModels
 {
     public class MotionInputViewModel : BaseModel
     {

src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.UI.ViewModels.Input
+namespace Ryujinx.Ava.UI.ViewModels
 {
     public class RumbleInputViewModel : BaseModel
     {

src/Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs

@@ -170,7 +170,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                 try
                 {
-                    (Nca patchNca, Nca controlNca) = ApplicationLibrary.GetGameUpdateDataFromPartition(VirtualFileSystem, new PartitionFileSystem(file.AsStorage()), TitleId.ToString("x16"), 0);
+                    var pfs = new PartitionFileSystem();
+                    pfs.Initialize(file.AsStorage()).ThrowIfFailure();
+                    (Nca patchNca, Nca controlNca) = ApplicationLibrary.GetGameUpdateDataFromPartition(VirtualFileSystem, pfs, TitleId.ToString("x16"), 0);
 
                     if (controlNca != null && patchNca != null)
                     {

src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml

@@ -1,11 +1,13 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
+    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     HorizontalAlignment="Stretch"
     VerticalAlignment="Stretch"
@@ -13,7 +15,6 @@
     d:DesignWidth="800"
     x:Class="Ryujinx.Ava.UI.Views.Input.ControllerInputView"
     x:DataType="viewModels:ControllerInputViewModel"
-    x:CompileBindings="True"
     mc:Ignorable="d"
     Focusable="True">
     <Design.DataContext>
@@ -33,10 +34,191 @@
         HorizontalAlignment="Stretch"
         VerticalAlignment="Stretch"
         Orientation="Vertical">
+        <StackPanel
+            Margin="0 0 0 5"
+            Orientation="Vertical"
+            Spacing="5">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Player Selection -->
+                <Grid
+                    Grid.Column="0"
+                    Margin="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Margin="5,0,10,0"
+                        Width="90"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{locale:Locale ControllerSettingsPlayer}" />
+                    <ComboBox
+                        Grid.Column="1"
+                        Name="PlayerIndexBox"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        SelectionChanged="PlayerIndexBox_OnSelectionChanged"
+                        ItemsSource="{Binding PlayerIndexes}"
+                        SelectedIndex="{Binding PlayerId}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </Grid>
+                <!-- Profile Selection -->
+                <Grid
+                    Grid.Column="2"
+                    Margin="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Margin="5,0,10,0"
+                        Width="90"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{locale:Locale ControllerSettingsProfile}" />
+                    <ui:FAComboBox
+                        Grid.Column="1"
+                        IsEditable="True"
+                        Name="ProfileBox"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        SelectedIndex="0"
+                        ItemsSource="{Binding ProfilesList}" 
+                        Text="{Binding ProfileName, Mode=TwoWay}" />
+                    <Button
+                        Grid.Column="2"
+                        MinWidth="0"
+                        Margin="5,0,0,0"
+                        VerticalAlignment="Center"
+                        ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
+                        Command="{ReflectionBinding LoadProfile}">
+                        <ui:SymbolIcon
+                            Symbol="Upload"
+                            FontSize="15"
+                            Height="20" />
+                    </Button>
+                    <Button
+                        Grid.Column="3"
+                            MinWidth="0"
+                            Margin="5,0,0,0"
+                            VerticalAlignment="Center"
+                            ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
+                            Command="{ReflectionBinding SaveProfile}">
+                        <ui:SymbolIcon
+                            Symbol="Save"
+                            FontSize="15"
+                            Height="20" />
+                    </Button>
+                    <Button
+                        Grid.Column="4"
+                            MinWidth="0"
+                            Margin="5,0,0,0"
+                            VerticalAlignment="Center"
+                            ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
+                            Command="{ReflectionBinding RemoveProfile}">
+                        <ui:SymbolIcon
+                            Symbol="Delete"
+                            FontSize="15"
+                            Height="20" />
+                    </Button>
+                </Grid>
+            </Grid>
+            <Separator />
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Input Device -->
+                <Grid
+                    Grid.Column="0"
+                    Margin="2"
+                    HorizontalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="5,0,10,0"
+                        Width="90"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{locale:Locale ControllerSettingsInputDevice}" />
+                    <ComboBox
+                        Grid.Column="1"
+                        Name="DeviceBox"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        ItemsSource="{Binding DeviceList}"
+                        SelectedIndex="{Binding Device}" />
+                    <Button
+                        Grid.Column="2"
+                        MinWidth="0"
+                        Margin="5,0,0,0"
+                        VerticalAlignment="Center"
+                        Command="{ReflectionBinding LoadDevices}">
+                        <ui:SymbolIcon
+                            Symbol="Refresh"
+                            FontSize="15"
+                            Height="20"/>
+                    </Button>
+                </Grid>
+                <!-- Controller Type -->
+                <Grid
+                    Grid.Column="2"
+                    Margin="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Margin="5,0,10,0"
+                        Width="90"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{locale:Locale ControllerSettingsControllerType}" />
+                    <ComboBox
+                        Grid.Column="1"
+                        HorizontalAlignment="Stretch"
+                        ItemsSource="{Binding Controllers}"
+                        SelectedIndex="{Binding Controller}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate DataType="models:ControllerModel">
+                                <TextBlock Text="{Binding Name}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </Grid>
+            </Grid>
+        </StackPanel>
         <!-- Button / JoyStick Settings -->
         <Grid
             Name="SettingButtons"
-            MinHeight="450">
+            MinHeight="450"
+            IsVisible="{Binding ShowSettings}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -75,9 +257,9 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsTriggerZL}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonZl">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonZl, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonZl, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
@@ -91,9 +273,9 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsTriggerL}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonL">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonL, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonL, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
@@ -107,9 +289,9 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsButtonMinus}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonMinus">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonMinus, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonMinus, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
@@ -129,8 +311,100 @@
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
                             Text="{locale:Locale ControllerSettingsLStick}" />
+                        <!-- Left Joystick Keyboard -->
+                        <StackPanel
+                            IsVisible="{Binding !IsController}"
+                            Orientation="Vertical">
+                            <!-- Left Joystick Button -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.LeftKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Left Joystick Up -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.LeftStickUp, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Left Joystick Down -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.LeftStickDown, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Left Joystick Left -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.LeftStickLeft, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Left Joystick Right -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.LeftStickRight, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                        </StackPanel>
                         <!-- Left Joystick Controller -->
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel
+                            IsVisible="{Binding IsController}"
+                            Orientation="Vertical">
                             <!-- Left Joystick Button -->
                             <StackPanel
                                 Orientation="Horizontal">
@@ -141,9 +415,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickButton">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.LeftStickButton, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.LeftControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -158,22 +432,22 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="LeftJoystick" Tag="stick">
+                                <ToggleButton Tag="stick">
                                     <TextBlock
-                                        Text="{Binding Config.LeftJoystick, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.LeftJoystick, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
                             <Separator
                                 Margin="0,8,0,8"
                                 Height="1" />
-                            <CheckBox IsChecked="{Binding Config.LeftInvertStickX}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.LeftInvertStickX}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
-                            <CheckBox IsChecked="{Binding Config.LeftInvertStickY}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.LeftInvertStickY}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
-                            <CheckBox IsChecked="{Binding Config.LeftRotate90}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.LeftRotate90}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator
@@ -194,11 +468,11 @@
                                         IsSnapToTickEnabled="True"
                                         SmallChange="0.01"
                                         Minimum="0"
-                                        Value="{Binding Config.DeadzoneLeft, Mode=TwoWay}" />
+                                        Value="{ReflectionBinding Configuration.DeadzoneLeft, Mode=TwoWay}" />
                                     <TextBlock
                                         VerticalAlignment="Center"
                                         Width="25"
-                                        Text="{Binding Config.DeadzoneLeft, StringFormat=\{0:0.00\}}" />
+                                        Text="{ReflectionBinding Configuration.DeadzoneLeft, StringFormat=\{0:0.00\}}" />
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
@@ -214,11 +488,11 @@
                                         IsSnapToTickEnabled="True"
                                         SmallChange="0.01"
                                         Minimum="0"
-                                        Value="{Binding Config.RangeLeft, Mode=TwoWay}" />
+                                        Value="{ReflectionBinding Configuration.RangeLeft, Mode=TwoWay}" />
                                     <TextBlock
                                         VerticalAlignment="Center"
                                         Width="25"
-                                        Text="{Binding Config.RangeLeft, StringFormat=\{0:0.00\}}" />
+                                        Text="{ReflectionBinding Configuration.RangeLeft, StringFormat=\{0:0.00\}}" />
                                 </StackPanel>
                             </StackPanel>
                         </StackPanel>
@@ -251,9 +525,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsDPadUp}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="DpadUp">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.DpadUp, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.DpadUp, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -268,9 +542,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsDPadDown}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="DpadDown">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.DpadDown, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.DpadDown, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -285,9 +559,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsDPadLeft}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="DpadLeft">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.DpadLeft, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.DpadLeft, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -302,9 +576,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsDPadRight}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="DpadRight">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.DpadRight, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.DpadRight, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -317,13 +591,6 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
-                <!-- Controller Picture -->
-                <Image
-                    Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -345,89 +612,92 @@
                                 IsSnapToTickEnabled="True"
                                 SmallChange="0.01"
                                 Minimum="0"
-                                Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
+                                Value="{ReflectionBinding Configuration.TriggerThreshold, Mode=TwoWay}" />
                             <TextBlock
                               Width="25"
-                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                              Text="{ReflectionBinding Configuration.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                         </StackPanel>
                         <StackPanel
-                            Orientation="Vertical"
-                            IsVisible="{Binding HasSides}">
-                            <StackPanel
-                                Margin="0,4,0,0"
+                            Margin="0,4,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding !IsRight}"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                IsVisible="{Binding IsLeft}"
-                                Orientation="Horizontal">
+                                Text="{locale:Locale ControllerSettingsLeftSR}"
+                                TextAlignment="Center" />
+                            <ToggleButton>
                                 <TextBlock
-                                    Width="20"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSR}"
+                                    Text="{ReflectionBinding Configuration.LeftButtonSr, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="LeftButtonSr">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftButtonSr, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <StackPanel
-                                Margin="0,4,0,0"
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel
+                            Margin="0,4,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding !IsRight}"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                IsVisible="{Binding IsLeft}"
-                                Orientation="Horizontal">
+                                Text="{locale:Locale ControllerSettingsLeftSL}"
+                                TextAlignment="Center" />
+                            <ToggleButton>
                                 <TextBlock
-                                    Width="20"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSL}"
+                                    Text="{ReflectionBinding Configuration.LeftButtonSl, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="LeftButtonSl">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftButtonSl, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <StackPanel
-                                Margin="0,4,0,0"
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel
+                            Margin="0,4,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding !IsLeft}"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                IsVisible="{Binding IsRight}"
-                                Orientation="Horizontal">
+                                Text="{locale:Locale ControllerSettingsRightSR}"
+                                TextAlignment="Center" />
+                            <ToggleButton>
                                 <TextBlock
-                                    Width="20"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSR}"
+                                    Text="{ReflectionBinding Configuration.RightButtonSr, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="RightButtonSr">
-                                    <TextBlock
-                                        Text="{Binding Config.RightButtonSr, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <StackPanel
-                                Margin="0,4,0,0"
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel
+                            Margin="0,4,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding !IsLeft}"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                IsVisible="{Binding IsRight}"
-                                Orientation="Horizontal">
+                                Text="{locale:Locale ControllerSettingsRightSL}"
+                                TextAlignment="Center" />
+                            <ToggleButton>
                                 <TextBlock
-                                    Width="20"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSL}"
+                                    Text="{ReflectionBinding Configuration.RightButtonSl, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="RightButtonSl">
-                                    <TextBlock
-                                        Text="{Binding Config.RightButtonSl, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
+                            </ToggleButton>
                         </StackPanel>
                     </StackPanel>
                 </Border>
+                <!-- Controller Picture -->
+                <Image
+                    Margin="0,10,0,0"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                 <!-- Motion + Rumble -->
                 <StackPanel
                     Margin="0,10,0,0"
@@ -439,7 +709,8 @@
                         BorderThickness="1"
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
-                        HorizontalAlignment="Stretch">
+                        HorizontalAlignment="Stretch"
+                        IsVisible="{Binding IsController}">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -449,7 +720,7 @@
                                 Margin="10"
                                 MinWidth="0"
                                 Grid.Column="0"
-                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+                                IsChecked="{ReflectionBinding Configuration.EnableMotion, Mode=TwoWay}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsMotion}" />
                             </CheckBox>
                             <Button
@@ -465,6 +736,7 @@
                         BorderThickness="1"
                         CornerRadius="5"
                         HorizontalAlignment="Stretch"
+                        IsVisible="{Binding IsController}"
                         Margin="0,-1,0,0">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -475,7 +747,7 @@
                                 Margin="10"
                                 MinWidth="0"
                                 Grid.Column="0"
-                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+                                IsChecked="{ReflectionBinding Configuration.EnableRumble, Mode=TwoWay}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsRumble}" />
                             </CheckBox>
                             <Button
@@ -521,9 +793,9 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsTriggerZR}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonZr">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonZr, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonZr, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
@@ -539,9 +811,9 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsTriggerR}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonR">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonR, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonR, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
@@ -557,15 +829,15 @@
                                 VerticalAlignment="Center"
                                 Text="{locale:Locale ControllerSettingsButtonPlus}"
                                 TextAlignment="Center" />
-                            <ToggleButton Name="ButtonPlus">
+                            <ToggleButton>
                                 <TextBlock
-                                    Text="{Binding Config.ButtonPlus, Converter={StaticResource Key}}"
+                                    Text="{ReflectionBinding Configuration.ButtonPlus, Mode=TwoWay, Converter={StaticResource Key}}"
                                     TextAlignment="Center" />
                             </ToggleButton>
                         </StackPanel>
                     </Grid>
                 </Border>
-                <!-- Right Buttons -->
+                <!-- Right Joystick -->
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -592,9 +864,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsButtonA}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="ButtonA">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.ButtonA, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.ButtonA, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -609,9 +881,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsButtonB}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="ButtonB">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.ButtonB, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.ButtonB, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -626,9 +898,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsButtonX}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="ButtonX">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.ButtonX, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.ButtonX, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -643,9 +915,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsButtonY}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="ButtonY">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.ButtonY, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.ButtonY, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -665,8 +937,100 @@
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
                             Text="{locale:Locale ControllerSettingsRStick}" />
+                        <!-- Right Joystick Keyboard -->
+                        <StackPanel
+                            IsVisible="{Binding !IsController}"
+                            Orientation="Vertical">
+                            <!-- Right Joystick Button -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.RightKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Right Joystick Up -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.RightStickUp, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Right Joystick Down -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.RightStickDown, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Right Joystick Left -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.RightStickLeft, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                            <!-- Right Joystick Right -->
+                            <StackPanel
+                                Margin="0,0,0,4"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    Width="120"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    TextAlignment="Center" />
+                                <ToggleButton>
+                                    <TextBlock
+                                        Text="{ReflectionBinding Configuration.RightStickRight, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        TextAlignment="Center" />
+                                </ToggleButton>
+                            </StackPanel>
+                        </StackPanel>
                         <!-- Right Joystick Controller -->
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel
+                            IsVisible="{Binding IsController}"
+                            Orientation="Vertical">
                             <!-- Right Joystick Button -->
                             <StackPanel
                                 Orientation="Horizontal">
@@ -677,9 +1041,9 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="RightStickButton">
+                                <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.RightStickButton, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.RightControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -695,20 +1059,20 @@
                                     VerticalAlignment="Center"
                                     Text="{locale:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
-                                <ToggleButton Name="RightJoystick" Tag="stick">
+                                <ToggleButton Tag="stick">
                                     <TextBlock
-                                        Text="{Binding Config.RightJoystick, Converter={StaticResource Key}}"
+                                        Text="{ReflectionBinding Configuration.RightJoystick, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
                             <Separator Margin="0,8,0,8" Height="1" />
-                            <CheckBox IsChecked="{Binding Config.RightInvertStickX}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.RightInvertStickX}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
-                            <CheckBox IsChecked="{Binding Config.RightInvertStickY}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.RightInvertStickY}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
-                            <CheckBox IsChecked="{Binding Config.RightRotate90}">
+                            <CheckBox IsChecked="{ReflectionBinding Configuration.RightRotate90}">
                                 <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator Margin="0,8,0,8" Height="1" />
@@ -729,11 +1093,11 @@
                                         Padding="0"
                                         VerticalAlignment="Center"
                                         Minimum="0"
-                                        Value="{Binding Config.DeadzoneRight, Mode=TwoWay}" />
+                                        Value="{ReflectionBinding Configuration.DeadzoneRight, Mode=TwoWay}" />
                                     <TextBlock
                                         VerticalAlignment="Center"
                                         Width="25"
-                                        Text="{Binding Config.DeadzoneRight, StringFormat=\{0:0.00\}}" />
+                                        Text="{ReflectionBinding Configuration.DeadzoneRight, StringFormat=\{0:0.00\}}" />
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
@@ -749,11 +1113,11 @@
                                         IsSnapToTickEnabled="True"
                                         SmallChange="0.01"
                                         Minimum="0"
-                                        Value="{Binding Config.RangeRight, Mode=TwoWay}" />
+                                        Value="{ReflectionBinding Configuration.RangeRight, Mode=TwoWay}" />
                                     <TextBlock
                                         VerticalAlignment="Center"
                                         Width="25"
-                                        Text="{Binding Config.RangeRight, StringFormat=\{0:0.00\}}" />
+                                        Text="{ReflectionBinding Configuration.RangeRight, StringFormat=\{0:0.00\}}" />
                                 </StackPanel>
                             </StackPanel>
                         </StackPanel>

src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml.cs

@@ -1,28 +1,35 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
+using System;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
     public partial class ControllerInputView : UserControl
     {
+        private bool _dialogOpen;
+
         private ButtonKeyAssigner _currentAssigner;
+        internal ControllerInputViewModel ViewModel { get; set; }
 
         public ControllerInputView()
         {
+            DataContext = ViewModel = new ControllerInputViewModel(this);
+
             InitializeComponent();
 
             foreach (ILogical visual in SettingButtons.GetLogicalDescendants())
             {
-                if (visual is ToggleButton button and not CheckBox)
+                if (visual is ToggleButton button && visual is not CheckBox)
                 {
                     button.IsCheckedChanged += Button_IsCheckedChanged;
                 }
@@ -52,7 +59,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                     bool isStick = button.Tag != null && button.Tag.ToString() == "stick";
 
-                    if (_currentAssigner == null && (bool)button.IsChecked)
+                    if (_currentAssigner == null)
                     {
                         _currentAssigner = new ButtonKeyAssigner(button);
 
@@ -60,86 +67,14 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                         PointerPressed += MouseClick;
 
-                        IKeyboard keyboard = (IKeyboard)(DataContext as ControllerInputViewModel).parentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                        IKeyboard keyboard = (IKeyboard)ViewModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
                         IButtonAssigner assigner = CreateButtonAssigner(isStick);
 
                         _currentAssigner.ButtonAssigned += (sender, e) =>
                         {
-                            if (e.ButtonValue.HasValue)
+                            if (e.IsAssigned)
                             {
-                                var viewModel = (DataContext as ControllerInputViewModel);
-                                var buttonValue = e.ButtonValue.Value;
-                                viewModel.parentModel.IsModified = true;
-
-                                switch (button.Name)
-                                {
-                                    case "ButtonZl":
-                                        viewModel.Config.ButtonZl = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonL":
-                                        viewModel.Config.ButtonL = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonMinus":
-                                        viewModel.Config.ButtonMinus = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "LeftStickButton":
-                                        viewModel.Config.LeftStickButton = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "LeftJoystick":
-                                        viewModel.Config.LeftJoystick = buttonValue.AsGamepadStickId();
-                                        break;
-                                    case "DpadUp":
-                                        viewModel.Config.DpadUp = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "DpadDown":
-                                        viewModel.Config.DpadDown = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "DpadLeft":
-                                        viewModel.Config.DpadLeft = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "DpadRight":
-                                        viewModel.Config.DpadRight = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "LeftButtonSr":
-                                        viewModel.Config.LeftButtonSr = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "LeftButtonSl":
-                                        viewModel.Config.LeftButtonSl = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "RightButtonSr":
-                                        viewModel.Config.RightButtonSr = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "RightButtonSl":
-                                        viewModel.Config.RightButtonSl = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonZr":
-                                        viewModel.Config.ButtonZr = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonR":
-                                        viewModel.Config.ButtonR = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonPlus":
-                                        viewModel.Config.ButtonPlus = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonA":
-                                        viewModel.Config.ButtonA = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonB":
-                                        viewModel.Config.ButtonB = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonX":
-                                        viewModel.Config.ButtonX = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "ButtonY":
-                                        viewModel.Config.ButtonY = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "RightStickButton":
-                                        viewModel.Config.RightStickButton = buttonValue.AsGamepadButtonInputId();
-                                        break;
-                                    case "RightJoystick":
-                                        viewModel.Config.RightJoystick = buttonValue.AsGamepadStickId();
-                                        break;
-                                }
+                                ViewModel.IsModified = true;
                             }
                         };
 
@@ -165,29 +100,82 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void MouseClick(object sender, PointerPressedEventArgs e)
+        public void SaveCurrentProfile()
         {
-            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-
-            _currentAssigner?.Cancel(shouldUnbind);
-
-            PointerPressed -= MouseClick;
+            ViewModel.Save();
         }
 
         private IButtonAssigner CreateButtonAssigner(bool forStick)
         {
             IButtonAssigner assigner;
 
-            assigner = new GamepadButtonAssigner((DataContext as ControllerInputViewModel).parentModel.SelectedGamepad, ((DataContext as ControllerInputViewModel).parentModel.Config as StandardControllerInputConfig).TriggerThreshold, forStick);
+            var device = ViewModel.Devices[ViewModel.Device];
+
+            if (device.Type == DeviceType.Keyboard)
+            {
+                assigner = new KeyboardKeyAssigner((IKeyboard)ViewModel.SelectedGamepad);
+            }
+            else if (device.Type == DeviceType.Controller)
+            {
+                assigner = new GamepadButtonAssigner(ViewModel.SelectedGamepad, (ViewModel.Config as StandardControllerInputConfig).TriggerThreshold, forStick);
+            }
+            else
+            {
+                throw new Exception("Controller not supported");
+            }
 
             return assigner;
         }
 
-        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        private void MouseClick(object sender, PointerPressedEventArgs e)
+        {
+            bool shouldUnbind = false;
+
+            if (e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed)
+            {
+                shouldUnbind = true;
+            }
+
+            _currentAssigner?.Cancel(shouldUnbind);
+
+            PointerPressed -= MouseClick;
+        }
+
+        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.IsModified && !_dialogOpen)
+            {
+                _dialogOpen = true;
+
+                var result = await ContentDialogHelper.CreateConfirmationDialog(
+                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage],
+                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage],
+                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
+                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
+
+                if (result == UserResult.Yes)
+                {
+                    ViewModel.Save();
+                }
+
+                _dialogOpen = false;
+
+                ViewModel.IsModified = false;
+
+                if (e.AddedItems.Count > 0)
+                {
+                    var player = (PlayerModel)e.AddedItems[0];
+                    ViewModel.PlayerId = player.Id;
+                }
+            }
+        }
+
+        public void Dispose()
         {
-            base.OnDetachedFromVisualTree(e);
             _currentAssigner?.Cancel();
             _currentAssigner = null;
+            ViewModel.Dispose();
         }
     }
 }

src/Ryujinx.Ava/UI/Views/Input/InputView.axaml

@@ -1,225 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    d:DesignHeight="800"
-    d:DesignWidth="800"
-    x:Class="Ryujinx.Ava.UI.Views.Input.InputView"
-    x:DataType="viewModels:InputViewModel"
-    x:CompileBindings="True"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:InputViewModel />
-    </Design.DataContext>
-    <UserControl.Styles>
-        <Style Selector="ToggleButton">
-            <Setter Property="Width" Value="90" />
-            <Setter Property="Height" Value="27" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-        </Style>
-    </UserControl.Styles>
-    <StackPanel
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        Orientation="Vertical">
-        <StackPanel
-            Margin="0 0 0 5"
-            Orientation="Vertical"
-            Spacing="5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Player Selection -->
-                <Grid
-                    Grid.Column="0"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsPlayer}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        Name="PlayerIndexBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        SelectionChanged="PlayerIndexBox_OnSelectionChanged"
-                        ItemsSource="{Binding PlayerIndexes}"
-                        SelectedIndex="{Binding PlayerId}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </Grid>
-                <!-- Profile Selection -->
-                <Grid
-                    Grid.Column="2"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsProfile}" />
-                    <ui:FAComboBox
-                        Grid.Column="1"
-                        IsEditable="True"
-                        Name="ProfileBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        SelectedIndex="0"
-                        ItemsSource="{Binding ProfilesList}"
-                        Text="{Binding ProfileName, Mode=TwoWay}" />
-                    <Button
-                        Grid.Column="2"
-                        MinWidth="0"
-                        Margin="5,0,0,0"
-                        VerticalAlignment="Center"
-                        ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Upload"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                    <Button
-                        Grid.Column="3"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
-                            Command="{Binding SaveProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Save"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                    <Button
-                        Grid.Column="4"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
-                            Command="{Binding RemoveProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Delete"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                </Grid>
-            </Grid>
-            <Separator />
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Input Device -->
-                <Grid
-                    Grid.Column="0"
-                    Margin="2"
-                    HorizontalAlignment="Stretch">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsInputDevice}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        Name="DeviceBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        ItemsSource="{Binding DeviceList}"
-                        SelectedIndex="{Binding Device}" />
-                    <Button
-                        Grid.Column="2"
-                        MinWidth="0"
-                        Margin="5,0,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding LoadDevices}">
-                        <ui:SymbolIcon
-                            Symbol="Refresh"
-                            FontSize="15"
-                            Height="20"/>
-                    </Button>
-                </Grid>
-                <!-- Controller Type -->
-                <Grid
-                    Grid.Column="2"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsControllerType}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        HorizontalAlignment="Stretch"
-                        ItemsSource="{Binding Controllers}"
-                        SelectedIndex="{Binding Controller}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate DataType="models:ControllerModel">
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </Grid>
-            </Grid>
-        </StackPanel>
-        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
-            <ContentControl.DataTemplates>
-                <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                    <views:ControllerInputView />
-                </DataTemplate>
-                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                    <views:KeyboardInputView />
-                </DataTemplate>
-            </ContentControl.DataTemplates>
-        </ContentControl>
-    </StackPanel>
-</UserControl>

src/Ryujinx.Ava/UI/Views/Input/InputView.axaml.cs

@@ -1,61 +0,0 @@
-using Avalonia.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.ViewModels.Input;
-
-namespace Ryujinx.Ava.UI.Views.Input
-{
-    public partial class InputView : UserControl
-    {
-        private bool _dialogOpen;
-        private InputViewModel ViewModel { get; set; }
-
-        public InputView()
-        {
-            DataContext = ViewModel = new InputViewModel(this);
-
-            InitializeComponent();
-        }
-
-        public void SaveCurrentProfile()
-        {
-            ViewModel.Save();
-        }
-
-        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel.IsModified && !_dialogOpen)
-            {
-                _dialogOpen = true;
-
-                var result = await ContentDialogHelper.CreateConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage],
-                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage],
-                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
-
-                if (result == UserResult.Yes)
-                {
-                    ViewModel.Save();
-                }
-
-                _dialogOpen = false;
-
-                ViewModel.IsModified = false;
-
-                if (e.AddedItems.Count > 0)
-                {
-                    var player = (PlayerModel)e.AddedItems[0];
-                    ViewModel.PlayerId = player.Id;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            ViewModel.Dispose();
-        }
-    }
-}

src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml

@@ -1,675 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    d:DesignHeight="800"
-    d:DesignWidth="800"
-    x:Class="Ryujinx.Ava.UI.Views.Input.KeyboardInputView"
-    x:DataType="viewModels:KeyboardInputViewModel"
-    x:CompileBindings="True"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:KeyboardInputViewModel />
-    </Design.DataContext>
-    <UserControl.Resources>
-        <helpers:KeyValueConverter x:Key="Key" />
-    </UserControl.Resources>
-    <UserControl.Styles>
-        <Style Selector="ToggleButton">
-            <Setter Property="Width" Value="90" />
-            <Setter Property="Height" Value="27" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-        </Style>
-    </UserControl.Styles>
-    <StackPanel
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        Orientation="Vertical">
-        <!-- Button / JoyStick Settings -->
-        <Grid
-            Name="SettingButtons"
-            MinHeight="450">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <!-- Left Controls -->
-            <StackPanel
-                Orientation="Vertical"
-                Margin="0,0,5,0"
-                Grid.Column="0">
-                <!-- Left Triggers -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    IsVisible="{Binding IsLeft}"
-                    MinHeight="90"
-                    CornerRadius="5">
-                    <Grid
-                        Margin="10"
-                        HorizontalAlignment="Stretch">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <StackPanel
-                            Grid.Column="0"
-                            Grid.Row="0"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZL}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonZl">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonZl, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Grid.Column="0"
-                            Grid.Row="1"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerL}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonL">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonL, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonMinus}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonMinus">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonMinus, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                    </Grid>
-                </Border>
-                <!-- Left Joystick -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    IsVisible="{Binding IsLeft}"
-                    Margin="0,5,0,0"
-                    CornerRadius="5">
-                    <StackPanel
-                        Margin="10"
-                        Orientation="Vertical">
-                        <TextBlock
-                            Margin="0,0,0,10"
-                            HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsLStick}" />
-                        <!-- Left Joystick Keyboard -->
-                        <StackPanel Orientation="Vertical">
-                            <!-- Left Joystick Button -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickButton">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftStickButton, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left Joystick Up -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickUp">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftStickUp, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left Joystick Down -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickDown">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftStickDown, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left Joystick Left -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickLeft">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftStickLeft, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left Joystick Right -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="LeftStickRight">
-                                    <TextBlock
-                                        Text="{Binding Config.LeftStickRight, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-                <!-- Left DPad -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    VerticalAlignment="Top"
-                    IsVisible="{Binding IsLeft}"
-                    Margin="0,5,0,0"
-                    CornerRadius="5">
-                    <StackPanel
-                        Margin="10"
-                        Orientation="Vertical">
-                        <TextBlock
-                            Margin="0,0,0,10"
-                            HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsDPad}" />
-                        <StackPanel Orientation="Vertical">
-                            <!-- Left DPad Up -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadUp}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="DpadUp">
-                                    <TextBlock
-                                        Text="{Binding Config.DpadUp, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left DPad Down -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadDown}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="DpadDown">
-                                    <TextBlock
-                                        Text="{Binding Config.DpadDown, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left DPad Left -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadLeft}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="DpadLeft">
-                                    <TextBlock
-                                        Text="{Binding Config.DpadLeft, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Left DPad Right -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadRight}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="DpadRight">
-                                    <TextBlock
-                                        Text="{Binding Config.DpadRight, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-            </StackPanel>
-            <!-- Triggers & Side Buttons -->
-            <StackPanel
-                Grid.Column="1"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch">
-                <!-- Controller Picture -->
-                <Image
-                    Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5"
-                    MinHeight="90"
-                    IsVisible="{Binding HasSides}">
-                    <StackPanel
-                        Margin="8"
-                        Orientation="Vertical">
-                        <StackPanel
-                            Margin="0,4,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding IsLeft}"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSR}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="LeftButtonSr">
-                                <TextBlock
-                                    Text="{Binding Config.LeftButtonSr, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Margin="0,4,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding IsLeft}"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSL}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="LeftButtonSl">
-                                <TextBlock
-                                    Text="{Binding Config.LeftButtonSl, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Margin="0,4,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding IsRight}"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSR}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="RightButtonSr">
-                                <TextBlock
-                                    Text="{Binding Config.RightButtonSr, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Margin="0,4,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding IsRight}"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSL}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="RightButtonSl">
-                                <TextBlock
-                                    Text="{Binding Config.RightButtonSl, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-            </StackPanel>
-            <!-- Right Controls -->
-            <StackPanel
-                Orientation="Vertical"
-                Margin="5,0,0,0"
-                Grid.Column="2">
-                <!-- Right Triggers -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    IsVisible="{Binding IsRight}"
-                    MinHeight="90"
-                    CornerRadius="5">
-                    <Grid
-                        Margin="10"
-                        HorizontalAlignment="Stretch">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <StackPanel
-                            Grid.Column="1"
-                            Grid.Row="0"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZR}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonZr">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonZr, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerR}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonR">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonR, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel
-                            Grid.Column="0"
-                            Grid.Row="1"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                Width="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonPlus}"
-                                TextAlignment="Center" />
-                            <ToggleButton Name="ButtonPlus">
-                                <TextBlock
-                                    Text="{Binding Config.ButtonPlus, Converter={StaticResource Key}}"
-                                    TextAlignment="Center" />
-                            </ToggleButton>
-                        </StackPanel>
-                    </Grid>
-                </Border>
-                <!-- Right Buttons -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    IsVisible="{Binding IsRight}"
-                    Margin="0,5,0,0"
-                    CornerRadius="5">
-                    <StackPanel
-                        Margin="10"
-                        Orientation="Vertical">
-                        <TextBlock
-                            Margin="0,0,0,10"
-                            HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsButtons}" />
-                        <StackPanel
-                            Orientation="Vertical">
-                            <!-- Right Buttons A -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Width="120"
-                                    Margin="0,0,10,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonA}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="ButtonA">
-                                    <TextBlock
-                                        Text="{Binding Config.ButtonA, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Buttons B -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Width="120"
-                                    Margin="0,0,10,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonB}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="ButtonB">
-                                    <TextBlock
-                                        Text="{Binding Config.ButtonB, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Buttons X -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Width="120"
-                                    Margin="0,0,10,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonX}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="ButtonX">
-                                    <TextBlock
-                                        Text="{Binding Config.ButtonX, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Buttons Y -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Width="120"
-                                    Margin="0,0,10,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonY}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="ButtonY">
-                                    <TextBlock
-                                        Text="{Binding Config.ButtonY, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-                <!-- Right DPad -->
-                <Border
-                    Padding="10"
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5"
-                    IsVisible="{Binding IsRight}"
-                    Margin="0,5,0,0">
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock
-                            Margin="0,0,0,10"
-                            HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsRStick}" />
-                        <!-- Right Joystick Keyboard -->
-                        <StackPanel Orientation="Vertical">
-                            <!-- Right Joystick Button -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="RightStickButton">
-                                    <TextBlock
-                                        Text="{Binding Config.RightStickButton, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Joystick Up -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="RightStickUp">
-                                    <TextBlock
-                                        Text="{Binding Config.RightStickUp, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Joystick Down -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="RightStickDown">
-                                    <TextBlock
-                                        Text="{Binding Config.RightStickDown, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Joystick Left -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="RightStickLeft">
-                                    <TextBlock
-                                        Text="{Binding Config.RightStickLeft, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                            <!-- Right Joystick Right -->
-                            <StackPanel
-                                Margin="0,0,0,4"
-                                Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    Width="120"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
-                                    TextAlignment="Center" />
-                                <ToggleButton Name="RightStickRight">
-                                    <TextBlock
-                                        Text="{Binding Config.RightStickRight, Converter={StaticResource Key}}"
-                                        TextAlignment="Center" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-            </StackPanel>
-        </Grid>
-    </StackPanel>
-</UserControl>

src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -1,210 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Input;
-using Ryujinx.Input.Assigner;
-
-namespace Ryujinx.Ava.UI.Views.Input
-{
-    public partial class KeyboardInputView : UserControl
-    {
-        private ButtonKeyAssigner _currentAssigner;
-
-        public KeyboardInputView()
-        {
-            InitializeComponent();
-
-            foreach (ILogical visual in SettingButtons.GetLogicalDescendants())
-            {
-                if (visual is ToggleButton button and not CheckBox)
-                {
-                    button.IsCheckedChanged += Button_IsCheckedChanged;
-                }
-            }
-        }
-
-        protected override void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-
-            if (_currentAssigner != null && _currentAssigner.ToggledButton != null && !_currentAssigner.ToggledButton.IsPointerOver)
-            {
-                _currentAssigner.Cancel();
-            }
-        }
-
-        private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (sender is ToggleButton button)
-            {
-                if ((bool)button.IsChecked)
-                {
-                    if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
-                    {
-                        return;
-                    }
-
-                    bool isStick = button.Tag != null && button.Tag.ToString() == "stick";
-
-                    if (_currentAssigner == null && (bool)button.IsChecked)
-                    {
-                        _currentAssigner = new ButtonKeyAssigner(button);
-
-                        this.Focus(NavigationMethod.Pointer);
-
-                        PointerPressed += MouseClick;
-
-                        IKeyboard keyboard = (IKeyboard)(DataContext as KeyboardInputViewModel).parentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
-                        IButtonAssigner assigner = CreateButtonAssigner(isStick);
-
-                        _currentAssigner.ButtonAssigned += (sender, e) =>
-                        {
-                            if (e.ButtonValue.HasValue)
-                            {
-                                var viewModel = (DataContext as KeyboardInputViewModel);
-                                var buttonValue = e.ButtonValue.Value;
-                                viewModel.parentModel.IsModified = true;
-
-                                switch (button.Name)
-                                {
-                                    case "ButtonZl":
-                                        viewModel.Config.ButtonZl = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonL":
-                                        viewModel.Config.ButtonL = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonMinus":
-                                        viewModel.Config.ButtonMinus = buttonValue.AsKey();
-                                        break;
-                                    case "LeftStickButton":
-                                        viewModel.Config.LeftStickButton = buttonValue.AsKey();
-                                        break;
-                                    case "LeftStickUp":
-                                        viewModel.Config.LeftStickUp = buttonValue.AsKey();
-                                        break;
-                                    case "LeftStickDown":
-                                        viewModel.Config.LeftStickDown = buttonValue.AsKey();
-                                        break;
-                                    case "LeftStickRight":
-                                        viewModel.Config.LeftStickRight = buttonValue.AsKey();
-                                        break;
-                                    case "LeftStickLeft":
-                                        viewModel.Config.LeftStickLeft = buttonValue.AsKey();
-                                        break;
-                                    case "DpadUp":
-                                        viewModel.Config.DpadUp = buttonValue.AsKey();
-                                        break;
-                                    case "DpadDown":
-                                        viewModel.Config.DpadDown = buttonValue.AsKey();
-                                        break;
-                                    case "DpadLeft":
-                                        viewModel.Config.DpadLeft = buttonValue.AsKey();
-                                        break;
-                                    case "DpadRight":
-                                        viewModel.Config.DpadRight = buttonValue.AsKey();
-                                        break;
-                                    case "LeftButtonSr":
-                                        viewModel.Config.LeftButtonSr = buttonValue.AsKey();
-                                        break;
-                                    case "LeftButtonSl":
-                                        viewModel.Config.LeftButtonSl = buttonValue.AsKey();
-                                        break;
-                                    case "RightButtonSr":
-                                        viewModel.Config.RightButtonSr = buttonValue.AsKey();
-                                        break;
-                                    case "RightButtonSl":
-                                        viewModel.Config.RightButtonSl = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonZr":
-                                        viewModel.Config.ButtonZr = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonR":
-                                        viewModel.Config.ButtonR = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonPlus":
-                                        viewModel.Config.ButtonPlus = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonA":
-                                        viewModel.Config.ButtonA = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonB":
-                                        viewModel.Config.ButtonB = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonX":
-                                        viewModel.Config.ButtonX = buttonValue.AsKey();
-                                        break;
-                                    case "ButtonY":
-                                        viewModel.Config.ButtonY = buttonValue.AsKey();
-                                        break;
-                                    case "RightStickButton":
-                                        viewModel.Config.RightStickButton = buttonValue.AsKey();
-                                        break;
-                                    case "RightStickUp":
-                                        viewModel.Config.RightStickUp = buttonValue.AsKey();
-                                        break;
-                                    case "RightStickDown":
-                                        viewModel.Config.RightStickDown = buttonValue.AsKey();
-                                        break;
-                                    case "RightStickRight":
-                                        viewModel.Config.RightStickRight = buttonValue.AsKey();
-                                        break;
-                                    case "RightStickLeft":
-                                        viewModel.Config.RightStickLeft = buttonValue.AsKey();
-                                        break;
-                                }
-                            }
-                        };
-
-                        _currentAssigner.GetInputAndAssign(assigner, keyboard);
-                    }
-                    else
-                    {
-                        if (_currentAssigner != null)
-                        {
-                            ToggleButton oldButton = _currentAssigner.ToggledButton;
-
-                            _currentAssigner.Cancel();
-                            _currentAssigner = null;
-                            button.IsChecked = false;
-                        }
-                    }
-                }
-                else
-                {
-                    _currentAssigner?.Cancel();
-                    _currentAssigner = null;
-                }
-            }
-        }
-
-        private void MouseClick(object sender, PointerPressedEventArgs e)
-        {
-            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-
-            _currentAssigner?.Cancel(shouldUnbind);
-
-            PointerPressed -= MouseClick;
-        }
-
-        private IButtonAssigner CreateButtonAssigner(bool forStick)
-        {
-            IButtonAssigner assigner;
-
-            assigner = new KeyboardKeyAssigner((IKeyboard)(DataContext as KeyboardInputViewModel).parentModel.SelectedGamepad);
-
-            return assigner;
-        }
-
-        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnDetachedFromVisualTree(e);
-            _currentAssigner?.Cancel();
-            _currentAssigner = null;
-        }
-    }
-}

src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml

@@ -6,7 +6,7 @@
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
     x:DataType="viewModels:MotionInputViewModel"

src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml.cs

@@ -1,7 +1,9 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Common.Configuration.Hid.Controller;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Input
@@ -17,7 +19,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
         public MotionInputView(ControllerInputViewModel viewModel)
         {
-            var config = viewModel.Config;
+            var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
 
             _viewModel = new MotionInputViewModel
             {
@@ -49,7 +51,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             };
             contentDialog.PrimaryButtonClick += (sender, args) =>
             {
-                var config = viewModel.Config;
+                var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
                 config.Slot = content._viewModel.Slot;
                 config.Sensitivity = content._viewModel.Sensitivity;
                 config.GyroDeadzone = content._viewModel.GyroDeadzone;

src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml

@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
     x:DataType="viewModels:RumbleInputViewModel"

src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml.cs

@@ -1,7 +1,9 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Common.Configuration.Hid.Controller;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Input
@@ -17,7 +19,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
         public RumbleInputView(ControllerInputViewModel viewModel)
         {
-            var config = viewModel.Config;
+            var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
 
             _viewModel = new RumbleInputViewModel
             {
@@ -45,7 +47,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
             contentDialog.PrimaryButtonClick += (sender, args) =>
             {
-                var config = viewModel.Config;
+                var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
                 config.StrongRumble = content._viewModel.StrongRumble;
                 config.WeakRumble = content._viewModel.WeakRumble;
             };

src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml

@@ -27,9 +27,9 @@
                         <RowDefinition Height="*" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <views:InputView
+                    <views:ControllerInputView
                         Grid.Row="0"
-                        Name="InputView" />
+                        Name="ControllerSettings" />
                     <StackPanel
                         Orientation="Vertical"
                         Grid.Row="2">

src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
 
         public void Dispose()
         {
-            InputView.Dispose();
+            ControllerSettings.Dispose();
         }
     }
 }

src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Ava.UI.Windows
 
         public void SaveSettings()
         {
-            InputPage.InputView?.SaveCurrentProfile();
+            InputPage.ControllerSettings?.SaveCurrentProfile();
 
             if (Owner is MainWindow window && ViewModel.DirectoryChanged)
             {

src/Ryujinx.Common/Configuration/Multiplayer/MultiplayerMode.cs

@@ -3,5 +3,6 @@
     public enum MultiplayerMode
     {
         Disabled,
+        LdnMitm,
     }
 }

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
   </PropertyGroup>

src/Ryujinx.Common/Utilities/NetworkHelpers.cs

@@ -74,5 +74,10 @@ namespace Ryujinx.Common.Utilities
         {
             return ConvertIpv4Address(IPAddress.Parse(ipAddress));
         }
+
+        public static IPAddress ConvertUint(uint ipAddress)
+        {
+            return new IPAddress(new byte[] { (byte)((ipAddress >> 24) & 0xFF), (byte)((ipAddress >> 16) & 0xFF), (byte)((ipAddress >> 8) & 0xFF), (byte)(ipAddress & 0xFF) });
+        }
     }
 }

src/Ryujinx.Cpu/AppleHv/HvCodePatcher.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Intrinsics;
+
+namespace Ryujinx.Cpu.AppleHv
+{
+    static class HvCodePatcher
+    {
+        private const uint XMask = 0x3f808000u;
+        private const uint XValue = 0x8000000u;
+
+        private const uint ZrIndex = 31u;
+
+        public static void RewriteUnorderedExclusiveInstructions(Span<byte> code)
+        {
+            Span<uint> codeUint = MemoryMarshal.Cast<byte, uint>(code);
+            Span<Vector128<uint>> codeVector = MemoryMarshal.Cast<byte, Vector128<uint>>(code);
+
+            Vector128<uint> mask = Vector128.Create(XMask);
+            Vector128<uint> value = Vector128.Create(XValue);
+
+            for (int index = 0; index < codeVector.Length; index++)
+            {
+                Vector128<uint> v = codeVector[index];
+
+                if (Vector128.EqualsAny(Vector128.BitwiseAnd(v, mask), value))
+                {
+                    int baseIndex = index * 4;
+
+                    for (int instIndex = baseIndex; instIndex < baseIndex + 4; instIndex++)
+                    {
+                        ref uint inst = ref codeUint[instIndex];
+
+                        if ((inst & XMask) != XValue)
+                        {
+                            continue;
+                        }
+
+                        bool isPair = (inst & (1u << 21)) != 0;
+                        bool isLoad = (inst & (1u << 22)) != 0;
+
+                        uint rt2 = (inst >> 10) & 0x1fu;
+                        uint rs = (inst >> 16) & 0x1fu;
+
+                        if (isLoad && rs != ZrIndex)
+                        {
+                            continue;
+                        }
+
+                        if (!isPair && rt2 != ZrIndex)
+                        {
+                            continue;
+                        }
+
+                        // Set the ordered flag.
+                        inst |= 1u << 15;
+                    }
+                }
+            }
+        }
+    }
+}

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -128,21 +128,6 @@ namespace Ryujinx.Cpu.AppleHv
             }
         }
 
-#pragma warning disable IDE0051 // Remove unused private member
-        /// <summary>
-        /// Ensures the combination of virtual address and size is part of the addressable space and fully mapped.
-        /// </summary>
-        /// <param name="va">Virtual address of the range</param>
-        /// <param name="size">Size of the range in bytes</param>
-        private void AssertMapped(ulong va, ulong size)
-        {
-            if (!ValidateAddressAndSize(va, size) || !IsRangeMappedImpl(va, size))
-            {
-                throw new InvalidMemoryRegionException($"Not mapped: va=0x{va:X16}, size=0x{size:X16}");
-            }
-        }
-#pragma warning restore IDE0051
-
         /// <inheritdoc/>
         public void Map(ulong va, ulong pa, ulong size, MemoryMapFlags flags)
         {
@@ -736,6 +721,24 @@ namespace Ryujinx.Cpu.AppleHv
             return (int)(vaSpan / PageSize);
         }
 
+        /// <inheritdoc/>
+        public void Reprotect(ulong va, ulong size, MemoryPermission protection)
+        {
+            if (protection.HasFlag(MemoryPermission.Execute))
+            {
+                // Some applications use unordered exclusive memory access instructions
+                // where it is not valid to do so, leading to memory re-ordering that
+                // makes the code behave incorrectly on some CPUs.
+                // To work around this, we force all such accesses to be ordered.
+
+                using WritableRegion writableRegion = GetWritableRegion(va, (int)size);
+
+                HvCodePatcher.RewriteUnorderedExclusiveInstructions(writableRegion.Memory.Span);
+            }
+
+            // TODO
+        }
+
         /// <inheritdoc/>
         public void TrackingReprotect(ulong va, ulong size, MemoryPermission protection)
         {

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -575,24 +575,17 @@ namespace Ryujinx.Cpu.Jit
             }
         }
 
-#pragma warning disable IDE0051 // Remove unused private member
-        private ulong GetPhysicalAddress(ulong va)
-        {
-            // We return -1L if the virtual address is invalid or unmapped.
-            if (!ValidateAddress(va) || !IsMapped(va))
-            {
-                return ulong.MaxValue;
-            }
-
-            return GetPhysicalAddressInternal(va);
-        }
-#pragma warning restore IDE0051
-
         private ulong GetPhysicalAddressInternal(ulong va)
         {
             return PteToPa(_pageTable.Read<ulong>((va / PageSize) * PteSize) & ~(0xffffUL << 48)) + (va & PageMask);
         }
 
+        /// <inheritdoc/>
+        public void Reprotect(ulong va, ulong size, MemoryPermission protection)
+        {
+            // TODO
+        }
+
         /// <inheritdoc/>
         public void TrackingReprotect(ulong va, ulong size, MemoryPermission protection)
         {
@@ -698,9 +691,5 @@ namespace Ryujinx.Cpu.Jit
         /// Disposes of resources used by the memory manager.
         /// </summary>
         protected override void Destroy() => _pageTable.Dispose();
-
-#pragma warning disable IDE0051 // Remove unused private member
-        private static void ThrowInvalidMemoryRegionException(string message) => throw new InvalidMemoryRegionException(message);
-#pragma warning restore IDE0051
     }
 }

src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs

@@ -615,6 +615,12 @@ namespace Ryujinx.Cpu.Jit
             return (int)(vaSpan / PageSize);
         }
 
+        /// <inheritdoc/>
+        public void Reprotect(ulong va, ulong size, MemoryPermission protection)
+        {
+            // TODO
+        }
+
         /// <inheritdoc/>
         public void TrackingReprotect(ulong va, ulong size, MemoryPermission protection)
         {

src/Ryujinx.Cpu/Ryujinx.Cpu.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Device/Ryujinx.Graphics.Device.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

src/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs

@@ -279,7 +279,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                 bool completeSource = IsTextureCopyComplete(src, srcLinear, srcBpp, srcStride, xCount, yCount);
                 bool completeDest = IsTextureCopyComplete(dst, dstLinear, dstBpp, dstStride, xCount, yCount);
 
-                if (completeSource && completeDest)
+                // Try to set the texture data directly,
+                // but only if we are doing a complete copy,
+                // and not for block linear to linear copies, since those are typically accessed from the CPU.
+
+                if (completeSource && completeDest && !(dstLinear && !srcLinear))
                 {
                     var target = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,

src/Ryujinx.Graphics.Gpu/Image/Texture.cs

@@ -101,6 +101,11 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public bool AlwaysFlushOnOverlap { get; private set; }
 
+        /// <summary>
+        /// Indicates that the texture was modified since the last time it was flushed.
+        /// </summary>
+        public bool ModifiedSinceLastFlush { get; set; }
+
         /// <summary>
         /// Increments when the host texture is swapped, or when the texture is removed from all pools.
         /// </summary>
@@ -149,6 +154,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public bool HadPoolOwner { get; private set; }
 
+        /// <summary>
         /// Physical memory ranges where the texture data is located.
         /// </summary>
         public MultiRange Range { get; private set; }
@@ -1437,7 +1443,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (_modifiedStale || Group.HasCopyDependencies || Group.HasFlushBuffer)
             {
                 _modifiedStale = false;
-                Group.SignalModifying(this, bound);
+                Group.SignalModifying(this, bound, bound || ModifiedSinceLastFlush || Group.HasCopyDependencies || Group.HasFlushBuffer);
             }
 
             _physicalMemory.TextureCache.Lift(this);
@@ -1700,7 +1706,6 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (Group.Storage == this)
             {
                 Group.Unmapped();
-
                 Group.ClearModified(unmapRange);
             }
         }

src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs

@@ -107,8 +107,6 @@ namespace Ryujinx.Graphics.Gpu.Image
                             // Any texture that has been unmapped at any point or is partially unmapped
                             // should update their pool references after the remap completes.
 
-                            MultiRange unmapped = ((MemoryManager)sender).GetPhysicalRegions(e.Address, e.Size);
-
                             foreach (var texture in _partiallyMappedTextures)
                             {
                                 texture.UpdatePoolMappings();
@@ -735,9 +733,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     if (overlap.IsView)
                     {
-                        overlapCompatibility = overlapCompatibility == TextureViewCompatibility.FormatAlias ?
-                            TextureViewCompatibility.Incompatible :
-                            TextureViewCompatibility.CopyOnly;
+                        overlapCompatibility = TextureViewCompatibility.CopyOnly;
                     }
                     else
                     {
@@ -815,7 +811,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                     Texture overlap = _textureOverlaps[index];
                     OverlapInfo oInfo = _overlapInfo[index];
 
-                    if (oInfo.Compatibility <= TextureViewCompatibility.LayoutIncompatible || oInfo.Compatibility == TextureViewCompatibility.FormatAlias)
+                    if (oInfo.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
                     {
                         if (!overlap.IsView && texture.DataOverlaps(overlap, oInfo.Compatibility))
                         {

src/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs

@@ -226,7 +226,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             // D32F and R32F texture have the same representation internally,
             // however the R32F format is used to sample from depth textures.
-            if (lhs.FormatInfo.Format == Format.D32Float && rhs.FormatInfo.Format == Format.R32Float && (forSampler || depthAlias))
+            if (IsValidDepthAsColorAlias(lhs.FormatInfo.Format, rhs.FormatInfo.Format) && (forSampler || depthAlias))
             {
                 return TextureMatchQuality.FormatAlias;
             }
@@ -239,14 +239,8 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     return TextureMatchQuality.FormatAlias;
                 }
-
-                if (lhs.FormatInfo.Format == Format.D16Unorm && rhs.FormatInfo.Format == Format.R16Unorm)
-                {
-                    return TextureMatchQuality.FormatAlias;
-                }
-
-                if ((lhs.FormatInfo.Format == Format.D24UnormS8Uint ||
-                     lhs.FormatInfo.Format == Format.S8UintD24Unorm) && rhs.FormatInfo.Format == Format.B8G8R8A8Unorm)
+                else if ((lhs.FormatInfo.Format == Format.D24UnormS8Uint ||
+                          lhs.FormatInfo.Format == Format.S8UintD24Unorm) && rhs.FormatInfo.Format == Format.B8G8R8A8Unorm)
                 {
                     return TextureMatchQuality.FormatAlias;
                 }
@@ -632,12 +626,27 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             if (lhsFormat.Format.IsDepthOrStencil() || rhsFormat.Format.IsDepthOrStencil())
             {
-                return FormatMatches(lhs, rhs, flags.HasFlag(TextureSearchFlags.ForSampler), flags.HasFlag(TextureSearchFlags.DepthAlias)) switch
+                bool forSampler = flags.HasFlag(TextureSearchFlags.ForSampler);
+                bool depthAlias = flags.HasFlag(TextureSearchFlags.DepthAlias);
+
+                TextureMatchQuality matchQuality = FormatMatches(lhs, rhs, forSampler, depthAlias);
+
+                if (matchQuality == TextureMatchQuality.Perfect)
                 {
-                    TextureMatchQuality.Perfect => TextureViewCompatibility.Full,
-                    TextureMatchQuality.FormatAlias => TextureViewCompatibility.FormatAlias,
-                    _ => TextureViewCompatibility.Incompatible,
-                };
+                    return TextureViewCompatibility.Full;
+                }
+                else if (matchQuality == TextureMatchQuality.FormatAlias)
+                {
+                    return TextureViewCompatibility.FormatAlias;
+                }
+                else if (IsValidColorAsDepthAlias(lhsFormat.Format, rhsFormat.Format) || IsValidDepthAsColorAlias(lhsFormat.Format, rhsFormat.Format))
+                {
+                    return TextureViewCompatibility.CopyOnly;
+                }
+                else
+                {
+                    return TextureViewCompatibility.Incompatible;
+                }
             }
 
             if (IsFormatHostIncompatible(lhs, caps) || IsFormatHostIncompatible(rhs, caps))
@@ -666,6 +675,30 @@ namespace Ryujinx.Graphics.Gpu.Image
             return TextureViewCompatibility.Incompatible;
         }
 
+        /// <summary>
+        /// Checks if it's valid to alias a color format as a depth format.
+        /// </summary>
+        /// <param name="lhsFormat">Source format to be checked</param>
+        /// <param name="rhsFormat">Target format to be checked</param>
+        /// <returns>True if it's valid to alias the formats</returns>
+        private static bool IsValidColorAsDepthAlias(Format lhsFormat, Format rhsFormat)
+        {
+            return (lhsFormat == Format.R32Float && rhsFormat == Format.D32Float) ||
+                   (lhsFormat == Format.R16Unorm && rhsFormat == Format.D16Unorm);
+        }
+
+        /// <summary>
+        /// Checks if it's valid to alias a depth format as a color format.
+        /// </summary>
+        /// <param name="lhsFormat">Source format to be checked</param>
+        /// <param name="rhsFormat">Target format to be checked</param>
+        /// <returns>True if it's valid to alias the formats</returns>
+        private static bool IsValidDepthAsColorAlias(Format lhsFormat, Format rhsFormat)
+        {
+            return (lhsFormat == Format.D32Float && rhsFormat == Format.R32Float) ||
+                   (lhsFormat == Format.D16Unorm && rhsFormat == Format.R16Unorm);
+        }
+
         /// <summary>
         /// Checks if aliasing of two formats that would normally be considered incompatible be allowed,
         /// using copy dependencies.

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -709,7 +709,8 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         /// <param name="texture">The texture that has been modified</param>
         /// <param name="bound">True if this texture is being bound, false if unbound</param>
-        public void SignalModifying(Texture texture, bool bound)
+        /// <param name="setModified">Indicates if the modified flag should be set</param>
+        public void SignalModifying(Texture texture, bool bound, bool setModified)
         {
             ModifiedSequence = _context.GetModifiedSequence();
 
@@ -721,7 +722,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     TextureGroupHandle group = _handles[baseHandle + i];
 
-                    group.SignalModifying(bound, _context);
+                    group.SignalModifying(bound, _context, setModified);
                 }
             });
         }
@@ -1659,6 +1660,14 @@ namespace Ryujinx.Graphics.Gpu.Image
                 return;
             }
 
+            // If size is zero, we have nothing to flush.
+            if (size == 0)
+            {
+                return;
+            }
+
+            Storage.ModifiedSinceLastFlush = false;
+
             // There is a small gap here where the action is removed but _actionRegistered is still 1.
             // In this case it will skip registering the action, but here we are already handling it,
             // so there shouldn't be any issue as it's the same handler for all actions.

src/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs

@@ -304,9 +304,17 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         /// <param name="bound">True if this handle is being bound, false if unbound</param>
         /// <param name="context">The GPU context to register a sync action on</param>
-        public void SignalModifying(bool bound, GpuContext context)
+        /// <param name="setModified">Indicates if the modified flag should be set</param>
+        public void SignalModifying(bool bound, GpuContext context, bool setModified)
         {
-            SignalModified(context);
+            if (setModified)
+            {
+                SignalModified(context);
+            }
+            else
+            {
+                RegisterSync(context);
+            }
 
             if (!bound && _syncActionRegistered && NextSyncCopies())
             {

src/Ryujinx.Graphics.Gpu/Image/TextureManager.cs

@@ -413,21 +413,35 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             bool anyChanged = false;
 
-            if (_rtHostDs != _rtDepthStencil?.HostTexture)
-            {
-                _rtHostDs = _rtDepthStencil?.HostTexture;
+            Texture dsTexture = _rtDepthStencil;
+            ITexture hostDsTexture = null;
 
+            if (dsTexture != null)
+            {
+                hostDsTexture = dsTexture.HostTexture;
+                dsTexture.ModifiedSinceLastFlush = true;
+            }
+
+            if (_rtHostDs != hostDsTexture)
+            {
+                _rtHostDs = hostDsTexture;
                 anyChanged = true;
             }
 
             for (int index = 0; index < _rtColors.Length; index++)
             {
-                ITexture hostTexture = _rtColors[index]?.HostTexture;
+                Texture texture = _rtColors[index];
+                ITexture hostTexture = null;
+
+                if (texture != null)
+                {
+                    hostTexture = texture.HostTexture;
+                    texture.ModifiedSinceLastFlush = true;
+                }
 
                 if (_rtHostColors[index] != hostTexture)
                 {
                     _rtHostColors[index] = hostTexture;
-
                     anyChanged = true;
                 }
             }

src/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs

@@ -37,10 +37,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <returns>The incremented value of the syncpoint</returns>
         public uint IncrementSyncpoint(uint id)
         {
-            if (id >= MaxHardwareSyncpoints)
-            {
-                throw new ArgumentOutOfRangeException(nameof(id));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(id, (uint)MaxHardwareSyncpoints);
 
             return _syncpoints[id].Increment();
         }
@@ -53,10 +50,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <returns>The value of the syncpoint</returns>
         public uint GetSyncpointValue(uint id)
         {
-            if (id >= MaxHardwareSyncpoints)
-            {
-                throw new ArgumentOutOfRangeException(nameof(id));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(id, (uint)MaxHardwareSyncpoints);
 
             return _syncpoints[id].Value;
         }
@@ -72,10 +66,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <returns>The created SyncpointWaiterHandle object or null if already past threshold</returns>
         public SyncpointWaiterHandle RegisterCallbackOnSyncpoint(uint id, uint threshold, Action<SyncpointWaiterHandle> callback)
         {
-            if (id >= MaxHardwareSyncpoints)
-            {
-                throw new ArgumentOutOfRangeException(nameof(id));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(id, (uint)MaxHardwareSyncpoints);
 
             return _syncpoints[id].RegisterCallback(threshold, callback);
         }
@@ -88,10 +79,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <exception cref="System.ArgumentOutOfRangeException">Thrown when id >= MaxHardwareSyncpoints</exception>
         public void UnregisterCallback(uint id, SyncpointWaiterHandle waiterInformation)
         {
-            if (id >= MaxHardwareSyncpoints)
-            {
-                throw new ArgumentOutOfRangeException(nameof(id));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(id, (uint)MaxHardwareSyncpoints);
 
             _syncpoints[id].UnregisterCallback(waiterInformation);
         }
@@ -107,10 +95,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <returns>True if timed out</returns>
         public bool WaitOnSyncpoint(uint id, uint threshold, TimeSpan timeout)
         {
-            if (id >= MaxHardwareSyncpoints)
-            {
-                throw new ArgumentOutOfRangeException(nameof(id));
-            }
+            ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(id, (uint)MaxHardwareSyncpoints);
 
             // TODO: Remove this when GPU channel scheduling will be implemented.
             if (timeout == Timeout.InfiniteTimeSpan)

src/Ryujinx.Graphics.Host1x/Ryujinx.Graphics.Host1x.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs

@@ -367,7 +367,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
             return to;
         }
 
-        private TextureView PboCopy(TextureView from, TextureView to, int srcLayer, int dstLayer, int srcLevel, int dstLevel, int width, int height)
+        public void PboCopy(TextureView from, TextureView to, int srcLayer, int dstLayer, int srcLevel, int dstLevel, int width, int height)
         {
             int dstWidth = width;
             int dstHeight = height;
@@ -445,8 +445,6 @@ namespace Ryujinx.Graphics.OpenGL.Image
             }
 
             GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
-
-            return to;
         }
 
         private void EnsurePbo(TextureView view)

src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs

@@ -140,6 +140,28 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 int levels = Math.Min(Info.Levels, destinationView.Info.Levels - firstLevel);
                 _renderer.TextureCopyIncompatible.CopyIncompatibleFormats(this, destinationView, 0, firstLayer, 0, firstLevel, layers, levels);
             }
+            else if (destinationView.Format.IsDepthOrStencil() != Format.IsDepthOrStencil())
+            {
+                int layers = Math.Min(Info.GetLayers(), destinationView.Info.GetLayers() - firstLayer);
+                int levels = Math.Min(Info.Levels, destinationView.Info.Levels - firstLevel);
+
+                for (int level = 0; level < levels; level++)
+                {
+                    int srcWidth = Math.Max(1, Width >> level);
+                    int srcHeight = Math.Max(1, Height >> level);
+
+                    int dstWidth = Math.Max(1, destinationView.Width >> (firstLevel + level));
+                    int dstHeight = Math.Max(1, destinationView.Height >> (firstLevel + level));
+
+                    int minWidth = Math.Min(srcWidth, dstWidth);
+                    int minHeight = Math.Min(srcHeight, dstHeight);
+
+                    for (int layer = 0; layer < layers; layer++)
+                    {
+                        _renderer.TextureCopy.PboCopy(this, destinationView, 0, firstLayer + layer, 0, firstLevel + level, minWidth, minHeight);
+                    }
+                }
+            }
             else
             {
                 _renderer.TextureCopy.CopyUnscaled(this, destinationView, 0, firstLayer, 0, firstLevel);
@@ -169,6 +191,13 @@ namespace Ryujinx.Graphics.OpenGL.Image
             {
                 _renderer.TextureCopyIncompatible.CopyIncompatibleFormats(this, destinationView, srcLayer, dstLayer, srcLevel, dstLevel, 1, 1);
             }
+            else if (destinationView.Format.IsDepthOrStencil() != Format.IsDepthOrStencil())
+            {
+                int minWidth = Math.Min(Width, destinationView.Width);
+                int minHeight = Math.Min(Height, destinationView.Height);
+
+                _renderer.TextureCopy.PboCopy(this, destinationView, srcLayer, dstLayer, srcLevel, dstLevel, minWidth, minHeight);
+            }
             else
             {
                 _renderer.TextureCopy.CopyUnscaled(this, destinationView, srcLayer, dstLayer, srcLevel, dstLevel, 1, 1);

src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs

@@ -766,7 +766,10 @@ namespace Ryujinx.Graphics.Shader.Instructions
                 flags |= offset == TexOffset.Ptp ? TextureFlags.Offsets : TextureFlags.Offset;
             }
 
-            sourcesList.Add(Const((int)component));
+            if (!hasDepthCompare)
+            {
+                sourcesList.Add(Const((int)component));
+            }
 
             Operand[] sources = sourcesList.ToArray();
             Operand[] dests = new Operand[BitOperations.PopCount((uint)componentMask)];

src/Ryujinx.Graphics.Shader/IntermediateRepresentation/PhiNode.cs

@@ -69,10 +69,7 @@ namespace Ryujinx.Graphics.Shader.IntermediateRepresentation
 
         public Operand GetDest(int index)
         {
-            if (index != 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
+            ArgumentOutOfRangeException.ThrowIfNotEqual(index, 0);
 
             return _dest;
         }

src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Texture/Utils/RgbaColor32.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -102,11 +103,11 @@ namespace Ryujinx.Graphics.Texture.Utils
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RgbaColor32 operator <<(RgbaColor32 x, int shift)
+        public static RgbaColor32 operator <<(RgbaColor32 x, [ConstantExpected] byte shift)
         {
             if (Sse2.IsSupported)
             {
-                return new RgbaColor32(Sse2.ShiftLeftLogical(x._color, (byte)shift));
+                return new RgbaColor32(Sse2.ShiftLeftLogical(x._color, shift));
             }
             else
             {
@@ -115,11 +116,11 @@ namespace Ryujinx.Graphics.Texture.Utils
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RgbaColor32 operator >>(RgbaColor32 x, int shift)
+        public static RgbaColor32 operator >>(RgbaColor32 x, [ConstantExpected] byte shift)
         {
             if (Sse2.IsSupported)
             {
-                return new RgbaColor32(Sse2.ShiftRightLogical(x._color, (byte)shift));
+                return new RgbaColor32(Sse2.ShiftRightLogical(x._color, shift));
             }
             else
             {

src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Ryujinx.Graphics.Video/Ryujinx.Graphics.Video.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -189,7 +189,7 @@ namespace Ryujinx.Graphics.Vulkan
                 PipelineStageFlags.AllCommandsBit,
                 0,
                 1,
-                new ReadOnlySpan<MemoryBarrier>(memoryBarrier),
+                new ReadOnlySpan<MemoryBarrier>(in memoryBarrier),
                 0,
                 ReadOnlySpan<BufferMemoryBarrier>.Empty,
                 0,

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.Vulkan/TextureView.cs

@@ -211,6 +211,13 @@ namespace Ryujinx.Graphics.Vulkan
                 int levels = Math.Min(Info.Levels, dst.Info.Levels - firstLevel);
                 _gd.HelperShader.CopyIncompatibleFormats(_gd, cbs, src, dst, 0, firstLayer, 0, firstLevel, layers, levels);
             }
+            else if (src.Info.Format.IsDepthOrStencil() != dst.Info.Format.IsDepthOrStencil())
+            {
+                int layers = Math.Min(Info.GetLayers(), dst.Info.GetLayers() - firstLayer);
+                int levels = Math.Min(Info.Levels, dst.Info.Levels - firstLevel);
+
+                _gd.HelperShader.CopyColor(_gd, cbs, src, dst, 0, firstLayer, 0, FirstLevel, layers, levels);
+            }
             else
             {
                 TextureCopy.Copy(
@@ -260,6 +267,10 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 _gd.HelperShader.CopyIncompatibleFormats(_gd, cbs, src, dst, srcLayer, dstLayer, srcLevel, dstLevel, 1, 1);
             }
+            else if (src.Info.Format.IsDepthOrStencil() != dst.Info.Format.IsDepthOrStencil())
+            {
+                _gd.HelperShader.CopyColor(_gd, cbs, src, dst, srcLayer, dstLayer, srcLevel, dstLevel, 1, 1);
+            }
             else
             {
                 TextureCopy.Copy(

src/Ryujinx.Graphics.Vulkan/VulkanException.cs

@@ -33,9 +33,5 @@ namespace Ryujinx.Graphics.Vulkan
         public VulkanException(string message, Exception innerException) : base(message, innerException)
         {
         }
-
-        protected VulkanException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
     }
 }

src/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs

@@ -35,8 +35,6 @@ namespace Ryujinx.HLE.Exceptions
             Request = context.Request;
         }
 
-        protected ServiceNotImplementedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
-
         public override string Message
         {
             get

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -198,7 +198,7 @@ namespace Ryujinx.HLE.FileSystem
             {
                 using var ncaFile = new UniqueRef<IFile>();
 
-                fs.OpenFile(ref ncaFile.Ref, ncaPath.FullPath.ToU8Span(), OpenMode.Read);
+                fs.OpenFile(ref ncaFile.Ref, ncaPath.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
                 var nca = new Nca(_virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
                 if (nca.Header.ContentType != NcaContentType.Meta)
                 {
@@ -210,7 +210,7 @@ namespace Ryujinx.HLE.FileSystem
                 using var pfs0 = nca.OpenFileSystem(0, integrityCheckLevel);
                 using var cnmtFile = new UniqueRef<IFile>();
 
-                pfs0.OpenFile(ref cnmtFile.Ref, pfs0.EnumerateEntries().Single().FullPath.ToU8Span(), OpenMode.Read);
+                pfs0.OpenFile(ref cnmtFile.Ref, pfs0.EnumerateEntries().Single().FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
 
                 var cnmt = new Cnmt(cnmtFile.Get.AsStream());
                 if (cnmt.Type != ContentMetaType.AddOnContent || (cnmt.TitleId & 0xFFFFFFFFFFFFE000) != aocBaseId)
@@ -220,7 +220,7 @@ namespace Ryujinx.HLE.FileSystem
 
                 string ncaId = Convert.ToHexString(cnmt.ContentEntries[0].NcaId).ToLower();
 
-                AddAocItem(cnmt.TitleId, containerPath, $"{ncaId}.nca", true);
+                AddAocItem(cnmt.TitleId, containerPath, $"/{ncaId}.nca", true);
             }
         }
 
@@ -238,7 +238,8 @@ namespace Ryujinx.HLE.FileSystem
                 if (!mergedToContainer)
                 {
                     using FileStream fileStream = File.OpenRead(containerPath);
-                    using PartitionFileSystem partitionFileSystem = new(fileStream.AsStorage());
+                    using PartitionFileSystem partitionFileSystem = new();
+                    partitionFileSystem.Initialize(fileStream.AsStorage()).ThrowIfFailure();
 
                     _virtualFileSystem.ImportTickets(partitionFileSystem);
                 }
@@ -259,17 +260,17 @@ namespace Ryujinx.HLE.FileSystem
             {
                 var file = new FileStream(aoc.ContainerPath, FileMode.Open, FileAccess.Read);
                 using var ncaFile = new UniqueRef<IFile>();
-                PartitionFileSystem pfs;
 
                 switch (Path.GetExtension(aoc.ContainerPath))
                 {
                     case ".xci":
-                        pfs = new Xci(_virtualFileSystem.KeySet, file.AsStorage()).OpenPartition(XciPartitionType.Secure);
-                        pfs.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read);
+                        var xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage()).OpenPartition(XciPartitionType.Secure);
+                        xci.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
                         break;
                     case ".nsp":
-                        pfs = new PartitionFileSystem(file.AsStorage());
-                        pfs.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read);
+                        var pfs = new PartitionFileSystem();
+                        pfs.Initialize(file.AsStorage());
+                        pfs.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
                         break;
                     default:
                         return false; // Print error?
@@ -419,10 +420,7 @@ namespace Ryujinx.HLE.FileSystem
 
             if (locationList != null)
             {
-                if (locationList.Contains(entry))
-                {
-                    locationList.Remove(entry);
-                }
+                locationList.Remove(entry);
 
                 locationList.AddLast(entry);
             }
@@ -606,11 +604,11 @@ namespace Ryujinx.HLE.FileSystem
 
             if (filesystem.FileExists($"{path}/00"))
             {
-                filesystem.OpenFile(ref file.Ref, $"{path}/00".ToU8Span(), mode);
+                filesystem.OpenFile(ref file.Ref, $"{path}/00".ToU8Span(), mode).ThrowIfFailure();
             }
             else
             {
-                filesystem.OpenFile(ref file.Ref, path.ToU8Span(), mode);
+                filesystem.OpenFile(ref file.Ref, path.ToU8Span(), mode).ThrowIfFailure();
             }
 
             return file.Release();

src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs

@@ -7,6 +7,7 @@ using LibHac.Fs.Shim;
 using LibHac.FsSrv;
 using LibHac.FsSystem;
 using LibHac.Ncm;
+using LibHac.Sdmmc;
 using LibHac.Spl;
 using LibHac.Tools.Es;
 using LibHac.Tools.Fs;
@@ -32,7 +33,7 @@ namespace Ryujinx.HLE.FileSystem
 
         public KeySet KeySet { get; private set; }
         public EmulatedGameCard GameCard { get; private set; }
-        public EmulatedSdCard SdCard { get; private set; }
+        public SdmmcApi SdCard { get; private set; }
         public ModLoader ModLoader { get; private set; }
 
         private readonly ConcurrentDictionary<ulong, Stream> _romFsByPid;
@@ -198,15 +199,15 @@ namespace Ryujinx.HLE.FileSystem
             fsServerObjects.FsCreators.EncryptedFileSystemCreator = new EncryptedFileSystemCreator();
 
             GameCard = fsServerObjects.GameCard;
-            SdCard = fsServerObjects.SdCard;
+            SdCard = fsServerObjects.Sdmmc;
 
-            SdCard.SetSdCardInsertionStatus(true);
+            SdCard.SetSdCardInserted(true);
 
             var fsServerConfig = new FileSystemServerConfig
             {
-                DeviceOperator = fsServerObjects.DeviceOperator,
                 ExternalKeySet = KeySet.ExternalKeySet,
                 FsCreators = fsServerObjects.FsCreators,
+                StorageDeviceManagerFactory = fsServerObjects.StorageDeviceManagerFactory,
                 RandomGenerator = randomGenerator,
             };
 
@@ -263,7 +264,16 @@ namespace Ryujinx.HLE.FileSystem
 
                 if (result.IsSuccess())
                 {
-                    Ticket ticket = new(ticketFile.Get.AsStream());
+                    // When reading a file from a Sha256PartitionFileSystem, you can't start a read in the middle
+                    // of the hashed portion (usually the first 0x200 bytes) of the file and end the read after
+                    // the end of the hashed portion, so we read the ticket file using a single read.
+                    byte[] ticketData = new byte[0x2C0];
+                    result = ticketFile.Get.Read(out long bytesRead, 0, ticketData);
+
+                    if (result.IsFailure() || bytesRead != ticketData.Length)
+                        continue;
+
+                    Ticket ticket = new(new MemoryStream(ticketData));
                     var titleKey = ticket.GetTitleKey(KeySet);
 
                     if (titleKey != null)

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -101,7 +101,7 @@ namespace Ryujinx.HLE
         /// <summary>
         /// Control if the guest application should be told that there is a Internet connection available.
         /// </summary>
-        internal readonly bool EnableInternetAccess;
+        public bool EnableInternetAccess { internal get; set; }
 
         /// <summary>
         /// Control LibHac's integrity check level.

src/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryPermission.cs

@@ -0,0 +1,46 @@
+using Ryujinx.Memory;
+using System;
+
+namespace Ryujinx.HLE.HOS.Kernel.Memory
+{
+    [Flags]
+    enum KMemoryPermission : uint
+    {
+        None = 0,
+        UserMask = Read | Write | Execute,
+        Mask = uint.MaxValue,
+
+        Read = 1 << 0,
+        Write = 1 << 1,
+        Execute = 1 << 2,
+        DontCare = 1 << 28,
+
+        ReadAndWrite = Read | Write,
+        ReadAndExecute = Read | Execute,
+    }
+
+    static class KMemoryPermissionExtensions
+    {
+        public static MemoryPermission Convert(this KMemoryPermission permission)
+        {
+            MemoryPermission output = MemoryPermission.None;
+
+            if (permission.HasFlag(KMemoryPermission.Read))
+            {
+                output = MemoryPermission.Read;
+            }
+
+            if (permission.HasFlag(KMemoryPermission.Write))
+            {
+                output |= MemoryPermission.Write;
+            }
+
+            if (permission.HasFlag(KMemoryPermission.Execute))
+            {
+                output |= MemoryPermission.Execute;
+            }
+
+            return output;
+        }
+    }
+}

src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs

@@ -203,15 +203,17 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         /// <inheritdoc/>
         protected override Result Reprotect(ulong address, ulong pagesCount, KMemoryPermission permission)
         {
-            // TODO.
+            _cpuMemory.Reprotect(address, pagesCount * PageSize, permission.Convert());
+
             return Result.Success;
         }
 
         /// <inheritdoc/>
-        protected override Result ReprotectWithAttributes(ulong address, ulong pagesCount, KMemoryPermission permission)
+        protected override Result ReprotectAndFlush(ulong address, ulong pagesCount, KMemoryPermission permission)
         {
-            // TODO.
-            return Result.Success;
+            // TODO: Flush JIT cache.
+
+            return Reprotect(address, pagesCount, permission);
         }
 
         /// <inheritdoc/>

src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs

@@ -1255,7 +1255,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
                         if ((oldPermission & KMemoryPermission.Execute) != 0)
                         {
-                            result = ReprotectWithAttributes(address, pagesCount, permission);
+                            result = ReprotectAndFlush(address, pagesCount, permission);
                         }
                         else
                         {
@@ -3036,13 +3036,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         protected abstract Result Reprotect(ulong address, ulong pagesCount, KMemoryPermission permission);
 
         /// <summary>
-        /// Changes the permissions of a given virtual memory region.
+        /// Changes the permissions of a given virtual memory region, while also flushing the cache.
         /// </summary>
         /// <param name="address">Virtual address of the region to have the permission changes</param>
         /// <param name="pagesCount">Number of pages to have their permissions changed</param>
         /// <param name="permission">New permission</param>
         /// <returns>Result of the permission change operation</returns>
-        protected abstract Result ReprotectWithAttributes(ulong address, ulong pagesCount, KMemoryPermission permission);
+        protected abstract Result ReprotectAndFlush(ulong address, ulong pagesCount, KMemoryPermission permission);
 
         /// <summary>
         /// Alerts the memory tracking that a given region has been read from or written to.