fix minor grammatical issues in en_US.json (#183)

.github/workflows/build.yml

@@ -61,11 +61,11 @@ jobs:
         if: matrix.platform.name != 'linux-arm64'
 
       - name: Publish Ryujinx
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained true
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
       - name: Publish Ryujinx.Headless.SDL2
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
       - name: Set executable bit

.github/workflows/canary.yml

@@ -0,0 +1,254 @@
+name: Canary release job
+
+on:
+  workflow_dispatch:
+    inputs: {}
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - 'assets/**'
+      - '*.yml'
+      - '*.json'
+      - '*.config'
+      - '*.md'
+
+concurrency: release
+
+env:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  RYUJINX_BASE_VERSION: "1.2"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
+  RELEASE: 1
+
+jobs:
+  tag:
+    name: Create tag
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Create tag
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/Canary-${{ steps.version_info.outputs.build_version }}',
+              sha: context.sha
+            })
+
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          name: "Canary ${{ steps.version_info.outputs.build_version }}"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          omitBodyDuringUpdate: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+  release:
+    name: Release for ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
+    strategy:
+      matrix:
+        platform:
+          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
+          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Overwrite csc problem matcher
+        run: echo "::add-matcher::.github/csc.json"
+
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Configure for release
+        run: |
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+        shell: bash
+
+      - name: Create output dir
+        run: "mkdir release_output"
+
+      - name: Publish
+        run: |
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+
+      - name: Packing Windows builds
+        if: matrix.platform.os == 'windows-latest'
+        run: |
+          pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          popd
+        shell: bash
+
+      - name: Packing Linux builds
+        if: matrix.platform.os == 'ubuntu-latest'
+        run: |
+          pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          popd
+        shell: bash
+      
+      #- name: Build AppImage (Linux)
+      #  if: matrix.platform.os == 'ubuntu-latest'
+      #  run: |
+      #    BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
+      #    PLATFORM_NAME="${{ matrix.platform.name }}"
+
+      #    sudo apt install -y zsync desktop-file-utils appstream
+
+      #    mkdir -p tools
+      #    export PATH="$PATH:$(readlink -f tools)"
+
+          # Setup appimagetool
+      #    wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+      #    chmod +x tools/appimagetool
+      #    chmod +x distribution/linux/appimage/build-appimage.sh
+
+          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+      #    if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+      #      ARCH_NAME=x64
+      #      export ARCH=x86_64
+      #    elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+      #      ARCH_NAME=arm64
+      #      export ARCH=aarch64
+      #    else
+      #      echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+      #      exit 1
+      #    fi
+
+      #    export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+      #    BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh
+
+          # Add to release output
+      #    pushd publish_ava_appimage
+      #    mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+      #    mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+      #    popd
+      #  shell: bash
+
+      - name: Pushing new release
+        uses: ncipollo/release-action@v1
+        with:
+          name: ${{ steps.version_info.outputs.build_version }}
+          artifacts: "release_output/*.tar.gz,release_output/*.zip"
+          #artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          omitBodyDuringUpdate: true
+          allowUpdates: true
+          replacesArtifacts: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+  macos_release:
+    name: Release MacOS universal
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Setup LLVM 15
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 15
+
+      - name: Install rcodesign
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
+          tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
+          rm apple-codesign.tar.gz
+          mv rcodesign $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+
+      - name: Configure for release
+        run: |
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+        shell: bash
+
+      - name: Publish macOS Ryujinx
+        run: |
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+
+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+
+      - name: Pushing new release
+        uses: ncipollo/release-action@v1
+        with:
+          name: "Canary ${{ steps.version_info.outputs.build_version }}"
+          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          omitBodyDuringUpdate: true
+          allowUpdates: true
+          replacesArtifacts: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs: {}
   push:
-    branches: [ master ]
+    branches: [ release ]
     paths-ignore:
       - '.github/**'
       - 'docs/**'
@@ -20,7 +20,7 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
   RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
   RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
   RELEASE: 1
@@ -101,17 +101,19 @@ jobs:
 
       - name: Publish
         run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained true
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
 
       - name: Packing Windows builds
         if: matrix.platform.os == 'windows-latest'
         run: |
           pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
 
           pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
           7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
         shell: bash
@@ -120,11 +122,13 @@ jobs:
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
           pushd publish_ava
+          rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx
           tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
 
           pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
           tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd

README.md

@@ -61,9 +61,9 @@ Use the search function to see if a game has been tested already!
 To run this emulator, your PC must be equipped with at least 8GiB of RAM;
 failing to meet this requirement may result in a poor gameplay experience or unexpected crashes.
 
-## Latest build
+## Latest release
 
-These builds are compiled automatically for each commit on the master branch.
+Releases are compiled automatically for each commit on the master branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, our automated builds **may be unstable or completely broken**.
 
 You can find the latest release [here](https://github.com/GreemDev/Ryujinx/releases/latest).
@@ -74,6 +74,7 @@ If you are planning to contribute or just want to learn more about this project
 
 ## Building
 
+Building the project is for advanced users.
 If you wish to build the emulator yourself, follow these steps:
 
 ### Step 1

Ryujinx.sln

@@ -29,12 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "src\Ryujinx.Audio\Ryujinx.Audio.csproj", "{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Directory.Packages.props = Directory.Packages.props
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Memory", "src\Ryujinx.Memory\Ryujinx.Memory.csproj", "{A5E6C691-9E22-4263-8F40-42F002CE66BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Memory", "src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj", "{D1CC5322-7325-4F6B-9625-194B30BE1296}"
@@ -87,6 +81,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Gene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Packages.props = Directory.Packages.props
+		.github/workflows/release.yml = .github/workflows/release.yml
+		.github/workflows/canary.yml = .github/workflows/canary.yml
+		.github/workflows/build.yml = .github/workflows/build.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -855,6 +855,7 @@ namespace ARMeilleure.Translation.PTC
                 Thread thread = new(TranslateFuncs)
                 {
                     IsBackground = true,
+                    Name = "Ptc.TranslateThread." + i
                 };
 
                 threads.Add(thread);
@@ -885,6 +886,7 @@ namespace ARMeilleure.Translation.PTC
             Thread preSaveThread = new(PreSave)
             {
                 IsBackground = true,
+                Name = "Ptc.DiskWriter"
             };
             preSaveThread.Start();
         }

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
 
         public OpenALHardwareDeviceDriver()
         {
-            _device = ALC.OpenDevice("");
+            _device = ALC.OpenDevice(string.Empty);
             _context = ALC.CreateContext(_device, new ALContextAttributes());
             _updateRequiredEvent = new ManualResetEvent(false);
             _pauseEvent = new ManualResetEvent(true);

src/Ryujinx.Audio/Renderer/Dsp/AdpcmHelper.cs

@@ -81,7 +81,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static short GetCoefficientAtIndex(ReadOnlySpan<short> coefficients, int index)
         {
-            if ((uint)index > (uint)coefficients.Length)
+            if ((uint)index >= (uint)coefficients.Length)
             {
                 Logger.Error?.Print(LogClass.AudioRenderer, $"Out of bound read for coefficient at index {index}");
 

src/Ryujinx.Common/Configuration/AppDataManager.cs

@@ -119,7 +119,7 @@ namespace Ryujinx.Common.Configuration
 
         private static string SetUpLogsDir()
         {
-            string logDir = "";
+            string logDir = string.Empty;
 
             if (Mode == LaunchMode.Portable)
             {
@@ -148,7 +148,7 @@ namespace Ryujinx.Common.Configuration
                     catch
                     {
                         Logger.Warning?.Print(LogClass.Application, $"Logging directory could not be created '{logDir}'");
-                        logDir = "";
+                        logDir = string.Empty;
                     }
 
                     if (string.IsNullOrEmpty(logDir))
@@ -179,7 +179,7 @@ namespace Ryujinx.Common.Configuration
                     catch
                     {
                         Logger.Warning?.Print(LogClass.Application, $"Logging directory could not be created '{logDir}'");
-                        logDir = "";
+                        logDir = string.Empty;
                     }
 
                     if (string.IsNullOrEmpty(logDir))

src/Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs

@@ -121,8 +121,8 @@ namespace Ryujinx.Common.GraphicsDriver
                 };
                 application.AppName.Set("Ryujinx.exe");
                 application.UserFriendlyName.Set("Ryujinx");
-                application.Launcher.Set("");
-                application.FileInFolder.Set("");
+                application.Launcher.Set(string.Empty);
+                application.FileInFolder.Set(string.Empty);
 
                 Check(NvAPI_DRS_CreateApplication(handle, profileHandle, ref application));
             }

src/Ryujinx.Common/Logging/Logger.cs

@@ -38,7 +38,7 @@ namespace Ryujinx.Common.Logging
             {
                 if (_enabledClasses[(int)logClass])
                 {
-                    Updated?.Invoke(null, new LogEventArgs(Level, _time.Elapsed, Thread.CurrentThread.Name, FormatMessage(logClass, "", message)));
+                    Updated?.Invoke(null, new LogEventArgs(Level, _time.Elapsed, Thread.CurrentThread.Name, FormatMessage(logClass, string.Empty, message)));
                 }
             }
 

src/Ryujinx.Common/ReleaseInformation.cs

@@ -5,7 +5,9 @@ namespace Ryujinx.Common
     // DO NOT EDIT, filled by CI
     public static class ReleaseInformation
     {
-        private const string FlatHubChannelOwner = "flathub";
+        private const string FlatHubChannel = "flathub";
+        private const string CanaryChannel = "canary";
+        private const string ReleaseChannel = "release";
 
         private const string BuildVersion = "%%RYUJINX_BUILD_VERSION%%";
         public const string BuildGitHash = "%%RYUJINX_BUILD_GIT_HASH%%";
@@ -24,7 +26,11 @@ namespace Ryujinx.Common
             !ReleaseChannelRepo.StartsWith("%%") &&
             !ConfigFileName.StartsWith("%%");
 
-        public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannelOwner);
+        public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannel);
+
+        public static bool IsCanaryBuild => IsValid && ReleaseChannelOwner.Equals(CanaryChannel);
+        
+        public static bool IsReleaseBuild => IsValid && ReleaseChannelOwner.Equals(ReleaseChannel);
 
         public static string Version => IsValid ? BuildVersion : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
     }

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
     <PackageReference Include="MsgPack.Cli" />
     <PackageReference Include="System.Management" />
+    <PackageReference Include="Humanizer" />
     <PackageReference Include="Gommon" />
   </ItemGroup>
 

src/Ryujinx.Common/Utilities/JsonHelper.cs

@@ -17,29 +17,19 @@ namespace Ryujinx.Common.Utilities
         /// It is REQUIRED for you to save returned options statically or as a part of static serializer context
         /// in order to avoid performance issues. You can safely modify returned options for your case before storing.
         /// </remarks>
-        public static JsonSerializerOptions GetDefaultSerializerOptions(bool indented = true)
-        {
-            JsonSerializerOptions options = new()
+        public static JsonSerializerOptions GetDefaultSerializerOptions(bool indented = true) =>
+            new()
             {
                 DictionaryKeyPolicy = _snakeCasePolicy,
                 PropertyNamingPolicy = _snakeCasePolicy,
                 WriteIndented = indented,
                 AllowTrailingCommas = true,
-                ReadCommentHandling = JsonCommentHandling.Skip,
+                ReadCommentHandling = JsonCommentHandling.Skip
             };
 
-            return options;
-        }
+        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Serialize(value, typeInfo);
 
-        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo)
-        {
-            return JsonSerializer.Serialize(value, typeInfo);
-        }
-
-        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo)
-        {
-            return JsonSerializer.Deserialize(value, typeInfo);
-        }
+        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Deserialize(value, typeInfo);
 
         public static void SerializeToFile<T>(string filePath, T value, JsonTypeInfo<T> typeInfo)
         {
@@ -53,10 +43,7 @@ namespace Ryujinx.Common.Utilities
             return JsonSerializer.Deserialize(file, typeInfo);
         }
 
-        public static void SerializeToStream<T>(Stream stream, T value, JsonTypeInfo<T> typeInfo)
-        {
-            JsonSerializer.Serialize(stream, value, typeInfo);
-        }
+        public static void SerializeToStream<T>(Stream stream, T value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Serialize(stream, value, typeInfo);
 
         private class SnakeCaseNamingPolicy : JsonNamingPolicy
         {

src/Ryujinx.Graphics.Gpu/GpuContext.cs

@@ -152,16 +152,17 @@ namespace Ryujinx.Graphics.Gpu
         /// Creates a new GPU memory manager.
         /// </summary>
         /// <param name="pid">ID of the process that owns the memory manager</param>
+        /// <param name="cpuMemorySize">The amount of physical CPU Memory Avaiable on the device.</param>
         /// <returns>The memory manager</returns>
         /// <exception cref="ArgumentException">Thrown when <paramref name="pid"/> is invalid</exception>
-        public MemoryManager CreateMemoryManager(ulong pid)
+        public MemoryManager CreateMemoryManager(ulong pid, ulong cpuMemorySize)
         {
             if (!PhysicalMemoryRegistry.TryGetValue(pid, out var physicalMemory))
             {
                 throw new ArgumentException("The PID is invalid or the process was not registered", nameof(pid));
             }
 
-            return new MemoryManager(physicalMemory);
+            return new MemoryManager(physicalMemory, cpuMemorySize);
         }
 
         /// <summary>

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

@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -47,11 +48,17 @@ namespace Ryujinx.Graphics.Gpu.Image
     {
         private const int MinCountForDeletion = 32;
         private const int MaxCapacity = 2048;
+        private const ulong GiB = 1024 * 1024 * 1024;
+        private ulong MaxTextureSizeCapacity = 4UL * GiB;
         private const ulong MinTextureSizeCapacity = 512 * 1024 * 1024;
-        private const ulong MaxTextureSizeCapacity = 4UL * 1024 * 1024 * 1024;
-        private const ulong DefaultTextureSizeCapacity = 1UL * 1024 * 1024 * 1024;
+        private const ulong DefaultTextureSizeCapacity = 1 * GiB;
+        private const ulong TextureSizeCapacity6GiB = 4 * GiB;
+        private const ulong TextureSizeCapacity8GiB = 6 * GiB;
+        private const ulong TextureSizeCapacity12GiB = 12 * GiB;
+
+
         private const float MemoryScaleFactor = 0.50f;
-        private ulong _maxCacheMemoryUsage = 0;
+        private ulong _maxCacheMemoryUsage = DefaultTextureSizeCapacity;
 
         private readonly LinkedList<Texture> _textures;
         private ulong _totalSize;
@@ -66,18 +73,38 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         /// <remarks>
         /// If the backend GPU has 0 memory capacity, the cache size defaults to `DefaultTextureSizeCapacity`.
+        /// 
+        /// Reads the current Device total CPU Memory, to determine the maximum amount of Vram available. Capped to 50% of Current GPU Memory.
         /// </remarks>
         /// <param name="context">The GPU context that the cache belongs to</param>
-        public void Initialize(GpuContext context)
+        /// <param name="cpuMemorySize">The amount of physical CPU Memory Avaiable on the device.</param>
+        public void Initialize(GpuContext context, ulong cpuMemorySize)
         {
+            var cpuMemorySizeGiB = cpuMemorySize / GiB;
+
+            if (cpuMemorySizeGiB < 6 || context.Capabilities.MaximumGpuMemory == 0)
+            {
+                _maxCacheMemoryUsage = DefaultTextureSizeCapacity;
+                return;
+            }
+            else if (cpuMemorySizeGiB == 6)
+            {
+                MaxTextureSizeCapacity = TextureSizeCapacity6GiB;
+            }
+            else if (cpuMemorySizeGiB == 8)
+            {
+                MaxTextureSizeCapacity = TextureSizeCapacity8GiB;
+            }
+            else
+            {
+                MaxTextureSizeCapacity = TextureSizeCapacity12GiB;
+            }
+
             var cacheMemory = (ulong)(context.Capabilities.MaximumGpuMemory * MemoryScaleFactor);
 
             _maxCacheMemoryUsage = Math.Clamp(cacheMemory, MinTextureSizeCapacity, MaxTextureSizeCapacity);
 
-            if (context.Capabilities.MaximumGpuMemory == 0)
-            {
-                _maxCacheMemoryUsage = DefaultTextureSizeCapacity;
-            }
+            Logger.Info?.Print(LogClass.Gpu, $"AutoDelete Cache Allocated VRAM : {_maxCacheMemoryUsage / GiB} GiB");
         }
 
         /// <summary>

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

@@ -71,9 +71,10 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <summary>
         /// Initializes the cache, setting the maximum texture capacity for the specified GPU context.
         /// </summary>
-        public void Initialize()
+        /// <param name="cpuMemorySize">The amount of physical CPU Memory Avaiable on the device.</param>
+        public void Initialize(ulong cpuMemorySize)
         {
-            _cache.Initialize(_context);
+            _cache.Initialize(_context, cpuMemorySize);
         }
 
         /// <summary>

src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs

@@ -55,7 +55,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Creates a new instance of the GPU memory manager.
         /// </summary>
         /// <param name="physicalMemory">Physical memory that this memory manager will map into</param>
-        internal MemoryManager(PhysicalMemory physicalMemory)
+        /// <param name="cpuMemorySize">The amount of physical CPU Memory Avaiable on the device.</param>
+        internal MemoryManager(PhysicalMemory physicalMemory, ulong cpuMemorySize)
         {
             Physical = physicalMemory;
             VirtualRangeCache = new VirtualRangeCache(this);
@@ -65,7 +66,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             MemoryUnmapped += Physical.BufferCache.MemoryUnmappedHandler;
             MemoryUnmapped += VirtualRangeCache.MemoryUnmappedHandler;
             MemoryUnmapped += CounterCache.MemoryUnmappedHandler;
-            Physical.TextureCache.Initialize();
+            Physical.TextureCache.Initialize(cpuMemorySize);
         }
 
         /// <summary>

src/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs

@@ -432,7 +432,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
 
             bool colorIsVector = isGather || !isShadow;
 
-            texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : "");
+            texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : string.Empty);
 
             return texCall;
         }

src/Ryujinx.Graphics.Shader/Translation/FunctionMatch.cs

@@ -830,12 +830,12 @@ namespace Ryujinx.Graphics.Shader.Translation
 
                 if (use.Node != null)
                 {
-                    Console.Write($"{indentation} {separator}- ({(use.Inverted ? "INV " : "")}{use.Index})");
+                    Console.Write($"{indentation} {separator}- ({(use.Inverted ? "INV " : string.Empty)}{use.Index})");
                     PrintTreeNode(use.Node, indentation + (last ? "       " : " |     "));
                 }
                 else
                 {
-                    Console.WriteLine($"{indentation} {separator}- ({(use.Inverted ? "INV " : "")}{use.Index}) NULL");
+                    Console.WriteLine($"{indentation} {separator}- ({(use.Inverted ? "INV " : string.Empty)}{use.Index}) NULL");
                 }
             }
         }
@@ -852,12 +852,12 @@ namespace Ryujinx.Graphics.Shader.Translation
 
                 if (use.Node != null)
                 {
-                    Console.Write($"{indentation} {separator}- ({(use.Inverted ? "INV " : "")}{use.Index})");
+                    Console.Write($"{indentation} {separator}- ({(use.Inverted ? "INV " : string.Empty)}{use.Index})");
                     PrintTreeNode(use.Node, indentation + (last ? "       " : " |     "));
                 }
                 else
                 {
-                    Console.WriteLine($"{indentation} {separator}- ({(use.Inverted ? "INV " : "")}{use.Index}) NULL");
+                    Console.WriteLine($"{indentation} {separator}- ({(use.Inverted ? "INV " : string.Empty)}{use.Index}) NULL");
                 }
             }
         }

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -104,25 +104,27 @@ namespace Ryujinx.Graphics.Vulkan
 
         public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
 
-        public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId)
+        public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> getSurface, Func<string[]> requiredExtensionsFunc, string preferredGpuId)
         {
-            _getSurface = surfaceFunc;
+            _getSurface = getSurface;
             _getRequiredExtensions = requiredExtensionsFunc;
             _preferredGpuId = preferredGpuId;
             Api = api;
-            Shaders = new HashSet<ShaderCollection>();
-            Textures = new HashSet<ITexture>();
-            Samplers = new HashSet<SamplerHolder>();
+            Shaders = [];
+            Textures = [];
+            Samplers = [];
 
-            if (OperatingSystem.IsMacOS())
-            {
+            // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
+            if (IsMoltenVk = OperatingSystem.IsMacOS())
                 MVKInitialization.Initialize();
-
-                // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
-                IsMoltenVk = true;
-            }
         }
 
+        public static VulkanRenderer Create(
+            string preferredGpuId, 
+            Func<Instance, Vk, SurfaceKHR> getSurface,
+            Func<string[]> getRequiredExtensions
+        ) => new(Vk.GetApi(), getSurface, getRequiredExtensions, preferredGpuId);
+
         private unsafe void LoadFeatures(uint maxQueueCount, uint queueFamilyIndex)
         {
             FormatCapabilities = new FormatCapabilities(Api, _physicalDevice.PhysicalDevice);

src/Ryujinx.HLE.Generators/IpcServiceGenerator.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.Generators
             {
                 if (className.Modifiers.Any(SyntaxKind.AbstractKeyword) || className.Modifiers.Any(SyntaxKind.PrivateKeyword) || !className.AttributeLists.Any(x => x.Attributes.Any(y => y.ToString().StartsWith("Service"))))
                     continue;
-                var name = GetFullName(className, context).Replace("global::", "");
+                var name = GetFullName(className, context).Replace("global::", string.Empty);
                 if (!name.StartsWith("Ryujinx.HLE.HOS.Services"))
                     continue;
                 var constructors = className.ChildNodes().Where(x => x.IsKind(SyntaxKind.ConstructorDeclaration)).Select(y => y as ConstructorDeclarationSyntax).ToArray();

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -523,7 +523,7 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     // Clean up the name and get the NcaId
 
-                    string[] pathComponents = entry.FullName.Replace(".cnmt", "").Split('/');
+                    string[] pathComponents = entry.FullName.Replace(".cnmt", string.Empty).Split('/');
 
                     string ncaId = pathComponents[^1];
 

src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs

@@ -132,7 +132,7 @@ namespace Ryujinx.HLE.FileSystem
 
             if (systemPath.StartsWith(baseSystemPath))
             {
-                string rawPath = systemPath.Replace(baseSystemPath, "");
+                string rawPath = systemPath.Replace(baseSystemPath, string.Empty);
                 int firstSeparatorOffset = rawPath.IndexOf(Path.DirectorySeparatorChar);
 
                 if (firstSeparatorOffset == -1)

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         private static string CleanText(string value)
         {
-            return CleanTextRegex().Replace(value, "").Replace("\0", "");
+            return CleanTextRegex().Replace(value, string.Empty).Replace("\0", string.Empty);
         }
 
         private string GetMessageText(uint module, uint description, string key)
@@ -129,17 +129,15 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
                 return CleanText(reader.ReadToEnd());
             }
-            else
-            {
-                return "";
-            }
+
+            return string.Empty;
         }
 
         private string[] GetButtonsText(uint module, uint description, string key)
         {
             string buttonsText = GetMessageText(module, description, key);
 
-            return (buttonsText == "") ? null : buttonsText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+            return (buttonsText == string.Empty) ? null : buttonsText.Split(["\r\n", "\r", "\n"], StringSplitOptions.None);
         }
 
         private void ParseErrorCommonArg()
@@ -156,7 +154,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
             string message = GetMessageText(module, description, "DlgMsg");
 
-            if (message == "")
+            if (message == string.Empty)
             {
                 message = "An error has occured.\n\nPlease try again later.";
             }
@@ -190,7 +188,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
             // TODO: Handle the LanguageCode to return the translated "OK" and "Details".
 
-            if (detailsText.Trim() != "")
+            if (detailsText.Trim() != string.Empty)
             {
                 buttons.Add("Details");
             }

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs

@@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Applets
 
         private byte[] _transferMemory;
 
-        private string _textValue = "";
+        private string _textValue = string.Empty;
         private int _cursorBegin = 0;
         private Encoding _encoding = Encoding.Unicode;
         private KeyboardResult _lastResult = KeyboardResult.NotSet;

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs

@@ -305,7 +305,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
         {
             SKRect bounds = SKRect.Empty;
 
-            if (text == "")
+            if (text == string.Empty)
             {
                 paint.MeasureText(" ", ref bounds);
             }
@@ -321,7 +321,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
         {
             SKRect bounds = SKRect.Empty;
 
-            if (text == "")
+            if (text == string.Empty)
             {
                 paint.MeasureText(" ", ref bounds);
             }

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardUIState.cs

@@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
     /// </summary>
     internal class SoftwareKeyboardUIState
     {
-        public string InputText = "";
+        public string InputText = string.Empty;
         public int CursorBegin = 0;
         public int CursorEnd = 0;
         public bool AcceptPressed = false;

src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs

@@ -238,7 +238,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             }
             else
             {
-                info.SubName = "";
+                info.SubName = string.Empty;
             }
 
             info.ImageName = GetGuessedNsoNameFromIndex(imageIndex);

src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountManager.cs

@@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
         {
             if (userId.IsNull)
             {
-                userId = new UserId(Guid.NewGuid().ToString().Replace("-", ""));
+                userId = new UserId(Guid.NewGuid().ToString().Replace("-", string.Empty));
             }
 
             UserProfile profile = new(userId, name, image);

src/Ryujinx.HLE/HOS/Services/Hid/Hid.cs

@@ -5,6 +5,7 @@ using Ryujinx.HLE.Exceptions;
 using Ryujinx.HLE.HOS.Kernel.Memory;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
+using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugPad;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Keyboard;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Mouse;
@@ -28,6 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         public DebugPadDevice DebugPad;
         public TouchDevice Touchscreen;
         public MouseDevice Mouse;
+        public DebugMouseDevice DebugMouse;
         public KeyboardDevice Keyboard;
         public NpadDevices Npads;
 
@@ -44,6 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             CheckTypeSizeOrThrow<RingLifo<DebugPadState>>(0x2c8);
             CheckTypeSizeOrThrow<RingLifo<TouchScreenState>>(0x2C38);
             CheckTypeSizeOrThrow<RingLifo<MouseState>>(0x350);
+            CheckTypeSizeOrThrow<RingLifo<DebugMouseState>>(0x350);
             CheckTypeSizeOrThrow<RingLifo<KeyboardState>>(0x3D8);
             CheckTypeSizeOrThrow<Array10<NpadState>>(0x32000);
             CheckTypeSizeOrThrow<SharedMemory>(Horizon.HidSize);
@@ -64,6 +67,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             DebugPad = new DebugPadDevice(_device, true);
             Touchscreen = new TouchDevice(_device, true);
             Mouse = new MouseDevice(_device, false);
+            DebugMouse = new DebugMouseDevice(_device, false);
             Keyboard = new KeyboardDevice(_device, false);
             Npads = new NpadDevices(_device, true);
         }

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/DebugMouseDevice.cs

@@ -0,0 +1,29 @@
+using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
+using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse;
+
+namespace Ryujinx.HLE.HOS.Services.Hid
+{
+    public class DebugMouseDevice : BaseDevice
+    {
+        public DebugMouseDevice(Switch device, bool active) : base(device, active) { }
+
+        public void Update()
+        {
+            ref RingLifo<DebugMouseState> lifo = ref _device.Hid.SharedMemory.DebugMouse;
+
+            ref DebugMouseState previousEntry = ref lifo.GetCurrentEntryRef();
+
+            DebugMouseState newState = new()
+            {
+                SamplingNumber = previousEntry.SamplingNumber + 1,
+            };
+
+            if (Active)
+            {
+                // TODO: This is a debug device only present in dev environment, do we want to support it?
+            }
+
+            lifo.Write(ref newState);
+        }
+    }
+}

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -130,6 +130,26 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return ResultCode.Success;
         }
+        
+        [CommandCmif(26)]
+        // ActivateDebugMouse(nn::applet::AppletResourceUserId)
+        public ResultCode ActivateDebugMouse(ServiceCtx context)
+        {
+            long appletResourceUserId = context.RequestData.ReadInt64();
+
+            context.Device.Hid.DebugMouse.Active = true;
+
+            // Initialize entries to avoid issues with some games.
+
+            for (int entry = 0; entry < Hid.SharedMemEntryCount; entry++)
+            {
+                context.Device.Hid.DebugMouse.Update();
+            }
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId });
+
+            return ResultCode.Success;
+        }
 
         [CommandCmif(31)]
         // ActivateKeyboard(nn::applet::AppletResourceUserId)

src/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/DebugMouse/DebugMouseAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse
+{
+    [Flags]
+    enum DebugMouseAttribute : uint
+    {
+        None = 0,
+        Transferable = 1 << 0,
+        IsConnected = 1 << 1,
+    }
+}

src/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/DebugMouse/DebugMouseButton.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse
+{
+    [Flags]
+    enum DebugMouseButton : uint
+    {
+        None = 0,
+        Left = 1 << 0,
+        Right = 1 << 1,
+        Middle = 1 << 2,
+        Forward = 1 << 3,
+        Back = 1 << 4,
+    }
+}

src/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/DebugMouse/DebugMouseState.cs

@@ -0,0 +1,19 @@
+using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DebugMouseState : ISampledDataStruct
+    {
+        public ulong SamplingNumber;
+        public int X;
+        public int Y;
+        public int DeltaX;
+        public int DeltaY;
+        public int WheelDeltaX;
+        public int WheelDeltaY;
+        public DebugMouseButton Buttons;
+        public DebugMouseAttribute Attributes;
+    }
+}

src/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/SharedMemory.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Memory;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
+using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugMouse;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.DebugPad;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Keyboard;
 using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Mouse;
@@ -44,6 +45,12 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory
         /// </summary>
         [FieldOffset(0x9A00)]
         public Array10<NpadState> Npads;
+        
+        /// <summary>
+        /// Debug mouse.
+        /// </summary>
+        [FieldOffset(0x3DC00)]
+        public RingLifo<DebugMouseState> DebugMouse;
 
         public static SharedMemory Create()
         {

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LanProtocol.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
@@ -143,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
                             if (decompressedLdnData.Length != header.DecompressLength)
                             {
                                 Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Decompress error: length does not match. ({decompressedLdnData.Length} != {header.DecompressLength})");
-                                Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Decompress error data: '{string.Join("", decompressedLdnData.Select(x => (int)x).ToArray())}'");
+                                Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Decompress error data: '{decompressedLdnData.Select(x => (int)x).JoinToString(string.Empty)}'");
 
                                 return;
                             }

src/Ryujinx.HLE/HOS/Services/Ngct/NgctServer.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Ngct
             ulong bufferSize = context.Request.PtrBuff[0].Size;
 
             bool isMatch = false;
-            string text = "";
+            string text = string.Empty;
 
             if (bufferSize != 0)
             {
@@ -57,8 +57,8 @@ namespace Ryujinx.HLE.HOS.Services.Ngct
 
             ulong bufferFilteredPosition = context.Request.RecvListBuff[0].Position;
 
-            string text = "";
-            string textFiltered = "";
+            string text = string.Empty;
+            string textFiltered = string.Empty;
 
             if (bufferSize != 0)
             {

src/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs

@@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu
 
         public NvHostAsGpuDeviceFile(ServiceCtx context, IVirtualMemoryManager memory, ulong owner) : base(context, owner)
         {
-            _asContext = new AddressSpaceContext(context.Device.Gpu.CreateMemoryManager(owner));
+            _asContext = new AddressSpaceContext(context.Device.Gpu.CreateMemoryManager(owner, context.Device.Memory.Size));
             _memoryAllocator = new NvMemoryAllocator();
         }
 

src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/Manager/FqdnResolver.cs

@@ -36,7 +36,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
                 // TODO: Load Environment from the savedata.
                 address = address.Replace("%", IManager.NsdSettings.Environment);
 
-                resolvedAddress = "";
+                resolvedAddress = string.Empty;
 
                 if (IManager.NsdSettings == null)
                 {

src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs

@@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 
             if (size < 0)
             {
-                return "";
+                return string.Empty;
             }
 
             ReadOnlySpan<byte> data = ReadInPlace((size + 1) * 2);

src/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs

@@ -166,7 +166,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
 
         private ResultCode OpenDisplayImpl(ServiceCtx context, string name)
         {
-            if (name == "")
+            if (name == string.Empty)
             {
                 return ResultCode.InvalidValue;
             }

src/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs

@@ -102,7 +102,7 @@ namespace Ryujinx.HLE.Loaders.Executables
             Match fsSdkMatch = FsSdkRegex().Match(rawTextBuffer);
             if (fsSdkMatch.Success)
             {
-                stringBuilder.AppendLine($"    FS SDK Version: {fsSdkMatch.Value.Replace("sdk_version: ", "")}");
+                stringBuilder.AppendLine($"    FS SDK Version: {fsSdkMatch.Value.Replace("sdk_version: ", string.Empty)}");
             }
 
             MatchCollection sdkMwMatches = SdkMwRegex().Matches(rawTextBuffer);

src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs

@@ -89,7 +89,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
                 Logger.Warning?.Print(LogClass.Ptc, "Detected unsupported ExeFs modifications. PTC disabled.");
             }
 
-            string programName = "";
+            string programName = string.Empty;
 
             if (!isHomebrew && programId > 0x010000000000FFFF)
             {

src/Ryujinx.HLE/Loaders/Processes/Extensions/LocalFileSystemExtensions.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             var nacpData = new BlitStruct<ApplicationControlProperty>(1);
             ulong programId = metaLoader.GetProgramId();
 
-            device.Configuration.VirtualFileSystem.ModLoader.CollectMods(new[] { programId });
+            device.Configuration.VirtualFileSystem.ModLoader.CollectMods([programId]);
 
             if (programId != 0)
             {

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -145,7 +145,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             IFileSystem dummyExeFs = null;
             Stream romfsStream = null;
 
-            string programName = "";
+            string programName = string.Empty;
             ulong programId = 0000000000000000;
 
             // Load executable.

src/Ryujinx.HLE/Loaders/Processes/ProcessLoaderHelper.cs

@@ -255,7 +255,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             {
                 NsoExecutable nso => Convert.ToHexString(nso.BuildId.ItemsRo.ToArray()),
                 NroExecutable nro => Convert.ToHexString(nro.Header.BuildId),
-                _ => "",
+                _ => string.Empty
             }).ToUpper());
 
             ulong[] nsoBase = new ulong[executables.Length];

src/Ryujinx.Headless.SDL2/WindowBase.cs

@@ -1,3 +1,4 @@
+using Humanizer;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
@@ -485,10 +486,10 @@ namespace Ryujinx.Headless.SDL2
         {
             string playerCount = args.PlayerCountMin == args.PlayerCountMax ? $"exactly {args.PlayerCountMin}" : $"{args.PlayerCountMin}-{args.PlayerCountMax}";
 
-            string message = $"Application requests {playerCount} player(s) with:\n\n"
+            string message = $"Application requests {playerCount} {"player".ToQuantity(args.PlayerCountMin + args.PlayerCountMax, ShowQuantityAs.None)} with:\n\n"
                            + $"TYPES: {args.SupportedStyles}\n\n"
                            + $"PLAYERS: {string.Join(", ", args.SupportedPlayers)}\n\n"
-                           + (args.IsDocked ? "Docked mode set. Handheld is also invalid.\n\n" : "")
+                           + (args.IsDocked ? "Docked mode set. Handheld is also invalid.\n\n" : string.Empty)
                            + "Please reconfigure Input now and then press OK.";
 
             return DisplayMessageDialog("Controller Applet", message);

src/Ryujinx.Horizon.Common/ResultNames.cs

@@ -1235,14 +1235,14 @@ namespace Ryujinx.Horizon.Common
             { 0x412, "NotFound" },
             { 0x612, "NotEnoughBuffer" },
             { 0xCA12, "Cancelled" },
-            { 0x7FE12, "" },
-            { 0xFA212, "" },
+            { 0x7FE12, string.Empty },
+            { 0xFA212, string.Empty },
             { 0xFA612, "InvalidTaskId" },
             { 0xFB612, "InvalidSize" },
             { 0xFCA12, "TaskCancelled" },
             { 0xFCC12, "TaskNotCompleted" },
             { 0xFCE12, "TaskQueueNotAvailable" },
-            { 0x106A12, "" },
+            { 0x106A12, string.Empty },
             { 0x106C12, "OutOfRpcTask" },
             { 0x109612, "InvalidCategory" },
             { 0x214, "OutOfKeyResource" },

src/Ryujinx.Horizon/Sdk/Ngc/Detail/AhoCorasick.cs

@@ -221,7 +221,7 @@ namespace Ryujinx.Horizon.Sdk.Ngc.Detail
                         if (includeMultiWord)
                         {
                             int lastMultiWordIndex = 0;
-                            string multiWord = "";
+                            string multiWord = string.Empty;
 
                             while (_multiWordMap.Has(nodePlainIndex))
                             {

src/Ryujinx.UI.Common/App/ApplicationData.cs

@@ -162,7 +162,7 @@ namespace Ryujinx.UI.App.Common
             NsoReader reader = new();
             reader.Initialize(nsoFile.Release().AsStorage().AsFile(OpenMode.Read)).ThrowIfFailure();
 
-            return BitConverter.ToString(reader.Header.ModuleId.ItemsRo.ToArray()).Replace("-", "").ToUpper()[..16];
+            return BitConverter.ToString(reader.Header.ModuleId.ItemsRo.ToArray()).Replace("-", string.Empty).ToUpper()[..16];
         }
     }
 }

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -298,16 +298,6 @@ namespace Ryujinx.UI.Common.Configuration
         /// </summary>
         public string LanguageCode { get; set; }
 
-        /// <summary>
-        /// Enable or disable custom themes in the GUI
-        /// </summary>
-        public bool EnableCustomTheme { get; set; }
-
-        /// <summary>
-        /// Path to custom GUI theme
-        /// </summary>
-        public string CustomThemePath { get; set; }
-
         /// <summary>
         /// Chooses the base style // Not Used
         /// </summary>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -144,16 +144,6 @@ namespace Ryujinx.UI.Common.Configuration
             /// </summary>
             public ReactiveObject<string> LanguageCode { get; private set; }
 
-            /// <summary>
-            /// Enable or disable custom themes in the GUI
-            /// </summary>
-            public ReactiveObject<bool> EnableCustomTheme { get; private set; }
-
-            /// <summary>
-            /// Path to custom GUI theme
-            /// </summary>
-            public ReactiveObject<string> CustomThemePath { get; private set; }
-
             /// <summary>
             /// Selects the base style
             /// </summary>
@@ -202,8 +192,6 @@ namespace Ryujinx.UI.Common.Configuration
                 AutoloadDirs = new ReactiveObject<List<string>>();
                 ShownFileTypes = new ShownFileTypeSettings();
                 WindowStartup = new WindowStartupSettings();
-                EnableCustomTheme = new ReactiveObject<bool>();
-                CustomThemePath = new ReactiveObject<string>();
                 BaseStyle = new ReactiveObject<string>();
                 StartFullscreen = new ReactiveObject<bool>();
                 GameListViewMode = new ReactiveObject<int>();
@@ -777,8 +765,6 @@ namespace Ryujinx.UI.Common.Configuration
                     WindowMaximized = UI.WindowStartup.WindowMaximized,
                 },
                 LanguageCode = UI.LanguageCode,
-                EnableCustomTheme = UI.EnableCustomTheme,
-                CustomThemePath = UI.CustomThemePath,
                 BaseStyle = UI.BaseStyle,
                 GameListViewMode = UI.GameListViewMode,
                 ShowNames = UI.ShowNames,
@@ -811,8 +797,8 @@ namespace Ryujinx.UI.Common.Configuration
             Graphics.MaxAnisotropy.Value = -1.0f;
             Graphics.AspectRatio.Value = AspectRatio.Fixed16x9;
             Graphics.GraphicsBackend.Value = DefaultGraphicsBackend();
-            Graphics.PreferredGpu.Value = "";
-            Graphics.ShadersDumpPath.Value = "";
+            Graphics.PreferredGpu.Value = string.Empty;
+            Graphics.ShadersDumpPath.Value = string.Empty;
             Logger.EnableDebug.Value = false;
             Logger.EnableStub.Value = true;
             Logger.EnableInfo.Value = true;
@@ -821,7 +807,7 @@ namespace Ryujinx.UI.Common.Configuration
             Logger.EnableTrace.Value = false;
             Logger.EnableGuest.Value = true;
             Logger.EnableFsAccessLog.Value = false;
-            Logger.FilteredClasses.Value = Array.Empty<LogClass>();
+            Logger.FilteredClasses.Value = [];
             Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;
             System.Language.Value = Language.AmericanEnglish;
             System.Region.Value = Region.USA;
@@ -868,17 +854,15 @@ namespace Ryujinx.UI.Common.Configuration
             UI.GuiColumns.PathColumn.Value = true;
             UI.ColumnSort.SortColumnId.Value = 0;
             UI.ColumnSort.SortAscending.Value = false;
-            UI.GameDirs.Value = new List<string>();
-            UI.AutoloadDirs.Value = new List<string>();
+            UI.GameDirs.Value = [];
+            UI.AutoloadDirs.Value = [];
             UI.ShownFileTypes.NSP.Value = true;
             UI.ShownFileTypes.PFS0.Value = true;
             UI.ShownFileTypes.XCI.Value = true;
             UI.ShownFileTypes.NCA.Value = true;
             UI.ShownFileTypes.NRO.Value = true;
             UI.ShownFileTypes.NSO.Value = true;
-            UI.EnableCustomTheme.Value = true;
             UI.LanguageCode.Value = "en_US";
-            UI.CustomThemePath.Value = "";
             UI.BaseStyle.Value = "Dark";
             UI.GameListViewMode.Value = 0;
             UI.ShowNames.Value = true;
@@ -1628,9 +1612,7 @@ namespace Ryujinx.UI.Common.Configuration
             UI.ShownFileTypes.NCA.Value = configurationFileFormat.ShownFileTypes.NCA;
             UI.ShownFileTypes.NRO.Value = configurationFileFormat.ShownFileTypes.NRO;
             UI.ShownFileTypes.NSO.Value = configurationFileFormat.ShownFileTypes.NSO;
-            UI.EnableCustomTheme.Value = configurationFileFormat.EnableCustomTheme;
             UI.LanguageCode.Value = configurationFileFormat.LanguageCode;
-            UI.CustomThemePath.Value = configurationFileFormat.CustomThemePath;
             UI.BaseStyle.Value = configurationFileFormat.BaseStyle;
             UI.GameListViewMode.Value = configurationFileFormat.GameListViewMode;
             UI.ShowNames.Value = configurationFileFormat.ShowNames;

src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs

@@ -35,7 +35,7 @@ namespace Ryujinx.UI.Common.Helper
             if ((uninstall && AreMimeTypesRegisteredLinux()) || (!uninstall && !AreMimeTypesRegisteredLinux()))
             {
                 string mimeTypesFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mime", "Ryujinx.xml");
-                string additionalArgs = !uninstall ? "--novendor" : "";
+                string additionalArgs = !uninstall ? "--novendor" : string.Empty;
 
                 using Process mimeProcess = new();
 
@@ -83,7 +83,7 @@ namespace Ryujinx.UI.Common.Helper
 
                 var openCmd = key.OpenSubKey(@"shell\open\command");
 
-                string keyValue = (string)openCmd.GetValue("");
+                string keyValue = (string)openCmd.GetValue(string.Empty);
 
                 return keyValue is not null && (keyValue.Contains("Ryujinx") || keyValue.Contains(AppDomain.CurrentDomain.FriendlyName));
             }

src/Ryujinx.UI.Common/Helper/TitleUpdatesHelper.cs

@@ -53,7 +53,7 @@ namespace Ryujinx.UI.Common.Helper
         {
             var titleUpdateWindowData = new TitleUpdateMetadata
             {
-                Selected = "",
+                Selected = string.Empty,
                 Paths = [],
             };
 

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -51,7 +51,6 @@
   <ItemGroup>
     <PackageReference Include="DiscordRichPresence" />
     <PackageReference Include="DynamicData" />
-    <PackageReference Include="Humanizer" />
     <PackageReference Include="securifybv.ShellLink" />
   </ItemGroup>
 

src/Ryujinx.UI.LocaleGenerator/LocaleGenerator.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.UI.LocaleGenerator
 
             context.RegisterSourceOutput(contents, (spc, content) =>
             {
-                var lines = content.Split('\n').Where(x => x.Trim().StartsWith("\"")).Select(x => x.Split(':')[0].Trim().Replace("\"", ""));
+                var lines = content.Split('\n').Where(x => x.Trim().StartsWith("\"")).Select(x => x.Split(':')[0].Trim().Replace("\"", string.Empty));
                 StringBuilder enumSourceBuilder = new();
                 enumSourceBuilder.AppendLine("namespace Ryujinx.Ava.Common.Locale;");
                 enumSourceBuilder.AppendLine("internal enum LocaleKeys");

src/Ryujinx/App.axaml.cs

@@ -58,11 +58,9 @@ namespace Ryujinx.Ava
 
             if (Program.PreviewerDetached)
             {
-                ApplyConfiguredTheme();
+                ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
 
                 ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
-                ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
-                ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
             }
         }
 
@@ -88,17 +86,13 @@ namespace Ryujinx.Ava
                 }
             });
         }
-        
-        private void CustomThemeChanged_Event(object _, ReactiveEventArgs<bool> __) => ApplyConfiguredTheme();
 
-        private void ThemeChanged_Event(object _, ReactiveEventArgs<string> __) => ApplyConfiguredTheme();
+        private void ThemeChanged_Event(object _, ReactiveEventArgs<string> rArgs) => ApplyConfiguredTheme(rArgs.NewValue);
 
-        public void ApplyConfiguredTheme()
+        public void ApplyConfiguredTheme(string baseStyle)
         {
             try
             {
-                string baseStyle = ConfigurationState.Instance.UI.BaseStyle;
-
                 if (string.IsNullOrWhiteSpace(baseStyle))
                 {
                     ConfigurationState.Instance.UI.BaseStyle.Value = "Auto";

src/Ryujinx/AppHost.cs

@@ -604,61 +604,59 @@ namespace Ryujinx.Ava
 
             SystemVersion firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
             {
                 if (!SetupValidator.CanStartApplication(ContentManager, ApplicationPath, out UserError userError))
-                {
+                { 
+                    if (SetupValidator.CanFixStartApplication(ContentManager, ApplicationPath, userError, out firmwareVersion))
                     {
-                        if (SetupValidator.CanFixStartApplication(ContentManager, ApplicationPath, userError, out firmwareVersion))
+                        if (userError is UserError.NoFirmware)
                         {
-                            if (userError == UserError.NoFirmware)
-                            {
-                                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                                    LocaleManager.Instance[LocaleKeys.DialogFirmwareNoFirmwareInstalledMessage],
-                                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstallEmbeddedMessage, firmwareVersion.VersionString),
-                                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                                    "");
+                            UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
+                                LocaleManager.Instance[LocaleKeys.DialogFirmwareNoFirmwareInstalledMessage], 
+                                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstallEmbeddedMessage, firmwareVersion.VersionString),
+                                LocaleManager.Instance[LocaleKeys.InputDialogYes],
+                                LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                                string.Empty);
 
-                                if (result != UserResult.Yes)
-                                {
-                                    await UserErrorDialog.ShowUserErrorDialog(userError);
-                                    Device.Dispose();
-
-                                    return false;
-                                }
-                            }
-
-                            if (!SetupValidator.TryFixStartApplication(ContentManager, ApplicationPath, userError, out _))
+                            if (result != UserResult.Yes)
                             {
                                 await UserErrorDialog.ShowUserErrorDialog(userError);
                                 Device.Dispose();
 
                                 return false;
                             }
-
-                            // Tell the user that we installed a firmware for them.
-                            if (userError == UserError.NoFirmware)
-                            {
-                                firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
-
-                                _viewModel.RefreshFirmwareStatus();
-
-                                await ContentDialogHelper.CreateInfoDialog(
-                                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstalledMessage, firmwareVersion.VersionString),
-                                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstallEmbeddedSuccessMessage, firmwareVersion.VersionString),
-                                    LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                                    "",
-                                    LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
-                            }
                         }
-                        else
+
+                        if (!SetupValidator.TryFixStartApplication(ContentManager, ApplicationPath, userError, out _))
                         {
                             await UserErrorDialog.ShowUserErrorDialog(userError);
                             Device.Dispose();
 
                             return false;
                         }
+
+                        // Tell the user that we installed a firmware for them.
+                        if (userError is UserError.NoFirmware)
+                        {
+                            firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
+
+                            _viewModel.RefreshFirmwareStatus();
+
+                            await ContentDialogHelper.CreateInfoDialog(
+                                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstalledMessage, firmwareVersion.VersionString),
+                                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstallEmbeddedSuccessMessage, firmwareVersion.VersionString),
+                                LocaleManager.Instance[LocaleKeys.InputDialogOk],
+                                string.Empty,
+                                LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
+                        }
+                    }
+                    else
+                    {
+                        await UserErrorDialog.ShowUserErrorDialog(userError);
+                        Device.Dispose();
+
+                        return false;
                     }
                 }
             }
@@ -820,20 +818,12 @@ namespace Ryujinx.Ava
             VirtualFileSystem.ReloadKeySet();
 
             // Initialize Renderer.
-            IRenderer renderer;
-
-            if (ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.Vulkan)
-            {
-                renderer = new VulkanRenderer(
-                    Vk.GetApi(),
+            IRenderer renderer = ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.OpenGl
+                ? new OpenGLRenderer()
+                : VulkanRenderer.Create(
+                    ConfigurationState.Instance.Graphics.PreferredGpu,
                     (RendererHost.EmbeddedWindow as EmbeddedWindowVulkan)!.CreateSurface,
-                    VulkanHelper.GetRequiredInstanceExtensions,
-                    ConfigurationState.Instance.Graphics.PreferredGpu.Value);
-            }
-            else
-            {
-                renderer = new OpenGLRenderer();
-            }
+                    VulkanHelper.GetRequiredInstanceExtensions);
 
             BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
 

src/Ryujinx/Assets/Locales/en_US.json

@@ -439,13 +439,13 @@
   "DialogNcaExtractionMessage": "Extracting {0} section from {1}...",
   "DialogNcaExtractionTitle": "Ryujinx - NCA Section Extractor",
   "DialogNcaExtractionMainNcaNotFoundErrorMessage": "Extraction failure. The main NCA was not present in the selected file.",
-  "DialogNcaExtractionCheckLogErrorMessage": "Extraction failure. Read the log file for further information.",
+  "DialogNcaExtractionCheckLogErrorMessage": "Extraction failed. Please check the log file for more details.",
   "DialogNcaExtractionSuccessMessage": "Extraction completed successfully.",
-  "DialogUpdaterConvertFailedMessage": "Failed to convert the current Ryujinx version.",
-  "DialogUpdaterCancelUpdateMessage": "Cancelling Update!",
-  "DialogUpdaterAlreadyOnLatestVersionMessage": "You are already using the most updated version of Ryujinx!",
-  "DialogUpdaterFailedToGetVersionMessage": "An error has occurred when trying to get release information from GitHub Release. This can be caused if a new release is being compiled by GitHub Actions. Try again in a few minutes.",
-  "DialogUpdaterConvertFailedGithubMessage": "Failed to convert the received Ryujinx version from Github Release.",
+  "DialogUpdaterConvertFailedMessage": "Unable to convert the current Ryujinx version.",
+  "DialogUpdaterCancelUpdateMessage": "Update canceled!",
+  "DialogUpdaterAlreadyOnLatestVersionMessage": "You are already using the latest version of Ryujinx!",
+  "DialogUpdaterFailedToGetVersionMessage": "An error occurred while trying to retrieve release information from GitHub. This may happen if a new release is currently being compiled by GitHub Actions. Please try again in a few minutes.",
+  "DialogUpdaterConvertFailedGithubMessage": "Failed to convert the Ryujinx version received from GitHub."
   "DialogUpdaterDownloadingMessage": "Downloading Update...",
   "DialogUpdaterExtractionMessage": "Extracting Update...",
   "DialogUpdaterRenamingMessage": "Renaming Update...",
@@ -455,7 +455,7 @@
   "DialogUpdaterNoInternetMessage": "You are not connected to the Internet!",
   "DialogUpdaterNoInternetSubMessage": "Please verify that you have a working Internet connection!",
   "DialogUpdaterDirtyBuildMessage": "You Cannot update a Dirty build of Ryujinx!",
-  "DialogUpdaterDirtyBuildSubMessage": "Please download Ryujinx at https://https://github.com/GreemDev/Ryujinx/releases/ if you are looking for a supported version.",
+  "DialogUpdaterDirtyBuildSubMessage": "Please download Ryujinx at https://github.com/GreemDev/Ryujinx/releases/ if you are looking for a supported version.",
   "DialogRestartRequiredMessage": "Restart Required",
   "DialogThemeRestartMessage": "Theme has been saved. A restart is needed to apply the theme.",
   "DialogThemeRestartSubMessage": "Do you want to restart",

src/Ryujinx/Common/Locale/LocaleExtension.cs

@@ -1,28 +0,0 @@
-using Avalonia.Data.Core;
-using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.MarkupExtensions;
-using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
-using System;
-
-namespace Ryujinx.Ava.Common.Locale
-{
-    internal class LocaleExtension(LocaleKeys key) : MarkupExtension
-    {
-        private ClrPropertyInfo PropertyInfo
-            => new(
-                "Item",
-                _ => LocaleManager.Instance[key],
-                null,
-                typeof(string)
-            );
-
-        public override object ProvideValue(IServiceProvider serviceProvider) =>
-            new CompiledBindingExtension(
-                    new CompiledBindingPathBuilder()
-                        .Property(PropertyInfo, PropertyInfoAccessorFactory.CreateInpcPropertyAccessor)
-                        .Build()
-                )
-            { Source = LocaleManager.Instance }
-                .ProvideValue(serviceProvider);
-    }
-}

src/Ryujinx/Common/Markup/BasicMarkupExtension.cs

@@ -1,21 +1,15 @@
-using Avalonia.Data.Core;
+using Avalonia.Data.Core;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
 using System;
 
-namespace Ryujinx.Ava.Common.Icon
+namespace Ryujinx.Ava.Common.Markup
 {
-    internal class IconExtension(string iconString) : MarkupExtension
+    internal abstract class BasicMarkupExtension : MarkupExtension 
     {
-        private ClrPropertyInfo PropertyInfo
-            => new(
-                "Item",
-                _ => new Projektanker.Icons.Avalonia.Icon { Value = iconString },
-                null,
-                typeof(Projektanker.Icons.Avalonia.Icon)
-            );
-
+        protected abstract ClrPropertyInfo PropertyInfo { get; }
+        
         public override object ProvideValue(IServiceProvider serviceProvider) =>
             new CompiledBindingExtension(
                 new CompiledBindingPathBuilder()

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -0,0 +1,51 @@
+using Avalonia.Data.Core;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
+using Projektanker.Icons.Avalonia;
+using Ryujinx.Ava.Common.Locale;
+using System;
+
+namespace Ryujinx.Ava.Common.Markup
+{
+    internal class IconExtension(string iconString) : BasicMarkupExtension
+    {
+        protected override ClrPropertyInfo PropertyInfo
+            => new(
+                "Item",
+                _ => new Icon { Value = iconString },
+                null,
+                typeof(Icon)
+            );
+    }
+    
+    internal class SpinningIconExtension(string iconString) : BasicMarkupExtension
+    {
+        protected override ClrPropertyInfo PropertyInfo
+            => new(
+                "Item",
+                _ => new Icon { Value = iconString, Animation = IconAnimation.Spin },
+                null,
+                typeof(Icon)
+            );
+    }
+    
+    internal class LocaleExtension(LocaleKeys key) : MarkupExtension
+    {
+        private ClrPropertyInfo PropertyInfo
+            => new(
+                "Item",
+                _ => LocaleManager.Instance[key],
+                null,
+                typeof(string)
+            );
+        
+        public override object ProvideValue(IServiceProvider serviceProvider) =>
+            new CompiledBindingExtension(
+                new CompiledBindingPathBuilder()
+                    .Property(PropertyInfo, PropertyInfoAccessorFactory.CreateInpcPropertyAccessor)
+                    .Build()
+            ) { Source = LocaleManager.Instance }
+                .ProvideValue(serviceProvider);
+    }
+}

src/Ryujinx/Program.cs

@@ -14,7 +14,6 @@ using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
-using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
@@ -46,8 +45,7 @@ namespace Ryujinx.Ava
         public static int Main(string[] args)
         {
             Version = ReleaseInformation.Version;
-
-
+            
             if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
             {
                 _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 1803 and newer.\n", $"Ryujinx {Version}", MbIconwarning);

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -120,7 +120,7 @@ namespace Ryujinx.Ava.UI.Applet
 
             bool okPressed = false;
             bool error = false;
-            string inputText = args.InitialText ?? "";
+            string inputText = args.InitialText ?? string.Empty;
 
             Dispatcher.UIThread.InvokeAsync(async () =>
             {

src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:applet="using:Ryujinx.Ava.UI.Applet"
     mc:Ignorable="d"
     Width="400"
@@ -25,11 +25,11 @@
                 Spacing="10"
                 Margin="10">
                 <TextBlock
-                    Text="{locale:Locale ControllerAppletDescription}" />
+                    Text="{ext:Locale ControllerAppletDescription}" />
                 <TextBlock
                     IsVisible="{Binding IsDocked}"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletDocked}" />
+                    Text="{ext:Locale ControllerAppletDocked}" />
             </StackPanel>
         </Border>
         <Border
@@ -48,7 +48,7 @@
                     VerticalAlignment="Center"
                     TextAlignment="Center"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletControllers}" />
+                    Text="{ext:Locale ControllerAppletControllers}" />
                 <StackPanel
                     Spacing="10"
                     HorizontalAlignment="Center"
@@ -96,7 +96,7 @@
                     VerticalAlignment="Center"
                     TextAlignment="Center"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletPlayers}" />
+                    Text="{ext:Locale ControllerAppletPlayers}" />
                 <Border Height="50">
                     <TextBlock
                         HorizontalAlignment="Center"
@@ -121,13 +121,13 @@
                     Name="SaveButton"
                     MinWidth="90"
                     Command="{Binding OpenSettingsWindow}">
-                    <TextBlock Text="{locale:Locale DialogOpenSettingsWindowLabel}" />
+                    <TextBlock Text="{ext:Locale DialogOpenSettingsWindowLabel}" />
                 </Button>
                 <Button
                     Name="CancelButton"
                     MinWidth="90"
                     Command="{Binding Close}">
-                    <TextBlock Text="{locale:Locale SettingsButtonClose}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonClose}" />
                 </Button>
             </StackPanel>
         </Panel>

src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Ava.UI.Applet
         public static SvgImage JoyconLeftImage => GetResource(JoyConLeftResource);
         public static SvgImage JoyconRightImage => GetResource(JoyConRightResource);
 
-        public string PlayerCount { get; set; } = "";
+        public string PlayerCount { get; set; } = string.Empty;
         public bool SupportsProController { get; set; }
         public bool SupportsLeftJoycon { get; set; }
         public bool SupportsRightJoycon { get; set; }

src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml

@@ -3,9 +3,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="{locale:Locale ErrorWindowTitle}"
+    Title="{ext:Locale ErrorWindowTitle}"
     xmlns:views="using:Ryujinx.Ava.UI.Applet"
     Width="450"
     Height="340"

src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -27,13 +27,18 @@ namespace Ryujinx.Ava.UI.Controls
         {
             MainText = mainText;
             SecondaryText = secondaryText;
-            Message = message ?? "";
+            Message = message ?? string.Empty;
             DataContext = this;
             _placeholder = placeholder;
             InitializeComponent();
 
             Input.Watermark = _placeholder;
 
+            if (string.IsNullOrWhiteSpace(Input.Watermark))
+            {
+                Input.UseFloatingWatermark = false;
+            }
+
             Input.AddHandler(TextInputEvent, Message_TextInput, RoutingStrategies.Tunnel, true);
         }
 
@@ -50,9 +55,9 @@ namespace Ryujinx.Ava.UI.Controls
             Input.Focus();
         }
 
-        public string Message { get; set; } = "";
-        public string MainText { get; set; } = "";
-        public string SecondaryText { get; set; } = "";
+        public string Message { get; set; } = string.Empty;
+        public string MainText { get; set; } = string.Empty;
+        public string SecondaryText { get; set; } = string.Empty;
 
         public static async Task<(UserResult Result, string Input)> ShowInputDialog(string title, SoftwareKeyboardUIArgs args)
         {
@@ -71,7 +76,7 @@ namespace Ryujinx.Ava.UI.Controls
             contentDialog.Title = title;
             contentDialog.PrimaryButtonText = args.SubmitText;
             contentDialog.IsPrimaryButtonEnabled = content._checkLength(content.Message.Length);
-            contentDialog.SecondaryButtonText = "";
+            contentDialog.SecondaryButtonText = string.Empty;
             contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel];
             contentDialog.Content = content;
 
@@ -105,13 +110,13 @@ namespace Ryujinx.Ava.UI.Controls
             Error.IsVisible = false;
             Error.FontStyle = FontStyle.Italic;
 
-            string validationInfoText = "";
+            string validationInfoText = string.Empty;
 
             if (_inputMin <= 0 && _inputMax == int.MaxValue) // Disable.
             {
                 Error.IsVisible = false;
 
-                _checkLength = length => true;
+                _checkLength = _ => true;
             }
             else if (_inputMin > 0 && _inputMax == int.MaxValue)
             {

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -2,109 +2,108 @@
     x:Class="Ryujinx.Ava.UI.Controls.ApplicationContextMenu"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:icon="clr-namespace:Ryujinx.Ava.Common.Icon"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel">
     <MenuItem
         Click="RunApplication_Click"
-        Header="{locale:Locale GameListContextMenuRunApplication}"
-        Icon="{icon:Icon fa-solid fa-play}"/>
+        Header="{ext:Locale GameListContextMenuRunApplication}"
+        Icon="{ext:Icon fa-solid fa-play}"/>
     <MenuItem
         Click="ToggleFavorite_Click"
-        Header="{locale:Locale GameListContextMenuToggleFavorite}"
-        Icon="{icon:Icon fa-solid fa-star}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
+        Header="{ext:Locale GameListContextMenuToggleFavorite}"
+        Icon="{ext:Icon fa-solid fa-star}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuToggleFavoriteToolTip}" />
     <MenuItem
         Click="CreateApplicationShortcut_Click"
-        Header="{locale:Locale GameListContextMenuCreateShortcut}"
+        Header="{ext:Locale GameListContextMenuCreateShortcut}"
         IsEnabled="{Binding CreateShortcutEnabled}"
-        Icon="{icon:Icon fa-solid fa-bookmark}"
-        ToolTip.Tip="{OnPlatform Default={locale:Locale GameListContextMenuCreateShortcutToolTip}, macOS={locale:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+        Icon="{ext:Icon fa-solid fa-bookmark}"
+        ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />
     <MenuItem
         Click="OpenUserSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
-        Icon="{icon:Icon mdi-folder-account}"
+        Header="{ext:Locale GameListContextMenuOpenUserSaveDirectory}"
+        Icon="{ext:Icon mdi-folder-account}"
         IsEnabled="{Binding OpenUserSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
     <MenuItem
         Click="OpenDeviceSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
+        Header="{ext:Locale GameListContextMenuOpenDeviceSaveDirectory}"
         IsEnabled="{Binding OpenDeviceSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
     <MenuItem
         Click="OpenBcatSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
+        Header="{ext:Locale GameListContextMenuOpenBcatSaveDirectory}"
         IsEnabled="{Binding OpenBcatSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenTitleUpdateManager_Click"
-        Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
-        Icon="{icon:Icon fa-solid fa-code-compare}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageTitleUpdates}"
+        Icon="{ext:Icon fa-solid fa-code-compare}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
     <MenuItem
         Click="OpenDownloadableContentManager_Click"
-        Header="{locale:Locale GameListContextMenuManageDlc}"
-        Icon="{icon:Icon fa-solid fa-download}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageDlc}"
+        Icon="{ext:Icon fa-solid fa-download}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageDlcToolTip}" />
     <MenuItem
         Click="OpenCheatManager_Click"
-        Header="{locale:Locale GameListContextMenuManageCheat}"
-        Icon="{icon:Icon fa-solid fa-code}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageCheat}"
+        Icon="{ext:Icon fa-solid fa-code}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageCheatToolTip}" />
     <MenuItem
         Click="OpenModManager_Click"
-        Header="{locale:Locale GameListContextMenuManageMod}"
-        Icon="{icon:Icon mdi-view-module}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageModToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageMod}"
+        Icon="{ext:Icon mdi-view-module}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageModToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
-        Icon="{icon:Icon mdi-folder-file}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
+        Header="{ext:Locale GameListContextMenuOpenModsDirectory}"
+        Icon="{ext:Icon mdi-folder-file}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
     <MenuItem
         Click="OpenSdModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
-        Icon="{icon:Icon mdi-folder-file}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
+        Header="{ext:Locale GameListContextMenuOpenSdModsDirectory}"
+        Icon="{ext:Icon mdi-folder-file}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
     <Separator />
-    <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}" Icon="{icon:Icon mdi-cached}">
+    <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}">
         <MenuItem
             Click="PurgePtcCache_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
-            Icon="{icon:Icon mdi-refresh}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementPurgePptc}"
+            Icon="{ext:Icon mdi-refresh}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
         <MenuItem
             Click="PurgeShaderCache_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-            Icon="{icon:Icon mdi-delete-alert}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
+            Icon="{ext:Icon mdi-delete-alert}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
         <MenuItem
             Click="OpenPtcDirectory_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
-            Icon="{icon:Icon mdi-folder-arrow-up-down}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
+            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
         <MenuItem
             Click="OpenShaderCacheDirectory_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
-            Icon="{icon:Icon mdi-folder-arrow-up-down}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
+            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
     </MenuItem>
-    <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
+    <MenuItem Header="{ext:Locale GameListContextMenuExtractData}">
         <MenuItem
             Click="ExtractApplicationExeFs_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataExeFS}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataExeFSToolTip}" />
         <MenuItem
             Click="ExtractApplicationRomFs_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
         <MenuItem
             Click="ExtractApplicationLogo_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataLogo}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataLogo}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataLogoToolTip}" />
     </MenuItem>
 </MenuFlyout>

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -55,14 +55,7 @@
                             VerticalAlignment="Stretch"
                             ClipToBounds="True"
                             CornerRadius="5">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="10" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition Width="100" />
-                                </Grid.ColumnDefinitions>
+                            <Grid ColumnDefinitions="Auto,10,*,150,100">
                                 <Image
                                     Grid.RowSpan="3"
                                     Grid.Column="0"

src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs

@@ -138,7 +138,7 @@ namespace Ryujinx.Ava.UI.Controls
 
             foreach (var account in lostAccounts)
             {
-                ViewModel.LostProfiles.Add(new UserProfile(new HLE.HOS.Services.Account.Acc.UserProfile(account, "", null), this));
+                ViewModel.LostProfiles.Add(new UserProfile(new HLE.HOS.Services.Account.Acc.UserProfile(account, string.Empty, null), this));
             }
 
             ViewModel.Profiles.Add(new BaseModel());
@@ -155,14 +155,11 @@ namespace Ryujinx.Ava.UI.Controls
 
                 if (profile == null)
                 {
-                    Dispatcher.UIThread.Post(Action);
+                    _ = Dispatcher.UIThread.InvokeAsync(async () 
+                        => await ContentDialogHelper.CreateErrorDialog(
+                            LocaleManager.Instance[LocaleKeys.DialogUserProfileDeletionWarningMessage]));
                     
                     return;
-                    
-                    static async void Action()
-                    {
-                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUserProfileDeletionWarningMessage]);
-                    }
                 }
 
                 AccountManager.OpenUser(profile.UserId);
@@ -170,10 +167,10 @@ namespace Ryujinx.Ava.UI.Controls
 
             var result = await ContentDialogHelper.CreateConfirmationDialog(
                 LocaleManager.Instance[LocaleKeys.DialogUserProfileDeletionConfirmMessage],
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogYes],
                 LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                "");
+                string.Empty);
 
             if (result == UserResult.Yes)
             {

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -205,7 +205,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 primary,
                 secondaryText,
                 acceptButton,
-                "",
+                string.Empty,
                 closeButton,
                 (int)Symbol.Important);
 
@@ -221,7 +221,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 primaryText,
                 secondaryText,
                 acceptButtonText,
-                "",
+                string.Empty,
                 cancelButtonText,
                 (int)Symbol.Help,
                 primaryButtonResult);
@@ -239,8 +239,8 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleManager.Instance[LocaleKeys.DialogUpdaterTitle],
                 primary,
                 secondaryText,
-                "",
-                "",
+                string.Empty,
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 (int)Symbol.Important);
 
@@ -249,8 +249,8 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleManager.Instance[LocaleKeys.DialogWarningTitle],
                 primary,
                 secondaryText,
-                "",
-                "",
+                string.Empty,
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 (int)Symbol.Important);
 
@@ -263,7 +263,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleManager.Instance[LocaleKeys.DialogErrorMessage],
                 errorMessage,
                 secondaryErrorMessage,
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 (int)Symbol.Dismiss);
         }
@@ -282,7 +282,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 primary,
                 secondaryText,
                 LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogNo],
                 (int)Symbol.Help,
                 UserResult.Yes);

src/Ryujinx/UI/Helpers/KeyValueConverter.cs

@@ -122,7 +122,7 @@ namespace Ryujinx.Ava.UI.Helpers
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            string keyString = "";
+            string keyString = string.Empty;
             LocaleKeys localeKey;
 
             switch (value)

src/Ryujinx/UI/Helpers/UserErrorDialog.cs

@@ -40,7 +40,7 @@ namespace Ryujinx.Ava.UI.Helpers
             await ContentDialogHelper.CreateInfoDialog(
                 LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogUserErrorDialogMessage, errorCode, GetErrorTitle(error)),
                 GetErrorDescription(error),
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogUserErrorDialogTitle, errorCode));
         }

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -320,7 +320,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
             }
 
-            if (LastScannedAmiiboId != "")
+            if (LastScannedAmiiboId != string.Empty)
             {
                 SelectLastScannedAmiibo();
             }
@@ -421,7 +421,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                         usageStringBuilder.Append($"{LocaleManager.Instance[LocaleKeys.Unknown]}.");
                     }
 
-                    Usage = $"{LocaleManager.Instance[LocaleKeys.Usage]} {(writable ? $" ({LocaleManager.Instance[LocaleKeys.Writable]})" : "")} : {usageStringBuilder}";
+                    Usage = $"{LocaleManager.Instance[LocaleKeys.Usage]} {(writable ? $" ({LocaleManager.Instance[LocaleKeys.Writable]})" : string.Empty)} : {usageStringBuilder}";
                 }
             }
 
@@ -480,7 +480,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
                 LocaleManager.Instance[LocaleKeys.DialogAmiiboApiFailFetchMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
 
             return null;
@@ -530,7 +530,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
                 LocaleManager.Instance[LocaleKeys.DialogAmiiboApiConnectErrorMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                "",
+                string.Empty,
                 LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
         }
     }

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -287,7 +287,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             var msg = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowDlcAddedMessage], numAdded);
             return Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                await ContentDialogHelper.ShowTextDialog(LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle], msg, "", "", "", LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Checkmark);
+                await ContentDialogHelper.ShowTextDialog(
+                    LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle], 
+                    msg, 
+                    string.Empty, 
+                    string.Empty, 
+                    string.Empty, 
+                    LocaleManager.Instance[LocaleKeys.InputDialogOk], 
+                    (int)Symbol.Checkmark);
             });
         }
     }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -29,7 +29,6 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
-using Ryujinx.Modules;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
@@ -1092,7 +1091,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                                 string message = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogFirmwareInstallerFirmwareInstallSuccessMessage, firmwareVersion.VersionString);
 
-                                await ContentDialogHelper.CreateInfoDialog(dialogTitle, message, LocaleManager.Instance[LocaleKeys.InputDialogOk], "", LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
+                                await ContentDialogHelper.CreateInfoDialog(
+                                    dialogTitle, 
+                                    message, 
+                                    LocaleManager.Instance[LocaleKeys.InputDialogOk], 
+                                    string.Empty, 
+                                    LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
 
                                 Logger.Info?.Print(LogClass.Application, message);
 
@@ -1163,7 +1167,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                             case LoadState.Loaded:
                                 LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, _currentApplicationData.Name);
                                 IsLoadingIndeterminate = true;
-                                CacheLoadStatus = "";
+                                CacheLoadStatus = string.Empty;
                                 break;
                         }
                         break;
@@ -1183,7 +1187,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                             case ShaderCacheLoadingState.Loaded:
                                 LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, _currentApplicationData.Name);
                                 IsLoadingIndeterminate = true;
-                                CacheLoadStatus = "";
+                                CacheLoadStatus = string.Empty;
                                 break;
                         }
                         break;
@@ -1303,7 +1307,12 @@ namespace Ryujinx.Ava.UI.ViewModels
                 {
                     await ContentDialogHelper.ShowTextDialog(
                         LocaleManager.Instance[numAdded > 0 || numRemoved > 0 ? LocaleKeys.RyujinxConfirm : LocaleKeys.RyujinxInfo],
-                        msg, "", "", "", LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Checkmark);
+                        msg, 
+                        string.Empty, 
+                        string.Empty, 
+                        string.Empty, 
+                        LocaleManager.Instance[LocaleKeys.InputDialogOk], 
+                        (int)Symbol.Checkmark);
                 });
             }
         }
@@ -1600,7 +1609,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     LocaleManager.Instance[LocaleKeys.DialogLoadAppGameAlreadyLoadedMessage],
                     LocaleManager.Instance[LocaleKeys.DialogLoadAppGameAlreadyLoadedSubMessage],
                     LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                    "",
+                    string.Empty,
                     LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
 
                 return;
@@ -1817,7 +1826,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                 if (result == UserResult.Yes)
                 {
-                    ConfigurationState.Instance.Graphics.ShadersDumpPath.Value = "";
+                    ConfigurationState.Instance.Graphics.ShadersDumpPath.Value = string.Empty;
 
                     SaveConfig();
                 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -80,8 +80,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 {
                     Dispatcher.UIThread.InvokeAsync(() =>
                          ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogSettingsBackendThreadingWarningMessage],
-                            "",
-                            "",
+                             string.Empty,
+                             string.Empty,
                             LocaleManager.Instance[LocaleKeys.InputDialogOk],
                             LocaleManager.Instance[LocaleKeys.DialogSettingsBackendThreadingWarningTitle])
                     );
@@ -338,7 +338,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     {
                         _gpuIds.Add(device.Id);
 
-                        AvailableGpus.Add(new ComboBoxItem { Content = $"{device.Name} {(device.IsDiscrete ? "(dGPU)" : "")}" });
+                        AvailableGpus.Add(new ComboBoxItem { Content = $"{device.Name} {(device.IsDiscrete ? "(dGPU)" : string.Empty)}" });
                     });
                 }
             }

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -227,10 +227,16 @@ namespace Ryujinx.Ava.UI.ViewModels
         private Task ShowNewUpdatesAddedDialog(int numAdded)
         {
             var msg = string.Format(LocaleManager.Instance[LocaleKeys.UpdateWindowUpdateAddedMessage], numAdded);
-            return Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                await ContentDialogHelper.ShowTextDialog(LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle], msg, "", "", "", LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Checkmark);
-            });
+            return Dispatcher.UIThread.InvokeAsync(async () => 
+                await ContentDialogHelper.ShowTextDialog(
+                    LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle], 
+                    msg, 
+                    string.Empty, 
+                    string.Empty, 
+                    string.Empty, 
+                    LocaleManager.Instance[LocaleKeys.InputDialogOk], 
+                    (int)Symbol.Checkmark
+                ));
         }
     }
 }

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

@@ -1,7 +1,7 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     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"
@@ -73,7 +73,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZL}"
+                                Text="{ext:Locale ControllerSettingsTriggerZL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZl">
                                 <TextBlock
@@ -89,7 +89,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerL}"
+                                Text="{ext:Locale ControllerSettingsTriggerL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonL">
                                 <TextBlock
@@ -105,7 +105,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonMinus}"
+                                Text="{ext:Locale ControllerSettingsButtonMinus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonMinus">
                                 <TextBlock
@@ -128,7 +128,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsLStick}" />
+                            Text="{ext:Locale ControllerSettingsLStick}" />
                         <!-- Left Joystick Controller -->
                         <StackPanel Orientation="Vertical">
                             <!-- Left Joystick Button -->
@@ -139,7 +139,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickButton">
                                     <TextBlock
@@ -156,7 +156,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickStick}"
+                                    Text="{ext:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftJoystick" Tag="stick">
                                     <TextBlock
@@ -168,13 +168,13 @@
                                 Margin="0,8,0,8"
                                 Height="1" />
                             <CheckBox IsChecked="{Binding Config.LeftInvertStickX}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.LeftInvertStickY}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.LeftRotate90}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator
                                 Margin="0,8,0,8"
@@ -182,7 +182,7 @@
                             <StackPanel Orientation="Vertical">
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDeadzone}" />
+                                    Text="{ext:Locale ControllerSettingsStickDeadzone}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -202,7 +202,7 @@
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRange}" />
+                                    Text="{ext:Locale ControllerSettingsStickRange}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -238,7 +238,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsDPad}" />
+                            Text="{ext:Locale ControllerSettingsDPad}" />
                         <StackPanel Orientation="Vertical">
                             <!-- Left DPad Up -->
                             <StackPanel
@@ -249,7 +249,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsDPadUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -266,7 +266,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDPadDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -283,7 +283,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -300,7 +300,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsDPadRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
@@ -334,7 +334,7 @@
                         Orientation="Vertical">
                         <TextBlock
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsTriggerThreshold}" />
+                            Text="{ext:Locale ControllerSettingsTriggerThreshold}" />
                         <StackPanel
                             HorizontalAlignment="Center"
                             Orientation="Horizontal">
@@ -363,7 +363,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSR}"
+                                    Text="{ext:Locale ControllerSettingsLeftSR}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftButtonSr">
                                     <TextBlock
@@ -381,7 +381,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSL}"
+                                    Text="{ext:Locale ControllerSettingsLeftSL}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftButtonSl">
                                     <TextBlock
@@ -399,7 +399,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSR}"
+                                    Text="{ext:Locale ControllerSettingsRightSR}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightButtonSr">
                                     <TextBlock
@@ -417,7 +417,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSL}"
+                                    Text="{ext:Locale ControllerSettingsRightSL}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightButtonSl">
                                     <TextBlock
@@ -450,13 +450,13 @@
                                 MinWidth="0"
                                 Grid.Column="0"
                                 IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsMotion}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
                             </CheckBox>
                             <Button
                                 Margin="10"
                                 Grid.Column="1"
                                 Command="{Binding ShowMotionConfig}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsConfigureGeneral}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                             </Button>
                         </Grid>
                     </Border>
@@ -476,13 +476,13 @@
                                 MinWidth="0"
                                 Grid.Column="0"
                                 IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRumble}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
                             </CheckBox>
                             <Button
                                 Margin="10"
                                 Grid.Column="1"
                                 Command="{Binding ShowRumbleConfig}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsConfigureGeneral}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                             </Button>
                         </Grid>
                     </Border>
@@ -519,7 +519,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZR}"
+                                Text="{ext:Locale ControllerSettingsTriggerZR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZr">
                                 <TextBlock
@@ -537,7 +537,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerR}"
+                                Text="{ext:Locale ControllerSettingsTriggerR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonR">
                                 <TextBlock
@@ -555,7 +555,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonPlus}"
+                                Text="{ext:Locale ControllerSettingsButtonPlus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonPlus">
                                 <TextBlock
@@ -578,7 +578,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsButtons}" />
+                            Text="{ext:Locale ControllerSettingsButtons}" />
                         <StackPanel
                             Orientation="Vertical">
                             <!-- Right Buttons A -->
@@ -590,7 +590,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonA}"
+                                    Text="{ext:Locale ControllerSettingsButtonA}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonA">
                                     <TextBlock
@@ -607,7 +607,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonB}"
+                                    Text="{ext:Locale ControllerSettingsButtonB}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonB">
                                     <TextBlock
@@ -624,7 +624,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonX}"
+                                    Text="{ext:Locale ControllerSettingsButtonX}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonX">
                                     <TextBlock
@@ -641,7 +641,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonY}"
+                                    Text="{ext:Locale ControllerSettingsButtonY}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonY">
                                     <TextBlock
@@ -664,7 +664,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsRStick}" />
+                            Text="{ext:Locale ControllerSettingsRStick}" />
                         <!-- Right Joystick Controller -->
                         <StackPanel Orientation="Vertical">
                             <!-- Right Joystick Button -->
@@ -675,7 +675,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickButton">
                                     <TextBlock
@@ -693,7 +693,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickStick}"
+                                    Text="{ext:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightJoystick" Tag="stick">
                                     <TextBlock
@@ -703,19 +703,19 @@
                             </StackPanel>
                             <Separator Margin="0,8,0,8" Height="1" />
                             <CheckBox IsChecked="{Binding Config.RightInvertStickX}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.RightInvertStickY}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.RightRotate90}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator Margin="0,8,0,8" Height="1" />
                             <StackPanel Orientation="Vertical">
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDeadzone}" />
+                                    Text="{ext:Locale ControllerSettingsStickDeadzone}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -737,7 +737,7 @@
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRange}" />
+                                    Text="{ext:Locale ControllerSettingsStickRange}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"

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

@@ -2,7 +2,7 @@
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     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"
@@ -56,7 +56,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsPlayer}" />
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
                     <ComboBox
                         Grid.Column="1"
                         Name="PlayerIndexBox"
@@ -90,7 +90,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsProfile}" />
+                        Text="{ext:Locale ControllerSettingsProfile}" />
                     <ui:FAComboBox
                         Grid.Column="1"
                         IsEditable="True"
@@ -105,7 +105,7 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
+                        ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
                         Command="{Binding LoadProfile}">
                         <ui:SymbolIcon
                             Symbol="Upload"
@@ -117,7 +117,7 @@
                             MinWidth="0"
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
+                            ToolTip.Tip="{ext:Locale ControllerSettingsSaveProfileToolTip}"
                             Command="{Binding SaveProfile}">
                         <ui:SymbolIcon
                             Symbol="Save"
@@ -129,7 +129,7 @@
                             MinWidth="0"
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
+                            ToolTip.Tip="{ext:Locale ControllerSettingsRemoveProfileToolTip}"
                             Command="{Binding RemoveProfile}">
                         <ui:SymbolIcon
                             Symbol="Delete"
@@ -161,7 +161,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsInputDevice}" />
+                        Text="{ext:Locale ControllerSettingsInputDevice}" />
                     <ComboBox
                         Grid.Column="1"
                         Name="DeviceBox"
@@ -196,7 +196,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsControllerType}" />
+                        Text="{ext:Locale ControllerSettingsControllerType}" />
                     <ComboBox
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"

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

@@ -1,7 +1,7 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     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"
@@ -72,7 +72,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZL}"
+                                Text="{ext:Locale ControllerSettingsTriggerZL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZl">
                                 <TextBlock
@@ -88,7 +88,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerL}"
+                                Text="{ext:Locale ControllerSettingsTriggerL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonL">
                                 <TextBlock
@@ -104,7 +104,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonMinus}"
+                                Text="{ext:Locale ControllerSettingsButtonMinus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonMinus">
                                 <TextBlock
@@ -127,7 +127,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsLStick}" />
+                            Text="{ext:Locale ControllerSettingsLStick}" />
                         <!-- Left Joystick Keyboard -->
                         <StackPanel Orientation="Vertical">
                             <!-- Left Joystick Button -->
@@ -139,7 +139,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickButton">
                                     <TextBlock
@@ -156,7 +156,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsStickUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickUp">
                                     <TextBlock
@@ -173,7 +173,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsStickDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickDown">
                                     <TextBlock
@@ -190,7 +190,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsStickLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickLeft">
                                     <TextBlock
@@ -207,7 +207,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsStickRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickRight">
                                     <TextBlock
@@ -232,7 +232,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsDPad}" />
+                            Text="{ext:Locale ControllerSettingsDPad}" />
                         <StackPanel Orientation="Vertical">
                             <!-- Left DPad Up -->
                             <StackPanel
@@ -243,7 +243,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsDPadUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -260,7 +260,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDPadDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -277,7 +277,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -294,7 +294,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsDPadRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
@@ -337,7 +337,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSR}"
+                                Text="{ext:Locale ControllerSettingsLeftSR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="LeftButtonSr">
                                 <TextBlock
@@ -355,7 +355,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSL}"
+                                Text="{ext:Locale ControllerSettingsLeftSL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="LeftButtonSl">
                                 <TextBlock
@@ -373,7 +373,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSR}"
+                                Text="{ext:Locale ControllerSettingsRightSR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="RightButtonSr">
                                 <TextBlock
@@ -391,7 +391,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSL}"
+                                Text="{ext:Locale ControllerSettingsRightSL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="RightButtonSl">
                                 <TextBlock
@@ -433,7 +433,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZR}"
+                                Text="{ext:Locale ControllerSettingsTriggerZR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZr">
                                 <TextBlock
@@ -451,7 +451,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerR}"
+                                Text="{ext:Locale ControllerSettingsTriggerR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonR">
                                 <TextBlock
@@ -469,7 +469,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonPlus}"
+                                Text="{ext:Locale ControllerSettingsButtonPlus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonPlus">
                                 <TextBlock
@@ -492,7 +492,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsButtons}" />
+                            Text="{ext:Locale ControllerSettingsButtons}" />
                         <StackPanel
                             Orientation="Vertical">
                             <!-- Right Buttons A -->
@@ -504,7 +504,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonA}"
+                                    Text="{ext:Locale ControllerSettingsButtonA}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonA">
                                     <TextBlock
@@ -521,7 +521,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonB}"
+                                    Text="{ext:Locale ControllerSettingsButtonB}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonB">
                                     <TextBlock
@@ -538,7 +538,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonX}"
+                                    Text="{ext:Locale ControllerSettingsButtonX}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonX">
                                     <TextBlock
@@ -555,7 +555,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonY}"
+                                    Text="{ext:Locale ControllerSettingsButtonY}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonY">
                                     <TextBlock
@@ -578,7 +578,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsRStick}" />
+                            Text="{ext:Locale ControllerSettingsRStick}" />
                         <!-- Right Joystick Keyboard -->
                         <StackPanel Orientation="Vertical">
                             <!-- Right Joystick Button -->
@@ -590,7 +590,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickButton">
                                     <TextBlock
@@ -607,7 +607,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsStickUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickUp">
                                     <TextBlock
@@ -624,7 +624,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsStickDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickDown">
                                     <TextBlock
@@ -641,7 +641,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsStickLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickLeft">
                                     <TextBlock
@@ -658,7 +658,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsStickRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickRight">
                                     <TextBlock
@@ -672,4 +672,4 @@
             </StackPanel>
         </Grid>
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -5,7 +5,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
@@ -23,7 +23,7 @@
                 <TextBlock
                     Margin="0"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionGyroSensitivity}" />
+                    Text="{ext:Locale ControllerSettingsMotionGyroSensitivity}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="150"
@@ -45,7 +45,7 @@
                 <TextBlock
                     Margin="0"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionGyroDeadzone}" />
+                    Text="{ext:Locale ControllerSettingsMotionGyroDeadzone}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="150"
@@ -70,7 +70,7 @@
                 <TextBlock
                     Margin="0,3,0,0"
                     VerticalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionUseCemuhookCompatibleMotion}" />
+                    Text="{ext:Locale ControllerSettingsMotionUseCemuhookCompatibleMotion}" />
             </CheckBox>
         </StackPanel>
         <Border
@@ -98,7 +98,7 @@
                             Margin="5"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsMotionServerHost}" />
+                            Text="{ext:Locale ControllerSettingsMotionServerHost}" />
                         <TextBox
                             Height="30"
                             MinWidth="100"
@@ -130,7 +130,7 @@
                             <TextBlock
                                 Margin="0,10,0,0"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsMotionControllerSlot}" />
+                                Text="{ext:Locale ControllerSettingsMotionControllerSlot}" />
                             <ui:NumberBox
                                 Grid.Row="0"
                                 Grid.Column="1"
@@ -145,7 +145,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsMotionRightJoyConSlot}" />
+                                Text="{ext:Locale ControllerSettingsMotionRightJoyConSlot}" />
                             <ui:NumberBox
                                 Grid.Row="1"
                                 Grid.Column="1"
@@ -162,7 +162,7 @@
                         IsChecked="{Binding MirrorInput, Mode=TwoWay}">
                         <TextBlock
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsMotionMirrorInput}" />
+                            Text="{ext:Locale ControllerSettingsMotionMirrorInput}" />
                     </CheckBox>
                 </StackPanel>
             </Grid>

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

@@ -43,7 +43,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 Title = LocaleManager.Instance[LocaleKeys.ControllerMotionTitle],
                 PrimaryButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsSave],
-                SecondaryButtonText = "",
+                SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                 Content = content,
             };

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

@@ -4,7 +4,7 @@
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
@@ -21,7 +21,7 @@
                     Width="100"
                     TextWrapping="WrapWithOverflow"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsRumbleStrongMultiplier}" />
+                    Text="{ext:Locale ControllerSettingsRumbleStrongMultiplier}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="200"
@@ -41,7 +41,7 @@
                     Width="100"
                     TextWrapping="WrapWithOverflow"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsRumbleWeakMultiplier}" />
+                    Text="{ext:Locale ControllerSettingsRumbleWeakMultiplier}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="200"

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

@@ -38,7 +38,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 Title = LocaleManager.Instance[LocaleKeys.ControllerRumbleTitle],
                 PrimaryButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsSave],
-                SecondaryButtonText = "",
+                SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                 Content = content,
             };

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -3,8 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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:icon="clr-namespace:Ryujinx.Ava.Common.Icon"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel"
@@ -31,60 +30,60 @@
                     <DockPanel Margin="0" HorizontalAlignment="Stretch" />
                 </ItemsPanelTemplate>
             </Menu.ItemsPanel>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarFile}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarFile}">
                 <MenuItem
                     Command="{Binding OpenFile}"
-                    Header="{locale:Locale MenuBarFileOpenFromFile}"
-                    Icon="{icon:Icon fa-solid fa-file}"
+                    Header="{ext:Locale MenuBarFileOpenFromFile}"
+                    Icon="{ext:Icon fa-solid fa-file}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFileTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadApplicationFileTooltip}" />
                 <MenuItem
                     Command="{Binding OpenFolder}"
-                    Header="{locale:Locale MenuBarFileOpenUnpacked}"
-                    Icon="{icon:Icon fa-solid fa-folder}"
+                    Header="{ext:Locale MenuBarFileOpenUnpacked}"
+                    Icon="{ext:Icon fa-solid fa-folder}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFolderTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadApplicationFolderTooltip}" />
                 <MenuItem
                     Command="{Binding LoadDlcFromFolder}"
-                    Header="{locale:Locale MenuBarFileLoadDlcFromFolder}"
-                    Icon="{icon:Icon fa-solid fa-download}"
+                    Header="{ext:Locale MenuBarFileLoadDlcFromFolder}"
+                    Icon="{ext:Icon fa-solid fa-download}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadDlcFromFolderTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadDlcFromFolderTooltip}" />
                 <MenuItem
                     Command="{Binding LoadTitleUpdatesFromFolder}"
-                    Header="{locale:Locale MenuBarFileLoadTitleUpdatesFromFolder}"
-                    Icon="{icon:Icon fa-solid fa-code-compare}"
+                    Header="{ext:Locale MenuBarFileLoadTitleUpdatesFromFolder}"
+                    Icon="{ext:Icon fa-solid fa-code-compare}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadTitleUpdatesFromFolderTooltip}" />
-                <MenuItem Header="{locale:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{icon:Icon mdi-launch}">
+                    ToolTip.Tip="{ext:Locale LoadTitleUpdatesFromFolderTooltip}" />
+                <MenuItem Header="{ext:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{ext:Icon mdi-launch}">
                     <MenuItem
                         Click="OpenMiiApplet"
                         Header="Mii Edit Applet"
-                        Icon="{icon:Icon fa-solid fa-person}"
-                        ToolTip.Tip="{locale:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
+                        Icon="{ext:Icon fa-solid fa-person}"
+                        ToolTip.Tip="{ext:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
                 </MenuItem>
                 <Separator />
                 <MenuItem
                     Command="{Binding OpenRyujinxFolder}"
-                    Header="{locale:Locale MenuBarFileOpenEmuFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxFolderTooltip}" />
+                    Header="{ext:Locale MenuBarFileOpenEmuFolder}"
+                    ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" />
                 <MenuItem
                     Command="{Binding OpenLogsFolder}"
-                    Header="{locale:Locale MenuBarFileOpenLogsFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxLogsTooltip}" />
+                    Header="{ext:Locale MenuBarFileOpenLogsFolder}"
+                    ToolTip.Tip="{ext:Locale OpenRyujinxLogsTooltip}" />
                 <Separator />
                 <MenuItem
                     Click="CloseWindow"
-                    Header="{locale:Locale MenuBarFileExit}"
-                    Icon="{icon:Icon fa-solid fa-xmark}"
-                    ToolTip.Tip="{locale:Locale ExitTooltip}" />
+                    Header="{ext:Locale MenuBarFileExit}"
+                    Icon="{ext:Icon fa-solid fa-xmark}"
+                    ToolTip.Tip="{ext:Locale ExitTooltip}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarOptions}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarOptions}">
                 <MenuItem
                     Command="{Binding ToggleFullscreen}"
-                    Header="{locale:Locale MenuBarOptionsToggleFullscreen}"
+                    Header="{ext:Locale MenuBarOptionsToggleFullscreen}"
                     Padding="0"
-                    Icon="{icon:Icon fa-solid fa-expand}"
+                    Icon="{ext:Icon fa-solid fa-expand}"
                     InputGesture="F11">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
@@ -101,7 +100,7 @@
                 <MenuItem
                     Padding="0"
                     Command="{Binding ToggleStartGamesInFullscreen}"
-                    Header="{locale:Locale MenuBarOptionsStartGamesInFullscreen}">
+                    Header="{ext:Locale MenuBarOptionsStartGamesInFullscreen}">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -125,7 +124,7 @@
                     Padding="0"
                     IsVisible="{Binding ShowConsoleVisible}"
                     Command="{Binding ToggleShowConsole}"
-                    Header="{locale:Locale MenuBarOptionsShowConsole}">
+                    Header="{ext:Locale MenuBarOptionsShowConsole}">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -149,8 +148,8 @@
                 <MenuItem
                     Name="ChangeLanguageMenuItem" 
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsChangeLanguage}"
-                    Icon="{icon:Icon fa-solid fa-language}">
+                    Header="{ext:Locale MenuBarOptionsChangeLanguage}"
+                    Icon="{ext:Icon fa-solid fa-language}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -166,14 +165,14 @@
                 <MenuItem 
                     Name="ToggleFileTypesMenuItem" 
                     Padding="-10,0,0,0"
-                    Header="{locale:Locale MenuBarShowFileTypes}" />
+                    Header="{ext:Locale MenuBarShowFileTypes}" />
                 <Separator />
                 <MenuItem
                     Click="OpenSettings"
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsSettings}"
-                    Icon="{icon:Icon fa-solid fa-gear}"
-                    ToolTip.Tip="{locale:Locale OpenSettingsTooltip}">
+                    Header="{ext:Locale MenuBarOptionsSettings}"
+                    Icon="{ext:Icon fa-solid fa-gear}"
+                    ToolTip.Tip="{ext:Locale OpenSettingsTooltip}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -189,10 +188,10 @@
                 <MenuItem
                     Command="{Binding ManageProfiles}"
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsManageUserProfiles}"
-                    Icon="{icon:Icon mdi-account}"
+                    Header="{ext:Locale MenuBarOptionsManageUserProfiles}"
+                    Icon="{ext:Icon mdi-account}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale OpenProfileManagerTooltip}">
+                    ToolTip.Tip="{ext:Locale OpenProfileManagerTooltip}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -209,87 +208,87 @@
             <MenuItem
                 Name="ActionsMenuItem"
                 VerticalAlignment="Center"
-                Header="{locale:Locale MenuBarActions}"
+                Header="{ext:Locale MenuBarActions}"
                 IsEnabled="{Binding IsGameRunning}">
                 <MenuItem
                     Click="PauseEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsPauseEmulation}"
-                    Icon="{icon:Icon fa-solid fa-pause}"
+                    Header="{ext:Locale MenuBarOptionsPauseEmulation}"
+                    Icon="{ext:Icon fa-solid fa-pause}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding !IsPaused}"
                     IsVisible="{Binding !IsPaused}" />
                 <MenuItem
                     Click="ResumeEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsResumeEmulation}"
-                    Icon="{icon:Icon fa-solid fa-play}"
+                    Header="{ext:Locale MenuBarOptionsResumeEmulation}"
+                    Icon="{ext:Icon fa-solid fa-play}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding IsPaused}"
                     IsVisible="{Binding IsPaused}" />
                 <MenuItem
                     Click="StopEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsStopEmulation}"
-                    Icon="{icon:Icon fa-solid fa-stop}"
+                    Header="{ext:Locale MenuBarOptionsStopEmulation}"
+                    Icon="{ext:Icon fa-solid fa-stop}"
                     InputGesture="Escape"
                     IsEnabled="{Binding IsGameRunning}"
-                    ToolTip.Tip="{locale:Locale StopEmulationTooltip}" />
-                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{locale:Locale MenuBarOptionsSimulateWakeUpMessage}" />
+                    ToolTip.Tip="{ext:Locale StopEmulationTooltip}" />
+                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" />
                 <Separator />
                 <MenuItem
                     Name="ScanAmiiboMenuItem"
                     AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
                     Click="OpenAmiiboWindow"
-                    Header="{locale:Locale MenuBarActionsScanAmiibo}"
-                    Icon="{icon:Icon mdi-cube-scan}"
+                    Header="{ext:Locale MenuBarActionsScanAmiibo}"
+                    Icon="{ext:Icon mdi-cube-scan}"
                     InputGesture="Ctrl + A"
                     IsEnabled="{Binding IsAmiiboRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
-                    Header="{locale:Locale MenuBarFileToolsTakeScreenshot}"
-                    Icon="{icon:Icon mdi-monitor-screenshot}"
+                    Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"
+                    Icon="{ext:Icon mdi-monitor-screenshot}"
                     InputGesture="{Binding ScreenshotKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
                     Command="{Binding HideUi}"
-                    Header="{locale:Locale MenuBarFileToolsHideUi}"
-                    Icon="{icon:Icon mdi-eye-off}"
+                    Header="{ext:Locale MenuBarFileToolsHideUi}"
+                    Icon="{ext:Icon mdi-eye-off}"
                     InputGesture="{Binding ShowUiKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
                     Click="OpenCheatManagerForCurrentApp"
-                    Header="{locale:Locale GameListContextMenuManageCheat}"
-                    Icon="{icon:Icon fa-solid fa-code}"
+                    Header="{ext:Locale GameListContextMenuManageCheat}"
+                    Icon="{ext:Icon fa-solid fa-code}"
                     IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarTools}">
-                <MenuItem Header="{locale:Locale MenuBarToolsInstallFirmware}" Icon="{icon:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
-                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{icon:Icon mdi-file-cog}" />
-                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{icon:Icon mdi-folder-cog}" />
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarTools}">
+                <MenuItem Header="{ext:Locale MenuBarToolsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
+                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
                 </MenuItem>
-                <MenuItem Header="{locale:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
-                    <MenuItem Header="{locale:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click"/>
-                    <MenuItem Header="{locale:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
+                <MenuItem Header="{ext:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
+                    <MenuItem Header="{ext:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click"/>
+                    <MenuItem Header="{ext:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
                 </MenuItem>
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarView}">
-                <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarViewWindow}">
-                    <MenuItem Header="{locale:Locale MenuBarViewWindow720}" Tag="720 1280" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{locale:Locale MenuBarViewWindow1080}" Tag="1080 1920" Click="ChangeWindowSize_Click" />
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
+                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow720}" Tag="720 1280" Click="ChangeWindowSize_Click" />
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow1080}" Tag="1080 1920" Click="ChangeWindowSize_Click" />
                 </MenuItem>
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarHelp}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
                     Click="CheckForUpdates"
-                    Header="{locale:Locale MenuBarHelpCheckForUpdates}"
-                    Icon="{icon:Icon mdi-update}"
-                    ToolTip.Tip="{locale:Locale CheckUpdatesTooltip}" />
+                    Header="{ext:Locale MenuBarHelpCheckForUpdates}"
+                    Icon="{ext:Icon mdi-update}"
+                    ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <Separator />
                 <MenuItem
                     Click="OpenAboutWindow"
-                    Header="{locale:Locale MenuBarHelpAbout}"
-                    Icon="{icon:Icon fa-solid fa-circle-info}"
-                    ToolTip.Tip="{locale:Locale OpenAboutTooltip}" />
+                    Header="{ext:Locale MenuBarHelpAbout}"
+                    Icon="{ext:Icon fa-solid fa-circle-info}"
+                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
             </MenuItem>
         </Menu>
     </DockPanel>

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -11,7 +11,6 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Modules;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -4,7 +4,7 @@
     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:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
@@ -49,7 +49,7 @@
                     Margin="0,0,5,0"
                     VerticalAlignment="Center"
                     IsVisible="{Binding EnableNonGameRunningControls}"
-                    Text="{locale:Locale StatusBarGamesLoaded}" />
+                    Text="{ext:Locale StatusBarGamesLoaded}" />
                 <ProgressBar
                     Name="LoadProgressBar"
                     Grid.Column="2"
@@ -115,7 +115,7 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Content="{Binding AspectRatioStatusText}"
                 Click="AspectRatioStatus_OnClick"
-                ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
+                ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
                 <SplitButton.Styles>
                     <Style Selector="Border#SeparatorBorder">
                         <Setter Property="Opacity" Value="0" />
@@ -124,27 +124,27 @@
                 <SplitButton.Flyout>
                     <MenuFlyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio4x3}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio4x3}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed4x3}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio16x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio16x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed16x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio16x10}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio16x10}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed16x10}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio21x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio21x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed21x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio32x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio32x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed32x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatioStretch}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatioStretch}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Stretched}"/>
                     </MenuFlyout>
@@ -195,7 +195,7 @@
                                 Minimum="0"
                                 SmallChange="0.01"
                                 TickFrequency="0.05"
-                                ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                                 Value="{Binding Volume}" />
                         </Grid>
                     </Flyout>
@@ -286,7 +286,7 @@
                 Margin="0"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
-                Text="{locale:Locale StatusBarSystemVersion}" />
+                Text="{ext:Locale StatusBarSystemVersion}" />
         </StackPanel>
     </Grid>
 </UserControl>

src/Ryujinx/UI/Views/Main/MainViewControls.axaml

@@ -6,7 +6,7 @@
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainViewControls"
@@ -49,8 +49,8 @@
         <TextBlock
             Margin="10,0"
             VerticalAlignment="Center"
-            Text="{locale:Locale IconSize}"
-            ToolTip.Tip="{locale:Locale IconSizeTooltip}" />
+            Text="{ext:Locale IconSize}"
+            ToolTip.Tip="{ext:Locale IconSizeTooltip}" />
         <controls:SliderScroll
             Width="150"
             Height="35"
@@ -61,14 +61,14 @@
             Maximum="4"
             Minimum="1"
             TickFrequency="1"
-            ToolTip.Tip="{locale:Locale IconSizeTooltip}"
+            ToolTip.Tip="{ext:Locale IconSizeTooltip}"
             Value="{Binding GridSizeScale}" />
         <CheckBox
             Margin="0"
             VerticalAlignment="Center"
             IsChecked="{Binding ShowNames, Mode=TwoWay}"
             IsVisible="{Binding IsGrid}">
-            <TextBlock Margin="5,3,0,0" Text="{locale:Locale CommonShowNames}" />
+            <TextBlock Margin="5,3,0,0" Text="{ext:Locale CommonShowNames}" />
         </CheckBox>
         <TextBox
             Name="SearchBox"
@@ -79,7 +79,7 @@
             DockPanel.Dock="Right"
             KeyUp="SearchBox_OnKeyUp"
             Text="{Binding SearchText}"
-            Watermark="{locale:Locale MenuSearch}" />
+            Watermark="{ext:Locale MenuSearch}" />
         <DropDownButton
             Width="150"
             HorizontalAlignment="Right"
@@ -95,49 +95,49 @@
                         <StackPanel>
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale CommonFavorite}"
+                                Content="{ext:Locale CommonFavorite}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}"
                                 Tag="Favorite" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderApplication}"
+                                Content="{ext:Locale GameListHeaderApplication}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByTitle, Mode=OneTime}"
                                 Tag="Title" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderDeveloper}"
+                                Content="{ext:Locale GameListHeaderDeveloper}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByDeveloper, Mode=OneTime}"
                                 Tag="Developer" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderTimePlayed}"
+                                Content="{ext:Locale GameListHeaderTimePlayed}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByTimePlayed, Mode=OneTime}"
                                 Tag="TotalTimePlayed" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderLastPlayed}"
+                                Content="{ext:Locale GameListHeaderLastPlayed}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}"
                                 Tag="LastPlayed" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderFileExtension}"
+                                Content="{ext:Locale GameListHeaderFileExtension}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByType, Mode=OneTime}"
                                 Tag="FileType" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderFileSize}"
+                                Content="{ext:Locale GameListHeaderFileSize}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedBySize, Mode=OneTime}"
                                 Tag="FileSize" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderPath}"
+                                Content="{ext:Locale GameListHeaderPath}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByPath, Mode=OneTime}"
                                 Tag="Path" />
@@ -153,13 +153,13 @@
                         </Border>
                         <RadioButton
                             Checked="Order_Checked"
-                            Content="{locale:Locale OrderAscending}"
+                            Content="{ext:Locale OrderAscending}"
                             GroupName="Order"
                             IsChecked="{Binding IsAscending, Mode=OneTime}"
                             Tag="Ascending" />
                         <RadioButton
                             Checked="Order_Checked"
-                            Content="{locale:Locale OrderDescending}"
+                            Content="{ext:Locale OrderDescending}"
                             GroupName="Order"
                             IsChecked="{Binding !IsAscending, Mode=OneTime}"
                             Tag="Descending" />
@@ -172,6 +172,6 @@
             HorizontalAlignment="Right"
             VerticalAlignment="Center"
             DockPanel.Dock="Right"
-            Text="{locale:Locale CommonSort}" />
+            Text="{ext:Locale CommonSort}" />
     </DockPanel>
 </UserControl>

src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml

@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -25,36 +25,36 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabAudio}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabAudio}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioBackend}"
-                               ToolTip.Tip="{locale:Locale AudioBackendTooltip}"
+                               Text="{ext:Locale SettingsTabSystemAudioBackend}"
+                               ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
                                Width="250" />
                     <ComboBox SelectedIndex="{Binding AudioBackend}"
                               Width="350"
                               HorizontalContentAlignment="Left">
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
                         </ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioVolume}"
-                               ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                               Text="{ext:Locale SettingsTabSystemAudioVolume}"
+                               ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                                Width="250" />
                     <ui:NumberBox Value="{Binding Volume}"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                            ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                             Width="350"
                             SmallChange="1"
                             LargeChange="10"
@@ -66,7 +66,7 @@
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <controls:SliderScroll Value="{Binding Volume}"
                             Margin="250,0,0,0"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                            ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                             Minimum="0"
                             Maximum="100"
                             SmallChange="1"

src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -23,56 +23,56 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuCache}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabCpuCache}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <CheckBox IsChecked="{Binding EnablePptc}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnablePptc}"
-                                   ToolTip.Tip="{locale:Locale PptcToggleTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabSystemEnablePptc}"
+                                   ToolTip.Tip="{ext:Locale PptcToggleTooltip}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableLowPowerPptc}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableLowPowerPptc}"
-                                   ToolTip.Tip="{locale:Locale LowPowerPptcToggleTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabSystemEnableLowPowerPptc}"
+                                   ToolTip.Tip="{ext:Locale LowPowerPptcToggleTooltip}" />
                     </CheckBox>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuMemory}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabCpuMemory}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemMemoryManagerMode}"
-                                   ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                   Text="{ext:Locale SettingsTabSystemMemoryManagerMode}"
+                                   ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding MemoryMode}"
-                                  ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                  ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
                                   HorizontalContentAlignment="Left"
                                   Width="350">
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
+                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
+                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
                             </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
+                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}">
+                                <TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
                             </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
+                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
+                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <CheckBox IsChecked="{Binding UseHypervisor}"
                               IsVisible="{Binding IsHypervisorAvailable}"
-                              ToolTip.Tip="{locale:Locale UseHypervisorTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemUseHypervisor}"
-                                   ToolTip.Tip="{locale:Locale UseHypervisorTooltip}" />
+                              ToolTip.Tip="{ext:Locale UseHypervisorTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabSystemUseHypervisor}"
+                                   ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
                     </CheckBox>
                 </StackPanel>
             </StackPanel>

src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml

@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     Design.Width="1000"
     mc:Ignorable="d"
@@ -26,16 +26,16 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsAPI}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsAPI}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsBackend}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
+                                Text="{ext:Locale SettingsTabGraphicsBackend}"
                                 Width="250" />
                         <ComboBox Width="350"
                                 HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
                                 SelectedIndex="{Binding GraphicsBackendIndex}">
                             <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
                                 <TextBlock Text="Vulkan" />
@@ -47,66 +47,66 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
                         <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsPreferredGpu}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsPreferredGpuTooltip}"
+                                Text="{ext:Locale SettingsTabGraphicsPreferredGpu}"
                                 Width="250" />
                         <ComboBox Width="350"
                                 HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsPreferredGpuTooltip}"
                                 SelectedIndex="{Binding PreferredGpuIndex}"
                                 ItemsSource="{Binding AvailableGpus}"/>
                     </StackPanel>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsFeatures}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
                     <StackPanel Orientation="Vertical">
                         <CheckBox IsChecked="{Binding EnableShaderCache}"
-                            ToolTip.Tip="{locale:Locale ShaderCacheToggleTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabGraphicsEnableShaderCache}" />
+                            ToolTip.Tip="{ext:Locale ShaderCacheToggleTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabGraphicsEnableShaderCache}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableTextureRecompression}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableTextureRecompressionTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableTextureRecompression}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableTextureRecompressionTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableTextureRecompression}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableMacroHLE}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableMacroHLETooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableMacroHLE}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableMacroHLETooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableMacroHLE}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableColorSpacePassthrough}"
                                   IsVisible="{Binding ColorSpacePassthroughAvailable}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableColorSpacePassthroughTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableColorSpacePassthrough}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableColorSpacePassthroughTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableColorSpacePassthrough}" />
                         </CheckBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsResolutionScale}"
+                                   ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsResolutionScale}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding ResolutionScale}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
+                                  ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
                             </ComboBoxItem>
                         </ComboBox>
                         <ui:NumberBox
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale ResolutionScaleEntryTooltip}"
+                            ToolTip.Tip="{ext:Locale ResolutionScaleEntryTooltip}"
                             MinWidth="150"
                             SmallChange="0.1"
                             LargeChange="1"
@@ -123,30 +123,30 @@
                         Spacing="10">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
-                                       Text="{locale:Locale GraphicsAALabel}"
+                                       ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
+                                       Text="{ext:Locale GraphicsAALabel}"
                                        Width="250" />
                             <ComboBox Width="350"
                                       HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
+                                      ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
                                       SelectedIndex="{Binding AntiAliasingEffect}">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="FXAA" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaLow}" />
+                                    <TextBlock Text="{ext:Locale SmaaLow}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaMedium}" />
+                                    <TextBlock Text="{ext:Locale SmaaMedium}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaHigh}" />
+                                    <TextBlock Text="{ext:Locale SmaaHigh}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaUltra}" />
+                                    <TextBlock Text="{ext:Locale SmaaUltra}" />
                                 </ComboBoxItem>
                             </ComboBox>
                         </StackPanel>
@@ -157,28 +157,28 @@
                         Spacing="10">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
-                                       Text="{locale:Locale GraphicsScalingFilterLabel}"
+                                       ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
+                                       Text="{ext:Locale GraphicsScalingFilterLabel}"
                                        Width="250" />
                             <ComboBox Width="350"
                                       HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
+                                      ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
                                       SelectedIndex="{Binding ScalingFilter}">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterBilinear}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterBilinear}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterNearest}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterNearest}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterFsr}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterFsr}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterArea}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterArea}" />
                                 </ComboBoxItem>
                             </ComboBox>
                             <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
-                                    ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
+                                    ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}"
                                     MinWidth="150"
                                     Margin="10,-3,0,0"
                                     Height="32"
@@ -199,58 +199,58 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering}"
+                                   ToolTip.Tip="{ext:Locale AnisotropyTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding MaxAnisotropy}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
+                                  ToolTip.Tip="{ext:Locale AnisotropyTooltip}">
                             <ComboBoxItem>
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
+                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAspectRatio}"
+                                   ToolTip.Tip="{ext:Locale AspectRatioTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsAspectRatio}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding AspectRatio}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
+                                  ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
@@ -262,27 +262,27 @@
                     Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
+                                   ToolTip.Tip="{ext:Locale GraphicsBackendThreadingTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsBackendMultithreading}"
                                    Width="250" />
                         <ComboBox Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
+                                  ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
                                   SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonAuto}" />
+                                <TextBlock Text="{ext:Locale CommonAuto}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOff}" />
+                                <TextBlock Text="{ext:Locale CommonOff}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOn}" />
+                                <TextBlock Text="{ext:Locale CommonOn}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsDeveloperOptions}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsDeveloperOptions}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
@@ -290,12 +290,12 @@
                     Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsShaderDumpPath}"
+                                   ToolTip.Tip="{ext:Locale ShaderDumpPathTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsShaderDumpPath}"
                                    Width="250" />
                         <TextBox Text="{Binding ShaderDumpPath}"
                                  Width="350"
-                                 ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}" />
+                                 ToolTip.Tip="{ext:Locale ShaderDumpPathTooltip}" />
                     </StackPanel>
                 </StackPanel>
             </StackPanel>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     mc:Ignorable="d"
@@ -48,57 +48,57 @@
                 Spacing="10">
                 <TextBlock
                     Classes="h1"
-                    Text="{locale:Locale SettingsTabHotkeysHotkeys}" />
+                    Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysToggleVsyncHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVsyncHotkey}" />
                     <ToggleButton Name="ToggleVsync">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleVsync, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
                     <ToggleButton Name="Screenshot">
                         <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
                     <ToggleButton Name="ShowUI">
                         <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
                     <ToggleButton Name="Pause">
                         <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
                     <ToggleButton Name="ToggleMute">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
                     <ToggleButton Name="ResScaleUp">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
                     <ToggleButton Name="ResScaleDown">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
                     <ToggleButton Name="VolumeUp">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
                     <ToggleButton Name="VolumeDown">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={StaticResource Key}}" />
                     </ToggleButton>