Feature: Add scripting interface

2026-02-12 17:34:33 +00:00 · 2024-06-24 17:16:13 +10:00
1366 changed files with 366024 additions and 277151 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,94 @@
+name: Bug report
+description: Report a bug in DuckStation
+body:
+
+- type: markdown
+  attributes:
+    value: |
+      **Please read before creating a new bug report:**
+      1. Make sure there is not already an issue for this bug by [searching in **both** open and closed issues](https://github.com/stenzek/duckstation/issues?q=is%3Aissue+sort%3Aupdated-desc+).
+      2. All enhancements **must** be off. To quickly disable all enhancements with affecting your normal configuration, you can check **Disable All Enhancements** in Advanced Options.
+      3. All advanced options **must** be at their default values.
+      4. No cheats may be active. If you were using cheats, they should be disabled, and the game must be rebooted before reporting the bug.
+      5. Do not share save state files. (Sharing memory card files is OK.)
+      6. Verify your BIOS and game dumps, as we can not assist with issues resulting from bad dumps.
+      7. If playing PAL region software, please check whether or not the game has LibCrypt protection. If it does, make sure you have a [correct SBI file](https://github.com/stenzek/duckstation#libcrypt-protection-and-sbi-files).
+      8. Please post your bug report in English, as this is the only language spoken by the developers. The [Discord server](https://discord.gg/Buktv3t) has many helpful people if you need help translating.
+      9. Issues about the libretro core will be deleted (you will be blocked from the repository if you create such an issue). That core is not DuckStation, it is a broken fork, and has nothing to do with us.
+
+- type: input
+  attributes:
+    label: Game details
+    description: |
+      Specify the game's serial code, full name and region (USA, Europe, Japan).
+    placeholder: SLUS-00404 Ace Combat 2 (USA)
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Description of the issue/bug
+    description: |
+      Describe what you are seeing and/or hearing during gameplay. What doesn't work, and how do you expect it to work instead?
+      You can include images or videos with drag and drop, and format code blocks or logs with <code>```</code> tags.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: |
+      Try to provide as much detail as possible to reproduce the issue.
+      Having reproducible issues is a *prerequisite* for contributors to be able to solve them.
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Software and hardware information
+    description: |
+      For desktops and laptops, specify your OS version, CPU and graphics card information (model and driver version).
+      For mobile devices, specify your OS version and device model name.
+    placeholder: Windows 10, Intel Core i7-7500U, Intel HD Graphics 620 (27.20.100.9616)
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: DuckStation version
+    description: |
+      Specify your DuckStation version and how you installed it (GitHub Releases, GitHub Actions, compiled from source, …).
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: DuckStation rendering backend
+    description: |
+      Specify the DuckStation rendering backend you were using when reporting this issue.
+      If you can reproduce this issue using more than one rendering backend, mention it in the **Description of the issue/bug** section above.
+      When reporting a graphics-related issue, please test all the rendering backends you can before submitting the issue.
+    options:
+      - Software
+      - Direct3D 11
+      - Direct3D 12
+      - OpenGL
+      - Vulkan
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: DuckStation controller backend, drivers and wrappers
+    description: |
+      Which controller backend are you using in DuckStation's General Settings?
+      Have you installed any drivers or wrappers on your system, or do you have any programs like Steam open?
+      If so, specify which drivers/wrappers you are using.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context
+    description: |
+      Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Game compatibility list
+    url: https://docs.google.com/spreadsheets/d/1H66MxViRjjE5f8hOl5RQmF5woS1murio2dsLn14kEqo/edit
+    about: Please refer to the game compatibility list before opening an issue.
+
+  - name: Discord server
+  - url: https://discord.gg/Buktv3t
+  - about: Please ask support questions on the Discord server, not here.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,43 @@
+name: Feature request
+description: Request a feature to be added or improved in DuckStation
+body:
+
+- type: markdown
+  attributes:
+    value: |
+      **Please read before creating a new feature request:**
+      1. Make sure there is not already an issue for this feature request by [searching in **both** open and closed issues](https://github.com/stenzek/duckstation/issues?q=is%3Aissue+sort%3Aupdated-desc+).
+      2. Please open **one issue per requested feature**. Do not cram several unrelated feature requests in a single issue, as this makes it harder for contributors to track what's being worked on.
+      3. Please post your feature request in English, as this is the only language spoken by the developers. The [Discord server](https://discord.gg/Buktv3t) has many helpful people if you need help translating.
+      4. Issues about the libretro core will be deleted (you will be blocked from the repository if you create such an issue). That core is not DuckStation, it is a broken fork, and has nothing to do with us.
+
+- type: textarea
+  attributes:
+    label: Problem statement
+    description: |
+      Is your feature request related to a problem? Please describe.
+    placeholder: Example - "I'm always frustrated when […]"
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Proposed solution
+    description: |
+      A clear and concise description of what you want to happen.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Alternatives considered
+    description: |
+      Describe alternatives you've considered.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context
+    description: |
+      Add any other context about the problem or proposed feature here.
--- a/.github/workflows/flathub-publish.yml
+++ b/.github/workflows/flathub-publish.yml
@@ -1,22 +0,0 @@
-name: Flathub Publish
-
-on:
-  workflow_dispatch:
-    inputs:
-      flathub_branch:
-        description: "Flathub branch to push to"
-        required: true
-        default: "stable"
-        type: "choice"
-        options:
-          - "stable"
-          - "beta"
-
-jobs:
-  linux-flatpak:
-    name: Build Flatpak
-    uses: "./.github/workflows/linux-flatpak-build.yml"
-    with:
-      flathub_publish: true
-      flathub_branch: ${{ inputs.flathub_branch }}
-    secrets: inherit
--- a/.github/workflows/gamedb-lint.yml
+++ b/.github/workflows/gamedb-lint.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-22.04
    timeout-minutes: 120
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4.1.1
      with:
        fetch-depth: 0

--- a/.github/workflows/linux-appimage-build.yml
+++ b/.github/workflows/linux-appimage-build.yml
@@ -1,147 +0,0 @@
-name: 🐧 Linux AppImage
-
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  linux-x64-appimage-build:
-    name: "x64"
-    runs-on: ubuntu-22.04
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Install Packages
-      run: scripts/packaging/appimage/install-packages.sh
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: ~/deps
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh') }}
-
-    - name: Build Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      run: scripts/deps/build-dependencies-linux.sh "$HOME/deps"
-
-    - name: Build FFmpeg
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      run: scripts/deps/build-ffmpeg-linux.sh "$HOME/deps"
-
-    - name: Initialize Build Tag
-      run: |
-        echo '#pragma once' > src/scmversion/tag.h
-
-    - name: Set Build Tag Asset
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_ASSET "DuckStation-x64.AppImage"' >> src/scmversion/tag.h
-        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      run: |
-        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release
-      if: github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
-
-    - name: Download Patch Archives
-      shell: bash
-      run: |
-        cd data/resources
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile Build
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-        cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
-        cmake --build . --parallel
-        cd ..
-        scripts/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64
-
-    - name: Upload Qt AppImage
-      uses: actions/upload-artifact@v4
-      with:
-        name: "linux-x64-appimage"
-        path: "DuckStation-x64.AppImage"
-
-
-  linux-x64-sse2-appimage-build:
-    name: "x64 SSE2"
-    runs-on: ubuntu-22.04
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Install Packages
-      run: scripts/packaging/appimage/install-packages.sh
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: ~/deps
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh') }}
-
-    - name: Build Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      run: scripts/deps/build-dependencies-linux.sh "$HOME/deps"
-
-    - name: Build FFmpeg
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      run: scripts/deps/build-ffmpeg-linux.sh "$HOME/deps"
-
-    - name: Initialize Build Tag
-      run: |
-        echo '#pragma once' > src/scmversion/tag.h
-
-    - name: Set Build Tag Asset
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_ASSET "DuckStation-x64-SSE2.AppImage"' >> src/scmversion/tag.h
-        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      run: |
-        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release
-      if: github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
-
-    - name: Download Patch Archives
-      shell: bash
-      run: |
-        cd data/resources
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile Build
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-        cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDISABLE_SSE4=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
-        cmake --build . --parallel
-        cd ..
-        scripts/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64-SSE2
-
-    - name: Upload Qt AppImage
-      uses: actions/upload-artifact@v4
-      with:
-        name: "linux-x64-sse2-appimage"
-        path: "DuckStation-x64-SSE2.AppImage"
--- a/.github/workflows/linux-flatpak-build.yml
+++ b/.github/workflows/linux-flatpak-build.yml
@@ -1,113 +0,0 @@
-name: 📦 Linux Flatpak
-
-on:
-  workflow_call:
-    inputs:
-      flathub_publish:
-        required: false
-        type: boolean
-        default: false
-      flathub_branch:
-        required: false
-        type: string
-        default: "stable"
-  workflow_dispatch:
-
-jobs:
-  linux-flatpak-build:
-    name: "x64"
-    runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
-      options: --privileged
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
-
-    # Work around container ownership issue
-    - name: Set Safe Directory
-      shell: bash
-      run: git config --global --add safe.directory "*"
-
-    - name: Initialize Build Tag
-      run: |
-        echo '#pragma once' > src/scmversion/tag.h
-
-    - name: Set Build Tags
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      run: |
-        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release
-      if: github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
-
-    - name: Download Patch Archives
-      shell: bash
-      run: |
-        cd data/resources
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Generate AppStream XML
-      run: |
-        scripts/packaging/generate-metainfo.sh scripts/packaging/flatpak
-        cat scripts/packaging/flatpak/org.duckstation.DuckStation.metainfo.xml
-
-    - name: Validate AppStream XML
-      run: flatpak-builder-lint appstream scripts/packaging/flatpak/org.duckstation.DuckStation.metainfo.xml
-
-    - name: Validate Manifest
-      run: flatpak-builder-lint manifest scripts/packaging/flatpak/org.duckstation.DuckStation.yaml
-
-    - name: Build Flatpak
-      uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
-      with:
-        bundle: duckstation-x64.flatpak
-        upload-artifact: false
-        manifest-path: scripts/packaging/flatpak/org.duckstation.DuckStation.yaml
-        arch: x86_64
-        build-bundle: true
-        verbose: true
-        mirror-screenshots-url: https://dl.flathub.org/media
-        branch: stable
-        cache: true
-        restore-cache: true
-        cache-key: flatpak-x64-${{ hashFiles('scripts/packaging/flatpak/**/*.yaml') }}
-
-    - name: Validate Build
-      run: |
-        flatpak-builder-lint repo repo
-
-    - name: Push To Flathub Beta
-      if: inputs.flathub_publish && inputs.flathub_branch == 'beta'
-      uses: flathub-infra/flatpak-github-actions/flat-manager@b6c92176b7f578aedd80cac74cd8f0336f618e89
-      with:
-        flat-manager-url: https://hub.flathub.org/
-        repository: stable
-        token: ${{ secrets.FLATHUB_BETA_TOKEN }}
-        build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-    - name: Push To Flathub Stable
-      if: inputs.flathub_publish && inputs.flathub_branch == 'stable'
-      uses: flathub-infra/flatpak-github-actions/flat-manager@b6c92176b7f578aedd80cac74cd8f0336f618e89
-      with:
-        flat-manager-url: https://hub.flathub.org/
-        repository: stable
-        token: ${{ secrets.FLATHUB_STABLE_TOKEN }}
-        build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-    - name: Upload Flatpak
-      uses: actions/upload-artifact@v4
-      with:
-        name: "linux-flatpak"
-        path: "duckstation-x64.flatpak"
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -1,79 +0,0 @@
-name: 🍎 MacOS
-
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  macos-build:
-    name: "Universal"
-    runs-on: macos-14
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Use Xcode 16.1
-      run: sudo xcode-select -s /Applications/Xcode_16.1.app
-
-    - name: Install packages
-      shell: bash
-      run: |
-        brew install ninja
-
-    - name: Cache Dependencies
-      id: cache-deps-mac
-      uses: actions/cache@v4
-      with:
-        path: ~/deps
-        key: deps-mac ${{ hashFiles('scripts/deps/build-dependencies-mac.sh') }}
-
-    - name: Build Dependencies
-      if: steps.cache-deps-mac.outputs.cache-hit != 'true'
-      run: scripts/deps/build-dependencies-mac.sh "$HOME/deps"
-
-    - name: Initialize Build Tag
-      run: |
-        echo '#pragma once' > src/scmversion/tag.h
-
-    - name: Set Build Tags
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_ASSET "duckstation-mac-release.zip"' >> src/scmversion/tag.h
-        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      run: |
-        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release
-      if: github.ref == 'refs/heads/dev'
-      run: |
-        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
-
-    - name: Download Patch Archives
-      shell: bash
-      run: |
-        cd data/resources
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        curl -LO "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile and Zip .app
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-        export MACOSX_DEPLOYMENT_TARGET=11.0
-        cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENGL=OFF -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja ..
-        cmake --build . --parallel
-        mv bin/DuckStation.app .
-        codesign -s - --deep -f -v DuckStation.app
-        zip -r duckstation-mac-release.zip DuckStation.app/
-
-    - name: Upload MacOS .app
-      uses: actions/upload-artifact@v4
-      with:
-        name: "macos"
-        path: "build/duckstation-mac-release.zip"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,88 +0,0 @@
-name: Automated Builds
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'appveyor.yml'
-      - 'scripts/*'
-      - '.github/ISSUE_TEMPLATE/*'
-  push:
-    branches:
-      - master
-      - dev
-    paths-ignore:
-      - '**.md'
-      - 'appveyor.yml'
-      - 'scripts/*'
-      - '.github/ISSUE_TEMPLATE/*'
-
-jobs:
-  windows:
-    name: 💻 Windows
-    uses: "./.github/workflows/windows-build.yml"
-  linux-appimage:
-    name: 🐧 Linux AppImage
-    uses: "./.github/workflows/linux-appimage-build.yml"
-  linux-flatpak:
-    name: 📦 Linux Flatpak
-    uses: "./.github/workflows/linux-flatpak-build.yml"
-  macos:
-    name: 🍎 MacOS
-    uses: "./.github/workflows/macos-build.yml"
-
-  create-release:
-    name: 📤 Create Release
-    needs: [windows, linux-appimage, linux-flatpak, macos]
-    runs-on: ubuntu-22.04
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: ./artifacts/
-
-      - name: Display Downloaded Artifacts
-        run: find ./artifacts/
-
-      - name: Create Preview Release
-        if: github.ref == 'refs/heads/master'
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "preview"
-          prerelease: true
-          title: "Latest Preview Build"
-          files: |
-            ./artifacts/windows-x64/duckstation-windows-x64-release.zip
-            ./artifacts/windows-x64/duckstation-windows-x64-release-symbols.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release-symbols.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
-            ./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
-            ./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
-            ./artifacts/linux-flatpak/duckstation-x64.flatpak
-            ./artifacts/macos/duckstation-mac-release.zip
-
-      - name: Create Rolling Release
-        if: github.ref == 'refs/heads/dev'
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: false
-          title: "Latest Rolling Release"
-          files: |
-            ./artifacts/windows-x64/duckstation-windows-x64-release.zip
-            ./artifacts/windows-x64/duckstation-windows-x64-release-symbols.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release-symbols.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
-            ./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
-            ./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
-            ./artifacts/linux-flatpak/duckstation-x64.flatpak
-            ./artifacts/macos/duckstation-mac-release.zip
-
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -0,0 +1,440 @@
+name: Create rolling release
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - 'appveyor.yml'
+      - 'scripts/*'
+      - '.github/ISSUE_TEMPLATE/*'
+  push:
+    branches:
+      - master
+      - dev
+    paths-ignore:
+      - '**.md'
+      - 'appveyor.yml'
+      - 'scripts/*'
+      - '.github/ISSUE_TEMPLATE/*'
+  workflow_dispatch:
+
+jobs:
+  windows-build:
+    runs-on: windows-2022
+    timeout-minutes: 120
+    steps:
+    - uses: actions/checkout@v4.1.6
+      with:
+        fetch-depth: 0
+
+    - name: Cache Dependencies
+      id: cache-deps
+      uses: actions/cache@v4.0.2
+      with:
+        path: |
+          dep/msvc/deps-arm64
+          dep/msvc/deps-x64
+        key: deps ${{ hashFiles('scripts/build-dependencies-windows-arm64.bat', 'scripts/build-dependencies-windows-x64.bat') }}
+
+    - name: Build X64 Dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      env:
+        DEBUG: 0
+      run: scripts/build-dependencies-windows-x64.bat
+
+    - name: Build ARM64 Dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      env:
+        DEBUG: 0
+      run: scripts/build-dependencies-windows-arm64.bat
+
+    - name: Tag as preview build
+      if: github.ref == 'refs/heads/master'
+      shell: cmd
+      run: |
+        echo #pragma once > src/scmversion/tag.h
+        echo #define SCM_RELEASE_ASSET "duckstation-windows-x64-release.zip" >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAG "preview" >> src/scmversion/tag.h
+
+
+    - name: Tag as dev build
+      if: github.ref == 'refs/heads/dev'
+      shell: cmd
+      run: |
+        echo #pragma once > src/scmversion/tag.h
+        echo #define SCM_RELEASE_ASSET "duckstation-windows-x64-release.zip" >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAG "latest" >> src/scmversion/tag.h
+
+    - name: Update RC version fields
+      shell: cmd
+      run: |
+        cd src\scmversion
+        call update_rc_version.bat
+        cd ..\..
+        git update-index --assume-unchanged src/duckstation-qt/duckstation-qt.rc
+
+    - name: Compile x64 release build
+      shell: cmd
+      run: |
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+        msbuild duckstation.sln -t:Build -p:Platform=x64;Configuration=ReleaseLTCG-Clang
+
+    - name: Create x64 symbols archive
+      shell: cmd
+      run: |
+        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release-symbols.zip ./bin/x64/*.pdb
+
+    - name: Remove extra bloat before archiving
+      shell: cmd
+      run: |
+        del /Q bin\x64\*.pdb bin\x64\*.exp bin\x64\*.lib bin\x64\*.iobj bin\x64\*.ipdb bin\x64\common-tests*
+        rename bin\x64\updater-x64-ReleaseLTCG.exe updater.exe
+
+    - name: Create x64 release archive
+      shell: cmd
+      run: |
+        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release.zip ./bin/x64/*
+
+    - name: Upload x64 release artifact
+      uses: actions/upload-artifact@v4.3.3
+      with:
+        name: "windows"
+        path: "duckstation-windows-x64-release*.zip"
+
+
+  windows-arm64-build:
+    runs-on: windows-2022
+    timeout-minutes: 120
+    steps:
+    - uses: actions/checkout@v4.1.6
+      with:
+        fetch-depth: 0
+        submodules: true
+
+    - name: Cache Dependencies
+      id: cache-deps
+      uses: actions/cache@v4.0.2
+      with:
+        path: |
+          dep/msvc/deps-arm64
+          dep/msvc/deps-x64
+        key: deps ${{ hashFiles('scripts/build-dependencies-windows-arm64.bat', 'scripts/build-dependencies-windows-x64.bat') }}
+
+    - name: Build X64 Dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      env:
+        DEBUG: 0
+      run: scripts/build-dependencies-windows-x64.bat
+
+    - name: Build ARM64 Dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      env:
+        DEBUG: 0
+      run: scripts/build-dependencies-windows-arm64.bat
+
+    - name: Tag as preview build
+      if: github.ref == 'refs/heads/master'
+      shell: cmd
+      run: |
+        echo #pragma once > src/scmversion/tag.h
+        echo #define SCM_RELEASE_ASSET "duckstation-windows-arm64-release.zip" >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAG "preview" >> src/scmversion/tag.h
+
+    - name: Tag as dev build
+      if: github.ref == 'refs/heads/dev'
+      shell: cmd
+      run: |
+        echo #pragma once > src/scmversion/tag.h
+        echo #define SCM_RELEASE_ASSET "duckstation-windows-arm64-release.zip" >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
+        echo #define SCM_RELEASE_TAG "latest" >> src/scmversion/tag.h
+
+    - name: Update RC version fields
+      shell: cmd
+      run: |
+        cd src\scmversion
+        call update_rc_version.bat
+        cd ..\..
+        git update-index --assume-unchanged src/duckstation-qt/duckstation-qt.rc
+
+    - name: Compile arm64 release build
+      shell: cmd
+      run: |
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64_arm64
+        msbuild duckstation.sln -t:Build -p:Platform=ARM64;Configuration=ReleaseLTCG-Clang
+
+    - name: Create arm64 symbols archive
+      shell: cmd
+      run: |
+        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release-symbols.zip ./bin/ARM64/*.pdb
+
+    - name: Remove extra bloat before archiving
+      shell: cmd
+      run: |
+        del /Q bin\ARM64\*.pdb bin\ARM64\*.exp bin\ARM64\*.lib bin\ARM64\*.iobj bin\ARM64\*.ipdb bin\ARM64\common-tests*
+        rename bin\ARM64\updater-ARM64-ReleaseLTCG.exe updater.exe
+
+    - name: Create arm64 release archive
+      shell: cmd
+      run: |
+        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release.zip ./bin/ARM64/*
+
+    - name: Upload arm64 release artifact
+      uses: actions/upload-artifact@v4.3.3
+      with:
+        name: "windows-arm64"
+        path: "duckstation-windows-arm64-release*.zip"
+
+
+  linux-build:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 120
+    steps:
+    # Work around https://github.com/actions/runner-images/issues/8659
+    - name: Remove GCC 13 from runner image
+      shell: bash
+      run: |
+        sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
+        sudo apt-get update
+        sudo apt-get install -y --allow-downgrades 'libc6=2.35-0ubuntu*' 'libc6-dev=2.35-0ubuntu*' libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
+
+    - uses: actions/checkout@v4.1.6
+      with:
+        fetch-depth: 0
+
+    - name: Install packages
+      shell: bash
+      run: |
+        # Workaround for https://github.com/actions/runner-images/issues/675
+        scripts/retry.sh wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo scripts/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
+
+        sudo scripts/retry.sh apt-get update &&
+        sudo scripts/retry.sh apt-get -y install \
+          build-essential clang-17 cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev \
+          libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev \
+          libssl-dev libudev-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev \
+          libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \
+          libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev lld-17 \
+          llvm-17 ninja-build patchelf pkg-config zlib1g-dev
+
+    - name: Cache Dependencies
+      id: cache-deps
+      uses: actions/cache@v4.0.2
+      with:
+        path: ~/deps
+        key: deps ${{ hashFiles('scripts/build-dependencies-linux.sh') }}
+
+    - name: Build Dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      run: scripts/build-dependencies-linux.sh "$HOME/deps"
+
+    - name: Tag as preview build
+      if: github.ref == 'refs/heads/master'
+      run: |
+        echo '#pragma once' > src/scmversion/tag.h
+        echo '#define SCM_RELEASE_ASSET "DuckStation-x64.AppImage"' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
+
+    - name: Tag as dev build
+      if: github.ref == 'refs/heads/dev'
+      run: |
+        echo '#pragma once' > src/scmversion/tag.h
+        echo '#define SCM_RELEASE_ASSET "DuckStation-x64.AppImage"' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
+
+
+    - name: Compile build
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+        cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
+        cmake --build . --parallel
+        cd ..
+        scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64
+
+    - name: Upload Qt AppImage
+      uses: actions/upload-artifact@v4.3.3
+      with:
+        name: "linux-x64-appimage-qt"
+        path: "DuckStation-x64.AppImage"
+
+
+  linux-flatpak-build:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
+      options: --privileged
+    timeout-minutes: 120
+    steps:
+    - uses: actions/checkout@v4.1.6
+      with:
+        fetch-depth: 0
+        set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+    # Work around container ownership issue
+    - name: Set Safe Directory
+      shell: bash
+      run: git config --global --add safe.directory "*"
+
+    - name: Generate AppStream XML
+      run: |
+        scripts/generate-metainfo.sh scripts/flatpak
+        cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
+
+    - name: Validate AppStream XML
+      run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
+
+    - name: Validate manifest
+      run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json
+
+    - name: Build Flatpak
+      uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+      with:
+        bundle: duckstation-x64.flatpak
+        upload-artifact: false
+        manifest-path: scripts/flatpak/org.duckstation.DuckStation.json
+        arch: x86_64
+        build-bundle: true
+        verbose: true
+        mirror-screenshots-url: https://dl.flathub.org/media
+        branch: stable
+        cache: true
+        restore-cache: true
+        cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }}
+
+    - name: Push to Flathub stable
+      if: github.ref == 'refs/heads/dev'
+      uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+      with:
+        flat-manager-url: https://hub.flathub.org/
+        repository: stable
+        token: ${{ secrets.FLATHUB_STABLE_TOKEN }}
+        build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+    - name: Validate build
+      run: |
+        flatpak-builder-lint repo repo
+
+    - name: Upload Flatpak
+      uses: actions/upload-artifact@v4.3.3
+      with:
+        name: "linux-flatpak"
+        path: "duckstation-x64.flatpak"
+
+
+  macos-build:
+    runs-on: macos-14
+    timeout-minutes: 120
+    steps:
+    - uses: actions/checkout@v4.1.6
+      with:
+        fetch-depth: 0
+
+    - name: Use Xcode 15.4
+      run: sudo xcode-select -s /Applications/Xcode_15.4.app
+
+    - name: Install packages
+      shell: bash
+      run: |
+        brew install curl ninja
+
+    - name: Cache Dependencies
+      id: cache-deps-mac
+      uses: actions/cache@v4.0.2
+      with:
+        path: ~/deps
+        key: deps-mac ${{ hashFiles('scripts/build-dependencies-mac.sh') }}
+
+    - name: Build Dependencies
+      if: steps.cache-deps-mac.outputs.cache-hit != 'true'
+      run: scripts/build-dependencies-mac.sh "$HOME/deps"
+
+    - name: Tag as preview build
+      if: github.ref == 'refs/heads/master'
+      run: |
+        echo '#pragma once' > src/scmversion/tag.h
+        echo '#define SCM_RELEASE_ASSET "duckstation-mac-release.zip"' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAG "preview"' >> src/scmversion/tag.h
+
+    - name: Tag as dev build
+      if: github.ref == 'refs/heads/dev'
+      run: |
+        echo '#pragma once' > src/scmversion/tag.h
+        echo '#define SCM_RELEASE_ASSET "duckstation-mac-release.zip"' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAGS {"latest", "preview"}' >> src/scmversion/tag.h
+        echo '#define SCM_RELEASE_TAG "latest"' >> src/scmversion/tag.h
+
+    - name: Compile and zip .app
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+        export MACOSX_DEPLOYMENT_TARGET=11.0
+        cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENGL=OFF -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja ..
+        cmake --build . --parallel
+        mv bin/DuckStation.app .
+        codesign -s - --deep -f -v DuckStation.app
+        zip -r duckstation-mac-release.zip DuckStation.app/
+
+    - name: Upload macOS .app
+      uses: actions/upload-artifact@v4.3.3
+      with:
+        name: "macos"
+        path: "build/duckstation-mac-release.zip"
+
+
+  create-release:
+    needs: [windows-build, windows-arm64-build, linux-build, linux-flatpak-build, macos-build]
+    runs-on: ubuntu-22.04
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4.1.7
+        with:
+          path: ./artifacts/
+
+      - name: Display Downloaded Artifacts
+        run: find ./artifacts/
+
+      - name: Create preview release
+        if: github.ref == 'refs/heads/master'
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "preview"
+          prerelease: true
+          title: "Latest Preview Build"
+          files: |
+            ./artifacts/windows/duckstation-windows-x64-release.zip
+            ./artifacts/windows/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
+            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
+            ./artifacts/linux-x64-appimage-qt/DuckStation-x64.AppImage
+            ./artifacts/linux-flatpak/duckstation-x64.flatpak
+            ./artifacts/macos/duckstation-mac-release.zip
+
+      - name: Create dev release
+        if: github.ref == 'refs/heads/dev'
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          title: "Latest Rolling Release"
+          files: |
+            ./artifacts/windows/duckstation-windows-x64-release.zip
+            ./artifacts/windows/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
+            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
+            ./artifacts/linux-x64-appimage-qt/DuckStation-x64.AppImage
+            ./artifacts/linux-flatpak/duckstation-x64.flatpak
+            ./artifacts/macos/duckstation-mac-release.zip
+
--- a/.github/workflows/upload-caches.yml
+++ b/.github/workflows/upload-caches.yml
@@ -1,36 +0,0 @@
-name: Upload Caches
-
-on:
-  workflow_dispatch:
-
-jobs:
-  upload-windows-cache:
-    runs-on: windows-2022
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: |
-          dep/msvc/deps-arm64
-          dep/msvc/deps-x64
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
-
-    - name: Zip Cache Files
-      if: steps.cache-deps.outputs.cache-hit == 'true'
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r deps-x64.zip ./dep/msvc/deps-x64
-        "C:\Program Files\7-Zip\7z.exe" a -r deps-arm64.zip ./dep/msvc/deps-arm64
-
-    - name: Upload Cache Files
-      if: steps.cache-deps.outputs.cache-hit == 'true'
-      uses: actions/upload-artifact@v4
-      with:
-        name: "windows"
-        path: "deps-*.zip"
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -1,300 +0,0 @@
-name: 💻 Windows
-
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  windows-x64-build:
-    name: "x64"
-    runs-on: windows-2022
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: |
-          dep/msvc/deps-arm64
-          dep/msvc/deps-x64
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
-
-    - name: Build x64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-x64.bat
-
-    - name: Build ARM64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-arm64.bat
-
-    - name: Initialize Build Tag
-      shell: cmd
-      run: |
-        echo #pragma once > src/scmversion/tag.h
-
-    - name: Set Build Tag Asset
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_ASSET "duckstation-windows-x64-release.zip" >> src/scmversion/tag.h
-        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "preview" >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release Build
-      if: github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "latest" >> src/scmversion/tag.h
-
-    - name: Update RC Version Fields
-      shell: cmd
-      run: |
-        cd src\scmversion
-        call update_rc_version.bat
-        cd ..\..
-        git update-index --assume-unchanged src/duckstation-qt/duckstation-qt.rc
-
-    - name: Download Patch Archives
-      shell: cmd
-      run: |
-        cd data/resources
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile x64 Release Build
-      shell: cmd
-      run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        msbuild duckstation.sln -t:Build -p:Platform=x64;Configuration=ReleaseLTCG-Clang
-
-    - name: Create x64 Symbols Archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release-symbols.zip ./bin/x64/*.pdb
-
-    - name: Remove Extra Bloat Before Archiving
-      shell: cmd
-      run: |
-        del /Q bin\x64\*.pdb bin\x64\*.exp bin\x64\*.lib bin\x64\*.iobj bin\x64\*.ipdb bin\x64\common-tests*
-        rename bin\x64\updater-x64-ReleaseLTCG.exe updater.exe
-
-    - name: Create x64 Release Archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-release.zip ./bin/x64/*
-
-    - name: Upload x64 Release Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: "windows-x64"
-        path: "duckstation-windows-x64-release*.zip"
-
-
-  windows-x64-sse2-build:
-    name: "x64 SSE2"
-    runs-on: windows-2022
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: |
-          dep/msvc/deps-arm64
-          dep/msvc/deps-x64
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
-
-    - name: Build x64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-x64.bat
-
-    - name: Build ARM64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-arm64.bat
-
-    - name: Initialize Build Tag
-      shell: cmd
-      run: |
-        echo #pragma once > src/scmversion/tag.h
-
-    - name: Set Build Tag Asset
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_ASSET "duckstation-windows-x64-sse2-release.zip" >> src/scmversion/tag.h
-        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "preview" >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release Build
-      if: github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "latest" >> src/scmversion/tag.h
-
-    - name: Update RC Version Fields
-      shell: cmd
-      run: |
-        cd src\scmversion
-        call update_rc_version.bat
-        cd ..\..
-        git update-index --assume-unchanged src/duckstation-qt/duckstation-qt.rc
-
-    - name: Download Patch Archives
-      shell: cmd
-      run: |
-        cd data/resources
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile x64 Release Build
-      shell: cmd
-      run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        msbuild duckstation.sln -t:Build -p:Platform=x64;Configuration=ReleaseLTCG-Clang-SSE2
-
-    - name: Create x64 Symbols Archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-sse2-release-symbols.zip ./bin/x64/*.pdb
-
-    - name: Remove Extra Bloat Before Archiving
-      shell: cmd
-      run: |
-        del /Q bin\x64\*.pdb bin\x64\*.exp bin\x64\*.lib bin\x64\*.iobj bin\x64\*.ipdb bin\x64\common-tests*
-        rename bin\x64\updater-x64-ReleaseLTCG-SSE2.exe updater.exe
-
-    - name: Create x64 Release Archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-x64-sse2-release.zip ./bin/x64/*
-
-    - name: Upload x64 Release Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: "windows-x64-sse2"
-        path: "duckstation-windows-x64-sse2-release*.zip"
-
-
-  windows-arm64-build:
-    name: "ARM64"
-    runs-on: windows-2022
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        submodules: true
-
-    - name: Cache Dependencies
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: |
-          dep/msvc/deps-arm64
-          dep/msvc/deps-x64
-        key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
-
-    - name: Build x64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-x64.bat
-
-    - name: Build ARM64 Dependencies
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-      env:
-        DEBUG: 0
-      run: scripts/deps/build-dependencies-windows-arm64.bat
-
-    - name: Initialize Build Tag
-      shell: cmd
-      run: |
-        echo #pragma once > src/scmversion/tag.h
-
-    - name: Set Build Tag Asset
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_ASSET "duckstation-windows-arm64-release.zip" >> src/scmversion/tag.h
-        echo #define SCM_RELEASE_TAGS {"latest", "preview"} >> src/scmversion/tag.h
-
-    - name: Tag as Preview Release
-      if: github.ref == 'refs/heads/master'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "preview" >> src/scmversion/tag.h
-
-    - name: Tag as Rolling Release
-      if: github.ref == 'refs/heads/dev'
-      shell: cmd
-      run: |
-        echo #define SCM_RELEASE_TAG "latest" >> src/scmversion/tag.h
-
-    - name: Update RC Version Fields
-      shell: cmd
-      run: |
-        cd src\scmversion
-        call update_rc_version.bat
-        cd ..\..
-        git update-index --assume-unchanged src/duckstation-qt/duckstation-qt.rc
-
-    - name: Download Patch Archives
-      shell: cmd
-      run: |
-        cd data/resources
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip"
-        aria2c -Z "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip"
-
-    - name: Compile ARM64 Release Build
-      shell: cmd
-      run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64_arm64
-        msbuild duckstation.sln -t:Build -p:Platform=ARM64;Configuration=ReleaseLTCG-Clang
-
-    - name: Create ARM64 symbols archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release-symbols.zip ./bin/ARM64/*.pdb
-
-    - name: Remove Extra Bloat Before Archiving
-      shell: cmd
-      run: |
-        del /Q bin\ARM64\*.pdb bin\ARM64\*.exp bin\ARM64\*.lib bin\ARM64\*.iobj bin\ARM64\*.ipdb bin\ARM64\common-tests*
-        rename bin\ARM64\updater-ARM64-ReleaseLTCG.exe updater.exe
-
-    - name: Create ARM64 Release Archive
-      shell: cmd
-      run: |
-        "C:\Program Files\7-Zip\7z.exe" a -r duckstation-windows-arm64-release.zip ./bin/ARM64/*
-
-    - name: Upload ARM64 Release Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: "windows-arm64"
-        path: "duckstation-windows-arm64-release*.zip"
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@

 # dependency build temp files
 deps-build/
-/deps/

 # vs stuff
 .vs
@@ -28,7 +27,6 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_manifest.txt
-/.cache/

 # unix intermediate files
 config.h
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,14 +33,10 @@ detect_cache_line_size()

 # Build options. Depends on system attributes.
 include(DuckStationBuildOptions)
-include(DuckStationDependencies)

-# Enable PIC on Linux, otherwise the builds do not support ASLR.
-if(LINUX OR BSD)
-  include(CheckPIESupported)
-  check_pie_supported()
-  set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-endif()
+# Set _DEBUG macro for Debug builds.
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")

 # Release build optimizations for MSVC.
 if(MSVC)
@@ -55,18 +51,14 @@ if(MSVC)

  # RelWithDebInfo is set to Ob1 instead of Ob2.   
  string(REPLACE "/Ob1" "/Ob2" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  string(REPLACE "/Ob1" "/Ob2" CMAKE_C_FLAGS_DEVEL "${CMAKE_C_FLAGS_DEVEL}")
  string(REPLACE "/Ob1" "/Ob2" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-  string(REPLACE "/Ob1" "/Ob2" CMAKE_CXX_FLAGS_DEVEL "${CMAKE_CXX_FLAGS_DEVEL}")

  # Disable incremental linking in RelWithDebInfo.
  string(REPLACE "/INCREMENTAL" "/INCREMENTAL:NO" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
-  string(REPLACE "/INCREMENTAL" "/INCREMENTAL:NO" CMAKE_EXE_LINKER_FLAGS_DEVEL "${CMAKE_EXE_LINKER_FLAGS_DEVEL}")

  # COMDAT folding/remove unused functions.
  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
  set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /OPT:REF /OPT:ICF")
-  set(CMAKE_EXE_LINKER_FLAGS_DEVEL "${CMAKE_EXE_LINKER_FLAGS_DEVEL} /OPT:REF /OPT:ICF")
 endif()

 # Warning disables.
@@ -85,9 +77,6 @@ if(MSVC)
  string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_HAS_EXCEPTIONS=0 /permissive-")
-  if(COMPILER_CLANG_CL)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /clang:-fno-rtti")
-  endif()
 else()
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
 endif()
@@ -95,18 +84,6 @@ endif()
 # Write binaries to a seperate directory.
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")

-# Installation directories. If INSTALL_SELF_CONTAINED is set, everything goes
-# into one directory, otherwise CMAKE_INSTALL_PREFIX/bin is used (for Flatpak).
-if(ALLOW_INSTALL)
-  if(INSTALL_SELF_CONTAINED)
-    set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}")
-    set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}")
-  else()
-    # Let GNUInstallDirs set the destinations.
-    include(GNUInstallDirs)
-  endif()
-endif()
-
 # Enable large file support on Linux 32-bit platforms.
 if(CMAKE_SIZEOF_VOID_P EQUAL 4)
  add_definitions("-D_FILE_OFFSET_BITS=64")
@@ -125,6 +102,7 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 # Recursively include the source tree.
+include(DuckStationDependencies)
 add_subdirectory(dep)
 add_subdirectory(src)

--- a/CMakeModules/CopyBaseTranslations.cmake
+++ b/CMakeModules/CopyBaseTranslations.cmake
@@ -42,8 +42,6 @@ function(copy_base_translations target)
    target_sources(${target} PRIVATE ${path})
    if(APPLE)
      set_source_files_properties(${path} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/translations)
-    elseif(ALLOW_INSTALL)
-      install(FILES "${path}" DESTINATION "${CMAKE_INSTALL_BINDIR}/translations")
    else()
      add_custom_command(TARGET ${target} POST_BUILD
        COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${path}" "$<TARGET_FILE_DIR:${target}>/translations")
--- a/CMakeModules/DuckStationBuildOptions.cmake
+++ b/CMakeModules/DuckStationBuildOptions.cmake
@@ -5,28 +5,11 @@ option(BUILD_NOGUI_FRONTEND "Build the NoGUI frontend" OFF)
 option(BUILD_QT_FRONTEND "Build the Qt frontend" ON)
 option(BUILD_REGTEST "Build regression test runner" OFF)
 option(BUILD_TESTS "Build unit tests" OFF)
-option(DISABLE_SSE4 "Build with SSE4 instructions disabled, reduces performance" OFF)

 if(LINUX OR BSD)
  option(ENABLE_X11 "Support X11 window system" ON)
  option(ENABLE_WAYLAND "Support Wayland window system" ON)
-  option(ALLOW_INSTALL "Allow installation to CMAKE_INSTALL_PREFIX" OFF)
-  option(INSTALL_SELF_CONTAINED "Make self-contained install, i.e. everything in one directory" ON)
 endif()
 if(APPLE)
  option(SKIP_POSTPROCESS_BUNDLE "Disable bundle post-processing, including Qt additions" OFF)
 endif()
-
-# Set _DEBUG macro for Debug builds.
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
-
-# Create the Devel build type based on RelWithDebInfo.
-set(CMAKE_C_FLAGS_DEVEL "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_DEVEL" CACHE STRING "Flags used by the C compiler during DEVEL builds." FORCE)
-set(CMAKE_CXX_FLAGS_DEVEL "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_DEVEL" CACHE STRING "Flags used by the CXX compiler during DEVEL builds." FORCE)
-set(CMAKE_EXE_LINKER_FLAGS_DEVEL "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING "Flags used for the linker during DEVEL builds." FORCE)
-set(CMAKE_MODULE_LINKER_FLAGS_DEVEL "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING "Flags used by the linker during the creation of modules during DEVEL builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_DEVEL "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING "Flags used by the linker during the creation of shared libraries during DEVEL builds." FORCE)
-set(CMAKE_STATIC_LINKER_FLAGS_DEVEL "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING "Flags used by the linker during the creation of static libraries during DEVEL builds." FORCE)
-list(APPEND CMAKE_CONFIGURATION_TYPES "Devel")
-mark_as_advanced(CMAKE_C_FLAGS_DEVEL CMAKE_CXX_FLAGS_DEVEL CMAKE_EXE_LINKER_FLAGS_DEVEL CMAKE_MODULE_LINKER_FLAGS_DEVEL CMAKE_SHARED_LINKER_FLAGS_DEVEL CMAKE_STATIC_LINKER_FLAGS_DEVEL)
--- a/CMakeModules/DuckStationBuildSummary.cmake
+++ b/CMakeModules/DuckStationBuildSummary.cmake
@@ -24,30 +24,9 @@ if(BUILD_TESTS)
  message(STATUS "Building unit tests.")
 endif()

-if(ALLOW_INSTALL)
-  message(WARNING "Install target is enabled. This will install all DuckStation files into:
-  ${CMAKE_INSTALL_PREFIX}
-It does **not** use the LSB subdirectories of bin, share, etc, so you should disable this option if it is set to /usr or /usr/local.")
-
-  if(INSTALL_SELF_CONTAINED)
-    message(STATUS "Creating self-contained install at ${CMAKE_INSTALL_PREFIX}")
-  else()
-    message(STATUS "Creating relative install at ${CMAKE_INSTALL_PREFIX}")
-    message(STATUS "  CMAKE_INSTALL_BINDIR: ${CMAKE_INSTALL_BINDIR}")
-  endif()
-endif()
-
-if(DEFINED HOST_MIN_PAGE_SIZE AND DEFINED HOST_MAX_PAGE_SIZE)
-  message(STATUS "Building with a dynamic page size of ${HOST_MIN_PAGE_SIZE} - ${HOST_MAX_PAGE_SIZE} bytes.")
-elseif(DEFINED HOST_PAGE_SIZE)
-  message(STATUS "Building with detected page size of ${HOST_PAGE_SIZE}")
-endif()
-if(DEFINED HOST_CACHE_LINE_SIZE)
-  message(STATUS "Building with detected cache line size of ${HOST_CACHE_LINE_SIZE}")
-endif()
-
 if(NOT IS_SUPPORTED_COMPILER)
-  message(WARNING "*************** UNSUPPORTED CONFIGURATION ***************
+  message(WARNING "
+*************** UNSUPPORTED CONFIGURATION ***************
 You are not compiling DuckStation with a supported compiler.
 It may not even build successfully.
 DuckStation only supports the Clang and MSVC compilers.
@@ -56,18 +35,11 @@ No support will be provided, continue at your own risk.
 endif()

 if(WIN32)
-  message(WARNING "*************** UNSUPPORTED CONFIGURATION ***************
+  message(WARNING "
+*************** UNSUPPORTED CONFIGURATION ***************
 You are compiling DuckStation with CMake on Windows.
 It may not even build successfully.
 DuckStation only supports MSBuild on Windows.
 No support will be provided, continue at your own risk.
 *********************************************************")
 endif()
-
-if(CPU_ARCH_X64 AND DISABLE_SSE4)
-  message(WARNING "*********************** WARNING ***********************
-SSE4 instructions are disabled. This will result in
-reduced performance. You should not enable this option
-unless you have a pre-2008 CPU.
-*******************************************************")
-endif()
--- a/CMakeModules/DuckStationDependencies.cmake
+++ b/CMakeModules/DuckStationDependencies.cmake
@@ -9,18 +9,13 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

-find_package(SDL2 2.30.8 REQUIRED)
+find_package(SDL2 2.30.4 REQUIRED)
 find_package(Zstd 1.5.6 REQUIRED)
 find_package(WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config.
 find_package(ZLIB REQUIRED) # 1.3, but Mac currently doesn't use it.
 find_package(PNG 1.6.40 REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(Freetype 2.13.2 REQUIRED) # 2.13.3, but flatpak is still on 2.13.2.
-find_package(lunasvg 2.4.1 REQUIRED)
-find_package(cpuinfo REQUIRED)
-find_package(DiscordRPC 3.4.0 REQUIRED)
-find_package(SoundTouch 2.3.3 REQUIRED)
-find_package(libzip 1.11.1 REQUIRED)
+find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo.
+find_package(Freetype 2.11.1 REQUIRED)

 if(NOT WIN32)
  find_package(CURL REQUIRED)
@@ -28,8 +23,8 @@ endif()

 if(ENABLE_X11)
  find_package(X11 REQUIRED)
-  if (NOT X11_xcb_FOUND OR NOT X11_xcb_randr_FOUND OR NOT X11_X11_xcb_FOUND)
-    message(FATAL_ERROR "XCB, XCB-randr and X11-xcb are required")
+  if (NOT X11_Xrandr_FOUND)
+    message(FATAL_ERROR "XRandR extension is required")
  endif()
 endif()

@@ -39,21 +34,18 @@ if(ENABLE_WAYLAND)
  find_package(Wayland REQUIRED Egl)
 endif()

-if(BUILD_QT_FRONTEND)
-  find_package(Qt6 6.8.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
-endif()
+if(ENABLE_VULKAN)
+  find_package(Shaderc REQUIRED)
+  find_package(spirv_cross_c_shared REQUIRED)

-find_package(Shaderc REQUIRED)
-find_package(spirv_cross_c_shared REQUIRED)
-
-if(LINUX AND NOT (ALLOW_INSTALL AND INSTALL_SELF_CONTAINED))
-  # We need to add the rpath for shaderc to the executable.
-  get_target_property(SHADERC_LIBRARY Shaderc::shaderc_shared IMPORTED_LOCATION)
-  get_filename_component(SHADERC_LIBRARY_DIRECTORY ${SHADERC_LIBRARY} DIRECTORY)
-  list(APPEND CMAKE_BUILD_RPATH ${SHADERC_LIBRARY_DIRECTORY})
-  get_target_property(SPIRV_CROSS_LIBRARY spirv-cross-c-shared IMPORTED_LOCATION)
-  get_filename_component(SPIRV_CROSS_LIBRARY_DIRECTORY ${SPIRV_CROSS_LIBRARY} DIRECTORY)
-  list(APPEND CMAKE_BUILD_RPATH ${SPIRV_CROSS_LIBRARY_DIRECTORY})
+  if(LINUX)
+    # We need to add the rpath for shaderc to the executable.
+    get_filename_component(SHADERC_LIBRARY_DIRECTORY ${SHADERC_LIBRARY} DIRECTORY)
+    list(APPEND CMAKE_BUILD_RPATH ${SHADERC_LIBRARY_DIRECTORY})
+    get_target_property(SPIRV_CROSS_LIBRARY spirv-cross-c-shared IMPORTED_LOCATION)
+    get_filename_component(SPIRV_CROSS_LIBRARY_DIRECTORY ${SPIRV_CROSS_LIBRARY} DIRECTORY)
+    list(APPEND CMAKE_BUILD_RPATH ${SPIRV_CROSS_LIBRARY_DIRECTORY})
+  endif()
 endif()

 if(LINUX)
@@ -64,16 +56,6 @@ if(NOT WIN32 AND NOT APPLE)
  find_package(Libbacktrace REQUIRED)
 endif()

-if(NOT ANDROID AND NOT WIN32)
-  find_package(FFMPEG COMPONENTS avcodec avformat avutil swresample swscale)
-  if(NOT FFMPEG_FOUND)
-    message(WARNING "FFmpeg not found, using bundled headers.")
-  endif()
-endif()
-if(NOT ANDROID AND NOT FFMPEG_FOUND)
-  set(FFMPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/dep/ffmpeg/include")
-endif()
-
 if(APPLE)
  set(CMAKE_FIND_FRAMEWORK ${FIND_FRAMEWORK_BACKUP})
 endif()
--- a/CMakeModules/DuckStationUtils.cmake
+++ b/CMakeModules/DuckStationUtils.cmake
@@ -57,8 +57,6 @@ function(detect_architecture)
    if("x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES)
      message(STATUS "Building x86_64 MacOS binaries.")
      set(CPU_ARCH_X64 TRUE PARENT_SCOPE)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xarch_x86_64 -msse4.1" PARENT_SCOPE)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xarch_x86_64 -msse4.1" PARENT_SCOPE)
    endif()
    if("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES)
      message(STATUS "Building ARM64 MacOS binaries.")
@@ -69,14 +67,6 @@ function(detect_architecture)
         CMAKE_SIZEOF_VOID_P EQUAL 8)
    message(STATUS "Building x86_64 binaries.")
    set(CPU_ARCH_X64 TRUE PARENT_SCOPE)
-    if(NOT MSVC OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT DISABLE_SSE4)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1" PARENT_SCOPE)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1" PARENT_SCOPE)
-    elseif(MSVC AND NOT DISABLE_SSE4)
-      # Clang defines these macros, MSVC does not.
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D__SSE3__ /D__SSE4_1__")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D__SSE3__ /D__SSE4_1__")
-    endif()
  elseif(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") AND
         CMAKE_SIZEOF_VOID_P EQUAL 8) # Might have an A64 kernel, e.g. Raspbian.
    message(STATUS "Building ARM64 binaries.")
@@ -87,27 +77,22 @@ function(detect_architecture)
          AND CMAKE_SIZEOF_VOID_P EQUAL 4))
    message(STATUS "Building ARM32 binaries.")
    set(CPU_ARCH_ARM32 TRUE PARENT_SCOPE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -marm -march=armv7-a -mfpu=neon-vfpv4" PARENT_SCOPE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -marm -march=armv7-a -mfpu=neon-vfpv4" PARENT_SCOPE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -marm -march=armv7-a" PARENT_SCOPE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -marm -march=armv7-a" PARENT_SCOPE)
  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "riscv64")
    message(STATUS "Building RISC-V 64 binaries.")
    set(CPU_ARCH_RISCV64 TRUE PARENT_SCOPE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -finline-atomics" PARENT_SCOPE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -finline-atomics" PARENT_SCOPE)

-    # Don't want function calls for atomics.
-    if(COMPILER_GCC)
-      set(EXTRA_CFLAGS "${EXTRA_CFLAGS} -finline-atomics")
-
-      # Still need this, apparently.
-      link_libraries("-latomic")
-    endif()
+    # Still need this, apparently.
+    link_libraries("-latomic")

    if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
      # Frame pointers generate an annoying amount of code on leaf functions.
-      set(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fomit-frame-pointer")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer" PARENT_SCOPE)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer" PARENT_SCOPE)
    endif()
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}" PARENT_SCOPE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}" PARENT_SCOPE)
  else()
    message(FATAL_ERROR "Unknown system processor: ${CMAKE_SYSTEM_PROCESSOR}")
  endif()
@@ -115,21 +100,13 @@ endfunction()

 function(detect_page_size)
  # This is only needed for ARM64, or if the user hasn't overridden it explicitly.
-  # For universal Apple builds, we use preprocessor macros to determine page size.
-  # Similar for Windows, except it's always 4KB.
-  if(NOT CPU_ARCH_ARM64 OR NOT LINUX)
-    unset(HOST_PAGE_SIZE PARENT_SCOPE)
-    unset(HOST_MIN_PAGE_SIZE PARENT_SCOPE)
-    unset(HOST_MAX_PAGE_SIZE PARENT_SCOPE)
-    return()
-  elseif(DEFINED HOST_PAGE_SIZE)
+  if(NOT CPU_ARCH_ARM64 OR HOST_PAGE_SIZE)
    return()
  endif()

-  if(DEFINED HOST_MIN_PAGE_SIZE OR DEFINED HOST_MAX_PAGE_SIZE)
-    if(NOT DEFINED HOST_MIN_PAGE_SIZE OR NOT DEFINED HOST_MAX_PAGE_SIZE)
-      message(FATAL_ERROR "Both HOST_MIN_PAGE_SIZE and HOST_MAX_PAGE_SIZE must be defined.")
-    endif()
+  if(NOT LINUX)
+    # For universal Apple builds, we use preprocessor macros to determine page size.
+    # Similar for Windows, except it's always 4KB.
    return()
  endif()

@@ -166,7 +143,6 @@ endfunction()
 function(detect_cache_line_size)
  # This is only needed for ARM64, or if the user hasn't overridden it explicitly.
  if(NOT CPU_ARCH_ARM64 OR HOST_CACHE_LINE_SIZE)
-    unset(HOST_CACHE_LINE_SIZE PARENT_SCOPE)
    return()
  endif()

@@ -177,7 +153,7 @@ function(detect_cache_line_size)
  endif()

  if(CMAKE_CROSSCOMPILING)
-    message(WARNING "Cross-compiling and can't determine cache line size, assuming default.")
+    message(WARNING "Cross-compiling and can't determine page size, assuming default.")
    return()
  endif()

@@ -218,30 +194,3 @@ int main() {
    set(HOST_CACHE_LINE_SIZE ${detect_cache_line_size_output} CACHE STRING "Reported host cache line size")
  endif()
 endfunction()
-
-function(get_scm_version)
-  if(SCM_VERSION)
-    return()
-  endif()
-
-  find_package(Git)
-  if(EXISTS "${PROJECT_SOURCE_DIR}/.git" AND GIT_FOUND)
-    execute_process(
-      COMMAND ${GIT_EXECUTABLE} describe --dirty
-      WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
-      OUTPUT_VARIABLE LOCAL_SCM_VERSION
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-  endif()
-  if(NOT LOCAL_SCM_VERSION)
-    set(SCM_VERSION "unknown" PARENT_SCOPE)
-  else()
-    set(SCM_VERSION ${LOCAL_SCM_VERSION} PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(install_imported_dep_library name)
-  get_target_property(SONAME "${name}" IMPORTED_SONAME_RELEASE)
-  get_target_property(LOCATION "${name}" IMPORTED_LOCATION_RELEASE)
-  install(FILES "${LOCATION}" RENAME "${SONAME}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-endfunction()
--- a/CMakeModules/FindFFMPEG.cmake
+++ b/CMakeModules/FindFFMPEG.cmake
@@ -1,215 +0,0 @@
-#[==[
-Provides the following variables:
-
-  * `FFMPEG_INCLUDE_DIRS`: Include directories necessary to use FFMPEG.
-  * `FFMPEG_LIBRARIES`: Libraries necessary to use FFMPEG. Note that this only
-    includes libraries for the components requested.
-  * `FFMPEG_VERSION`: The version of FFMPEG found.
-
-The following components are supported:
-
-  * `avcodec`
-  * `avdevice`
-  * `avfilter`
-  * `avformat`
-  * `avresample`
-  * `avutil`
-  * `swresample`
-  * `swscale`
-
-For each component, the following are provided:
-
-  * `FFMPEG_<component>_FOUND`: Libraries for the component.
-  * `FFMPEG_<component>_INCLUDE_DIRS`: Include directories for
-    the component.
-  * `FFMPEG_<component>_LIBRARIES`: Libraries for the component.
-  * `FFMPEG::<component>`: A target to use with `target_link_libraries`.
-
-Note that only components requested with `COMPONENTS` or `OPTIONAL_COMPONENTS`
-are guaranteed to set these variables or provide targets.
-#]==]
-
-function (_ffmpeg_find component headername)
-  find_path("FFMPEG_${component}_INCLUDE_DIR"
-    NAMES
-      "lib${component}/${headername}"
-    PATHS
-      "${FFMPEG_ROOT}/include"
-      "${CMAKE_PREFIX_PATH}/include"
-      ~/Library/Frameworks
-      /Library/Frameworks
-      /usr/local/include
-      /usr/include
-      /sw/include # Fink
-      /opt/local/include # DarwinPorts
-      /opt/csw/include # Blastwave
-      /opt/include
-      /usr/freeware/include
-    PATH_SUFFIXES
-      ffmpeg
-    DOC "FFMPEG's ${component} include directory")
-  mark_as_advanced("FFMPEG_${component}_INCLUDE_DIR")
-
-  # On Windows, static FFMPEG is sometimes built as `lib<name>.a`.
-  if (WIN32)
-    list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib")
-    list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
-  endif ()
-
-  find_library("FFMPEG_${component}_LIBRARY"
-    NAMES
-      "${component}"
-    PATHS
-      "${FFMPEG_ROOT}/lib"
-      "${CMAKE_PREFIX_PATH}/lib"
-      "${CMAKE_PREFIX_PATH}/lib64"
-      ~/Library/Frameworks
-      /Library/Frameworks
-      /usr/local/lib
-      /usr/local/lib64
-      /usr/lib
-      /usr/lib64
-      /sw/lib
-      /opt/local/lib
-      /opt/csw/lib
-      /opt/lib
-      /usr/freeware/lib64
-      "${FFMPEG_ROOT}/bin"
-    DOC "FFMPEG's ${component} library")
-  mark_as_advanced("FFMPEG_${component}_LIBRARY")
-
-  if (FFMPEG_${component}_LIBRARY AND FFMPEG_${component}_INCLUDE_DIR)
-    set(_deps_found TRUE)
-    set(_deps_link)
-    foreach (_ffmpeg_dep IN LISTS ARGN)
-      if (TARGET "FFMPEG::${_ffmpeg_dep}")
-        list(APPEND _deps_link "FFMPEG::${_ffmpeg_dep}")
-      else ()
-        set(_deps_found FALSE)
-      endif ()
-    endforeach ()
-    if (_deps_found)
-      if (NOT TARGET "FFMPEG::${component}")
-        add_library("FFMPEG::${component}" UNKNOWN IMPORTED)
-        set_target_properties("FFMPEG::${component}" PROPERTIES
-          IMPORTED_LOCATION "${FFMPEG_${component}_LIBRARY}"
-          INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_${component}_INCLUDE_DIR}"
-          IMPORTED_LINK_INTERFACE_LIBRARIES "${_deps_link}")
-      endif ()
-      set("FFMPEG_${component}_FOUND" 1
-        PARENT_SCOPE)
-
-      set(version_header_path "${FFMPEG_${component}_INCLUDE_DIR}/lib${component}/version.h")
-      set(major_version_header_path "${FFMPEG_${component}_INCLUDE_DIR}/lib${component}/version_major.h")
-      if (EXISTS "${major_version_header_path}")
-        string(TOUPPER "${component}" component_upper)
-        file(STRINGS "${major_version_header_path}" major_version
-          REGEX "#define  *LIB${component_upper}_VERSION_MAJOR ")
-        file(STRINGS "${version_header_path}" version
-          REGEX "#define  *LIB${component_upper}_VERSION_(MINOR|MICRO) ")
-        string(REGEX REPLACE ".*_MAJOR *\([0-9]*\).*" "\\1" major "${major_version}")
-        string(REGEX REPLACE ".*_MINOR *\([0-9]*\).*" "\\1" minor "${version}")
-        string(REGEX REPLACE ".*_MICRO *\([0-9]*\).*" "\\1" micro "${version}")
-        if (NOT major STREQUAL "" AND
-            NOT minor STREQUAL "" AND
-            NOT micro STREQUAL "")
-          set("FFMPEG_${component}_VERSION" "${major}.${minor}.${micro}"
-            PARENT_SCOPE)
-        endif ()
-      elseif (EXISTS "${version_header_path}")
-        string(TOUPPER "${component}" component_upper)
-        file(STRINGS "${version_header_path}" version
-          REGEX "#define  *LIB${component_upper}_VERSION_(MAJOR|MINOR|MICRO) ")
-        string(REGEX REPLACE ".*_MAJOR *\([0-9]*\).*" "\\1" major "${version}")
-        string(REGEX REPLACE ".*_MINOR *\([0-9]*\).*" "\\1" minor "${version}")
-        string(REGEX REPLACE ".*_MICRO *\([0-9]*\).*" "\\1" micro "${version}")
-        if (NOT major STREQUAL "" AND
-            NOT minor STREQUAL "" AND
-            NOT micro STREQUAL "")
-          set("FFMPEG_${component}_VERSION" "${major}.${minor}.${micro}"
-            PARENT_SCOPE)
-        endif ()
-      endif ()
-    else ()
-      set("FFMPEG_${component}_FOUND" 0
-        PARENT_SCOPE)
-      set(what)
-      if (NOT FFMPEG_${component}_LIBRARY)
-        set(what "library")
-      endif ()
-      if (NOT FFMPEG_${component}_INCLUDE_DIR)
-        if (what)
-          string(APPEND what " or headers")
-        else ()
-          set(what "headers")
-        endif ()
-      endif ()
-      set("FFMPEG_${component}_NOT_FOUND_MESSAGE"
-        "Could not find the ${what} for ${component}."
-        PARENT_SCOPE)
-    endif ()
-  endif ()
-endfunction ()
-
-_ffmpeg_find(avutil     avutil.h)
-_ffmpeg_find(avresample avresample.h
-  avutil)
-_ffmpeg_find(swresample swresample.h
-  avutil)
-_ffmpeg_find(swscale    swscale.h
-  avutil)
-_ffmpeg_find(avcodec    avcodec.h
-  avutil)
-_ffmpeg_find(avformat   avformat.h
-  avcodec avutil)
-_ffmpeg_find(avfilter   avfilter.h
-  avutil)
-_ffmpeg_find(avdevice   avdevice.h
-  avformat avutil)
-
-if (TARGET FFMPEG::avutil)
-  set(_ffmpeg_version_header_path "${FFMPEG_avutil_INCLUDE_DIR}/libavutil/ffversion.h")
-  if (EXISTS "${_ffmpeg_version_header_path}")
-    file(STRINGS "${_ffmpeg_version_header_path}" _ffmpeg_version
-      REGEX "FFMPEG_VERSION")
-    string(REGEX REPLACE ".*\"n?\(.*\)\"" "\\1" FFMPEG_VERSION "${_ffmpeg_version}")
-    unset(_ffmpeg_version)
-  else ()
-    set(FFMPEG_VERSION FFMPEG_VERSION-NOTFOUND)
-  endif ()
-  unset(_ffmpeg_version_header_path)
-endif ()
-
-set(FFMPEG_INCLUDE_DIRS)
-set(FFMPEG_LIBRARIES)
-set(_ffmpeg_required_vars)
-foreach (_ffmpeg_component IN LISTS FFMPEG_FIND_COMPONENTS)
-  if (TARGET "FFMPEG::${_ffmpeg_component}")
-    set(FFMPEG_${_ffmpeg_component}_INCLUDE_DIRS
-      "${FFMPEG_${_ffmpeg_component}_INCLUDE_DIR}")
-    set(FFMPEG_${_ffmpeg_component}_LIBRARIES
-      "${FFMPEG_${_ffmpeg_component}_LIBRARY}")
-    list(APPEND FFMPEG_INCLUDE_DIRS
-      "${FFMPEG_${_ffmpeg_component}_INCLUDE_DIRS}")
-    list(APPEND FFMPEG_LIBRARIES
-      "${FFMPEG_${_ffmpeg_component}_LIBRARIES}")
-    if (FFMEG_FIND_REQUIRED_${_ffmpeg_component})
-      list(APPEND _ffmpeg_required_vars
-        "FFMPEG_${_ffmpeg_required_vars}_INCLUDE_DIRS"
-        "FFMPEG_${_ffmpeg_required_vars}_LIBRARIES")
-    endif ()
-  endif ()
-endforeach ()
-unset(_ffmpeg_component)
-
-if (FFMPEG_INCLUDE_DIRS)
-  list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FFMPEG
-  REQUIRED_VARS FFMPEG_INCLUDE_DIRS FFMPEG_LIBRARIES ${_ffmpeg_required_vars}
-  VERSION_VAR FFMPEG_VERSION
-  HANDLE_COMPONENTS)
-unset(_ffmpeg_required_vars)
-
--- a/CMakeModules/FindLibbacktrace.cmake
+++ b/CMakeModules/FindLibbacktrace.cmake
@@ -6,14 +6,14 @@

 FIND_PATH(
    LIBBACKTRACE_INCLUDE_DIR backtrace.h
-    HINTS "${CMAKE_PREFIX_PATH}/include" /usr/include /usr/local/include
+    HINTS /usr/include /usr/local/include
    ${LIBBACKTRACE_PATH_INCLUDES}
 )

 FIND_LIBRARY(
    LIBBACKTRACE_LIBRARY
    NAMES backtrace
-    PATHS "${CMAKE_PREFIX_PATH}/lib" "${CMAKE_PREFIX_PATH}/lib64" ${ADDITIONAL_LIBRARY_PATHS} ${LIBBACKTRACE_PATH_LIB}
+    PATHS ${ADDITIONAL_LIBRARY_PATHS} ${LIBBACKTRACE_PATH_LIB}
 )

 include(FindPackageHandleStandardArgs)
--- a/CMakeModules/FindOpenSLES.cmake
+++ b/CMakeModules/FindOpenSLES.cmake
@@ -0,0 +1,30 @@
+# - Try to find OpenSLES
+# Once done this will define
+#  OPENSLES_FOUND - System has OpenSLES
+#  OPENSLES_INCLUDE_DIR - The OpenSLES include directory
+#  OPENSLES_LIBRARY - The library needed to use OpenSLES
+# An imported target OpenSLES::OpenSLES is also created, prefer this
+
+find_path(OPENSLES_INCLUDE_DIR
+  NAMES SLES/OpenSLES.h
+)
+
+find_library(OPENSLES_LIBRARY
+  NAMES OpenSLES
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenSLES  DEFAULT_MSG
+                                  OPENSLES_LIBRARY OPENSLES_INCLUDE_DIR)
+
+if(OpenSLES_FOUND)
+  if(NOT TARGET OpenSLES::OpenSLES)
+    add_library(OpenSLES::OpenSLES UNKNOWN IMPORTED)
+    set_target_properties(OpenSLES::OpenSLES PROPERTIES
+      IMPORTED_LOCATION ${OPENSLES_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${OPENSLES_INCLUDE_DIR}
+    )
+  endif()
+endif()
+
+mark_as_advanced(OPENSLES_INCLUDE_DIR OPENSLES_LIBRARY )
--- a/CMakeModules/FindShaderc.cmake
+++ b/CMakeModules/FindShaderc.cmake
@@ -0,0 +1,31 @@
+# - Try to find SHADERC
+# Once done this will define
+#  SHADERC_FOUND - System has SHADERC
+#  SHADERC_INCLUDE_DIRS - The SHADERC include directories
+#  SHADERC_LIBRARIES - The libraries needed to use SHADERC
+
+find_path(
+    SHADERC_INCLUDE_DIR shaderc/shaderc.h
+    ${SHADERC_PATH_INCLUDES}
+)
+
+find_library(
+    SHADERC_LIBRARY
+    NAMES shaderc_shared.1 shaderc_shared
+    PATHS ${ADDITIONAL_LIBRARY_PATHS} ${SHADERC_PATH_LIB}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Shaderc DEFAULT_MSG
+                                  SHADERC_LIBRARY SHADERC_INCLUDE_DIR)
+
+if(SHADERC_FOUND)
+    add_library(Shaderc::shaderc_shared UNKNOWN IMPORTED)
+    set_target_properties(Shaderc::shaderc_shared PROPERTIES
+        IMPORTED_LOCATION ${SHADERC_LIBRARY}
+        INTERFACE_INCLUDE_DIRECTORIES ${SHADERC_INCLUDE_DIR}
+        INTERFACE_COMPILE_DEFINITIONS "SHADERC_SHAREDLIB"
+    )
+endif()
+
+mark_as_advanced(SHADERC_INCLUDE_DIR SHADERC_LIBRARY)
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -16,8 +16,7 @@ The following people have contributed to the project in some way, and are credit
 - posix - @Richard-L, blexx - German
 - @phoe-nix, @zkdpower - Chinese (Simplified)
 - Sorer - @MojoJojoDojo - Hebrew
- @Hipnosis183, @falsepopsky - Spanish (Latin America)
- @IlDucci - Spanish (Spain)
+- Hipnosis - @Hipnosis183, MrHomunculus, @falsepopsky - Spanish
 - @RaydenX93 - Italian
 - @r57zone - Russian
 - @6lackmag3 - Russian (Android)
--- a/1077
+++ b/1077
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 DuckStation is an simulator/emulator of the Sony PlayStation(TM) console, focusing on playability, speed, and long-term maintainability. The goal is to be as accurate as possible while maintaining performance suitable for low-end devices. "Hack" options are discouraged, the default configuration should support all playable games with only some of the enhancements having compatibility issues.

-A PS1 or PS2 "BIOS" ROM image is required to to start the emulator and to play games. You can use an image from any hardware version or region, although mismatching game regions and BIOS regions may have compatibility issues. A ROM image is not provided with the emulator for legal reasons, you should dump this from your own console using Caetla or other means.
+A "BIOS" ROM image is required to to start the emulator and to play games. You can use an image from any hardware version or region, although mismatching game regions and BIOS regions may have compatibility issues. A ROM image is not provided with the emulator for legal reasons, you should dump this from your own console using Caetla or other means.

 ## Features

@@ -25,24 +25,17 @@ Other features include:
 - CPU Recompiler/JIT (x86-64, armv7/AArch32, AArch64, RISC-V/RV64).
 - Hardware (D3D11, D3D12, OpenGL, Vulkan, Metal) and software rendering.
 - Upscaling, texture filtering, and true colour (24-bit) in hardware renderers.
- - Accurate blending via Rasterizer Order Views/Fragment Shader Interlock.
 - PGXP for geometry precision, texture correction, and depth buffer emulation.
- - Texture replacement system in hardware renderers.
- - Motion adaptive deinterlacing.
 - Adaptive downsampling filter.
- - Screen rotation for vertical or "TATE" shmup games.
- - Post processing shader chains (GLSL and Reshade FX).
+ - Post processing shader chains (GLSL and experimental Reshade FX).
 - "Fast boot" for skipping BIOS splash/intro.
- - Save state support, with runahead and rewind.
+ - Save state support.
 - Windows, Linux, macOS support.
- - Supports reading directly from CD, bin/cue images, raw bin/img files, MAME CHD, single-track ECM, MDS/MDF, and unencrypted PBP formats.
- - Preloading of disc images to RAM to avoid disk sleeping hitches.
- - Automatic loading/applying of PPF patches.
+ - Supports bin/cue images, raw bin/img files, MAME CHD, single-track ECM, MDS/MDF, and unencrypted PBP formats.
 - Direct booting of homebrew executables.
 - Direct loading of Portable Sound Format (psf) files.
- - Time stretched audio when running outside of 100% speed.
 - Digital and analog controllers for input (rumble is forwarded to host).
- - GunCon and Justifier lightgun support (simulated with mouse).
+ - Namco GunCon lightgun support (simulated with mouse).
 - NeGcon support.
 - Qt and "Big Picture" UI.
 - Automatic updates with preview and latest channels.
@@ -54,8 +47,7 @@ Other features include:
 - Integrated and remote debugging.
 - Multitap controllers (up to 8 devices).
 - RetroAchievements.
- - Discord Rich Presence.
- - Video capture with Media Foundation (Windows) and [FFmpeg](https://www.ffmpeg.org/) (All Platforms) backends.
+ - Automatic loading/applying of PPF patches.

 ## System Requirements
 - A CPU faster than a potato. But it needs to be x86_64, AArch32/armv7, AArch64/ARMv8, or RISC-V/RV64.
@@ -63,11 +55,7 @@ Other features include:
 - SDL, XInput or DInput compatible game controller (e.g. XB360/XBOne/XBSeries). DualShock 3 users on Windows will need to install the official DualShock 3 drivers included as part of PlayStation Now.

 ## Downloading and running
-Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push.
-
-As per the terms of CC-BY-NC-ND, redistribution of **unmodified releases and code** is permitted. However, we would prefer if you linked to https://www.duckstation.org/ instead. Please note that pre-configured settings and packages are considered modifications.
-
-For x86 machines (most systems), you will need a CPU that supports the SSE4.1 instruction set for the "normal" build. This includes all Intel CPUs manufactured after 2007, and AMD CPUs manufactured after 2011. If you have a CPU that is older, you will need to download the "SSE2" build from the releases page, which has lower performance but still supports these CPUs.
+Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push. Binaries or packages distributed through other sources may be out of date and are not supported by the developer, please speak to them for support, not us.

 ### Windows

@@ -85,7 +73,11 @@ Once downloaded and extracted, you can launch the emulator with `duckstation-qt-

 ### Linux

-DuckStation is provided for x86_64 Linux in AppImage and Flatpak formats. The release on [Flathub](https://flathub.org/apps/org.duckstation.DuckStation) is official, and synchronized with the latest rolling/stable release on GitHub.
+The only supported version of DuckStation for Linux are the AppImage and Flatpak in the releases page. If you installed DuckStation from another source or distribution (e.g. EmuDeck), you should contact the packager for support, we have no control over it.
+
+The release on [Flathub](https://flathub.org/apps/org.duckstation.DuckStation) is official, and synchronized with the latest rolling/stable release on GitHub.
+
+You **should not** install DuckStation from unofficial repositories such as the AUR, they are **known to be broken**.

 #### AppImage

@@ -121,7 +113,6 @@ To download:
 You will need a device with armv7 (32-bit ARM), AArch64 (64-bit ARM), or x86_64 (64-bit x86). 64-bit is preferred, the requirements are higher for 32-bit, you'll probably want at least a 1.5GHz CPU.

 Download from Google Play: https://play.google.com/store/apps/details?id=com.github.stenzek.duckstation
-
 APK and Beta Downloads: https://www.duckstation.org/android/

 **No support is provided for the Android app**, it is free and your expectations should be in line with that. Please **do not** email me about issues about it, or ask for help, you will be ignored.
@@ -142,14 +133,6 @@ For example, if your disc image was named `Spyro3.cue`, you would place the SBI

 CHD images with built-in subchannel information are also supported.

-If you are playing directly from a disc and your CD/DVD drive does not support subchannel reading, or has a skew with the returned SubQ, you can place the SBI file in the `subchannel` directory under the user directory, with the serial or title of the game.
-
-### Cheats and patch database
-
-DuckStation ships with a built-in cheat and patch database, both provided by the community. Contributions to these are welcome at https://github.com/duckstation/chtdb.
-
-Each release includes the latest version of the database, however you are free to manually update to the latest version as well.
-
 ## Building

 ### Windows
@@ -170,23 +153,18 @@ Requirements:

 Ubuntu/Debian package names:
 ```
-autoconf automake build-essential clang cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev libtool lld llvm nasm ninja-build pkg-config zlib1g-dev
+build-essential clang cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev lld llvm ninja-build pkg-config zlib1g-dev
 ```

 Fedora package names:
 ```
-alsa-lib-devel autoconf automake brotli-devel clang cmake dbus-devel egl-wayland-devel extra-cmake-modules fontconfig-devel gcc-c++ gtk3-devel libavcodec-free-devel libavformat-free-devel libavutil-free-devel libcurl-devel libdecor-devel libevdev-devel libICE-devel libinput-devel libSM-devel libswresample-free-devel libswscale-free-devel libX11-devel libXau-devel libxcb-devel libXcomposite-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libxkbcommon-devel libxkbcommon-x11-devel libXpresent-devel libXrandr-devel libXrender-devel libtool lld llvm make mesa-libEGL-devel mesa-libGL-devel nasm ninja-build openssl-devel patch pcre2-devel perl-Digest-SHA pipewire-devel pulseaudio-libs-devel systemd-devel wayland-devel xcb-util-cursor-devel xcb-util-devel xcb-util-errors-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xcb-util-xrm-devel zlib-devel
-```
-
-Arch package names:
-```
-base-devel clang cmake curl dbus extra-cmake-modules freetype git libjpeg-turbo libpng libwebp libx11 libxrandr lld llvm ninja qt6-base qt6-imageformats qt6-svg qt6-tools wayland zstd
+alsa-lib-devel brotli-devel clang cmake dbus-devel egl-wayland-devel extra-cmake-modules fontconfig-devel gcc-c++ gtk3-devel libcurl-devel libdecor-devel libevdev-devel libICE-devel libinput-devel libSM-devel libX11-devel libXau-devel libxcb-devel libXcomposite-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libxkbcommon-devel libxkbcommon-x11-devel libXpresent-devel libXrandr-devel libXrender-devel lld llvm make mesa-libEGL-devel mesa-libGL-devel ninja-build openssl-devel patch pcre2-devel perl-Digest-SHA pipewire-devel pulseaudio-libs-devel systemd-devel wayland-devel xcb-util-cursor-devel xcb-util-devel xcb-util-errors-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xcb-util-xrm-devel zlib-devel
 ```

 #### Building

 1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`, `cd duckstation`.
-2. Build dependencies. You can save these outside of the tree if you like. This will take a while. `scripts/deps/build-dependencies-linux.sh deps`.
+2. Build dependencies. You can save these outside of the tree if you like. This will take a while. `scripts/build-dependencies-linux.sh deps`.
 3. Run CMake to configure the build system. Assuming a build subdirectory of `build-release`, run `cmake -B build-release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_PREFIX_PATH="$PWD/deps" -G Ninja`. If you want a release (optimized) build, include `-DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON`.
 4. Compile the source code. For the example above, run `ninja -C build-release`
 5. Run the binary, located in the build directory under `./build-release/bin/duckstation-qt`.
@@ -199,7 +177,7 @@ Requirements:


 1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`.
-2. Build the dependencies. This will take a while. `scripts/deps/build-dependencies-mac.sh deps`.
+2. Build the dependencies. This will take a while. `scripts/build-dependencies-mac.sh deps`.
 2. Run CMake to configure the build system: `cmake -Bbuild-release -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$PWD/deps"`. 
 4. Compile the source code: `cmake --build build-release --parallel`.
 5. Run the binary, located in the build directory under `bin/DuckStation.app`.
@@ -221,19 +199,16 @@ If you wish to use a "portable" build, where the user directory is the same as w
 in the same directory as the DuckStation executable.

 ## Bindings for Qt frontend
-Your keyboard or game controller can be used to simulate a variety of PlayStation controllers. Controller input is supported through DInput, XInput, and SDL backends and can be changed through `Settings -> Controllers`.
+Your keyboard or game controller can be used to simulate a variety of PlayStation controllers. Controller input is supported through DInput, XInput, and SDL backends and can be changed through `Settings -> General Settings`.

-To bind your input device, go to `Settings -> Controllers`, and select the virtual controller you want to map. Automatic mapping handles the majority of ocntrollers. However, if you need to manually bind a controller, click the box below the button/axis name, and press the key or button on your input device that you wish to bind to.
+To bind your input device, go to `Settings -> Controllers`. Each of the buttons/axes for the simulated controller will be listed, alongside the corresponding key/button on your device that it is currently bound to. To rebind, click the box next to the button/axis name, and press the key or button on your input device that you wish to bind to. When binding rumble, simply press any button on the controller you wish to send rumble to.

 ## SDL Game Controller Database
-DuckStation releases ship with a database of game controller mappings for the SDL controller backend, courtesy of https://github.com/mdqinc/SDL_GameControllerDB. The included `gamecontrollerdb.txt` file can be found in the `resources` subdirectory of the DuckStation program directory.
+DuckStation releases ship with a database of game controller mappings for the SDL controller backend, courtesy of https://github.com/gabomdq/SDL_GameControllerDB. The included `gamecontrollerdb.txt` file can be found in the `database` subdirectory of the DuckStation program directory.

-If you are experiencing issues binding your controller with the SDL controller backend, you may need to add a custom mapping to the database file. Make a copy of `gamecontrollerdb.txt` and place it in your [user directory](#user-directories) (or directly in the program directory, if running in portable mode) and then follow the instructions in the [SDL_GameControllerDB repository](https://github.com/mdqinc/SDL_GameControllerDB) for creating a new mapping. Add this mapping to the new copy of `gamecontrollerdb.txt` and your controller should then be recognized properly.
+If you are experiencing issues binding your controller with the SDL controller backend, you may need to add a custom mapping to the database file. Make a copy of `gamecontrollerdb.txt` and place it in your [user directory](#user-directories) (or directly in the program directory, if running in portable mode) and then follow the instructions in the [SDL_GameControllerDB repository](https://github.com/gabomdq/SDL_GameControllerDB) for creating a new mapping. Add this mapping to the new copy of `gamecontrollerdb.txt` and your controller should then be recognized properly.

 ## Default bindings
-
-Bindings for controllers and hotkeys can be changed in `Settings -> Controllers`.
-
 Controller 1:
 - **Left Stick:** W/A/S/D
 - **Right Stick:** T/F/G/H
@@ -247,11 +222,6 @@ Controller 1:

 Hotkeys:
 - **Escape:** Open Pause Menu
- - **F1:** Load State
- - **F2:** Save State
- - **F3:** Select Previous Save State
- - **F4:** Select Next Save State
- - **F10:** Save Screenshot
 - **F11:** Toggle Fullscreen
 - **Tab:** Temporarily Disable Speed Limiter
 - **Space:** Pause/Resume Emulation
--- a/data/LICENSE.txt
+++ b/data/LICENSE.txt
--- a/data/resources/chtdb.txt
+++ b/data/resources/chtdb.txt
--- a/data/resources/discdb.yaml
+++ b/data/resources/discdb.yaml
@@ -4750,13 +4750,13 @@ SLUS-00784:
        - size: 204887424
          md5: "0ce86b034427b7c79a85bec2f88c6e0e"
 SLPS-01830:
-  name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 1)"
+  name: "Animetic Story Game 1 - Card Captor Sakura (Japan) (Disc 1)"
  trackData:
    - tracks:
        - size: 477145536
          md5: "93653eb589658a67899394ad52acc3cb"
 SLPS-01831:
-  name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 2)"
+  name: "Animetic Story Game 1 - Card Captor Sakura (Japan) (Disc 2)"
  trackData:
    - tracks:
        - size: 455318976
@@ -14685,13 +14685,13 @@ SLUS-00494:
        - size: 32332944
          md5: "cda4ae739eeceb0541886c6ebaa7b57a"
 SLPS-02561:
-  name: "Cardcaptor Sakura - Clow Card Magic (Japan)"
+  name: "Card Captor Sakura - Clowcard Magic (Japan)"
  trackData:
    - tracks:
        - size: 617938608
          md5: "259802e85fb1fe3b5f39c78033c7efd0"
 SLPS-02560:
-  name: "Cardcaptor Sakura - Clow Card Magic (Japan) (Genteiban)"
+  name: "Card Captor Sakura - Clowcard Magic (Japan) (Genteiban)"
  trackData:
    - tracks:
        - size: 617940960
@@ -67487,13 +67487,13 @@ PAPX-90044:
        - size: 331662576
          md5: "de973cbfc9516106adac69984041f7be"
 SCPS-45317:
-  name: "Metal Gear Solid (Japan, Asia) (Disc 1) (Ichi) (Premium Package)"
+  name: "Metal Gear Solid (Asia) (Disc 1)"
  trackData:
    - tracks:
        - size: 710005296
          md5: "d3b48095ed5d2a81a51d2b8ccd2ef766"
 SCPS-45318:
-  name: "Metal Gear Solid (Japan, Asia) (Disc 2) (Ni) (Premium Package)"
+  name: "Metal Gear Solid (Asia) (Disc 2)"
  trackData:
    - tracks:
        - size: 735526848
@@ -67658,6 +67658,18 @@ SLUS-90062:
    - tracks:
        - size: 123924528
          md5: "794c18d04a31d1e7c5b39bbe4d088afa"
+SLPM-86111:
+  name: "Metal Gear Solid [Premium Package Sai Hakkou Kinen]"
+  trackData:
+    - tracks:
+        - size: 710005296
+          md5: "d3b48095ed5d2a81a51d2b8ccd2ef766"
+    - tracks:
+        - size: 735526848
+          md5: "7c43ca912cdbde3f0e23d90f2a799ffa"
+    - tracks:
+        - size: 225474480
+          md5: "c55b7888dee7b6c471d25a0000c4dc32"
 SLPS-00008:
  name: "Metal Jacket (Japan)"
  trackData:
@@ -117477,7 +117489,7 @@ SLPS-00321:
        - size: 4377072
          md5: "00d4f2b9eba8200785726e7b4d427348"
 SLPS-02886:
-  name: "Tetris with Cardcaptor Sakura - Eternal Heart (Japan)"
+  name: "Tetris with Card Captor Sakura - Eternal Heart (Japan)"
  trackData:
    - tracks:
        - size: 382611600
--- a/data/resources/fonts/TwitterColorEmoji-SVGinOT.ttf.zst
+++ b/data/resources/fonts/TwitterColorEmoji-SVGinOT.ttf.zst
--- a/data/resources/fonts/promptfont.otf
+++ b/data/resources/fonts/promptfont.otf
--- a/data/resources/fullscreenui/NTSC-J.png
+++ b/data/resources/fullscreenui/NTSC-J.png
--- a/data/resources/fullscreenui/NTSC-U.png
+++ b/data/resources/fullscreenui/NTSC-U.png
--- a/data/resources/fullscreenui/PAL.png
+++ b/data/resources/fullscreenui/PAL.png
--- a/data/resources/fullscreenui/address-book-new.png
+++ b/data/resources/fullscreenui/address-book-new.png
--- a/data/resources/fullscreenui/applications-system.png
+++ b/data/resources/fullscreenui/applications-system.png
--- a/data/resources/fullscreenui/backgrounds/Default.glsl
+++ b/data/resources/fullscreenui/backgrounds/Default.glsl
@@ -1,9 +0,0 @@
-void main()
-{
-  // Radial gradient at (0.6, 0.4), moving horizontally slowly
-  float r1 = length(v_tex0 - vec2(0.6, 0.4));
-  float r2 = length(v_tex0 - vec2(0.61, 0.41));
-  float r = mix(r1, r2, sin(u_time / 10.0));
-  vec3 bg_color = vec3(r * 0.33);
-  o_col0 = vec4(bg_color, 1.0);
-}
--- a/data/resources/fullscreenui/backgrounds/Trails.glsl
+++ b/data/resources/fullscreenui/backgrounds/Trails.glsl
@@ -1,30 +0,0 @@
-const float PI = 3.14159265359;
-const float SCALE = 150.0;
-const float LENGTH = 7.5;
-
-// https://www.shadertoy.com/view/Xt23Ry
-float rand(float co) {
-  return fract(sin(co * 91.3458) * 47453.5453);
-}
-
-vec3 background(vec2 pos) {
-  // Radial gradient at (0.6, 0.4).
-  float r = length(pos - vec2(0.6, 0.4));
-  return vec3(r * 0.1);
-}
-
-// Inspired by https://www.shadertoy.com/view/Wtl3D7
-vec3 trails(vec2 pos, vec3 bg_color, vec3 fg_color) {
-  float cdist = length(pos) * SCALE;
-  float rv = rand(ceil(cdist));
-  float rotation = u_time * rv * 0.005;
-  float nangle = atan(pos.y, pos.x) / PI;
-  float intensity = smoothstep(rv, rv - 1.5, fract(nangle + rotation + rv * 0.1) * LENGTH) * step(0.1, cdist / SCALE);
-  return mix(bg_color, fg_color * rv, intensity);
-}
-
-void main() {
-  vec3 bg_color = background(v_tex0);
-  vec3 fg_color = vec3(0.7, 0.7, 1.5);
-  o_col0 = vec4(trails(v_tex0, bg_color, fg_color), 1.0);
-}
--- a/data/resources/fullscreenui/drive-cdrom.png
+++ b/data/resources/fullscreenui/drive-cdrom.png
--- a/data/resources/fullscreenui/media-cdrom.png
+++ b/data/resources/fullscreenui/media-cdrom.png
--- a/data/resources/fullscreenui/multimedia-player.png
+++ b/data/resources/fullscreenui/multimedia-player.png
--- a/data/resources/fullscreenui/star-0.png
+++ b/data/resources/fullscreenui/star-0.png
--- a/data/resources/fullscreenui/star-1.png
+++ b/data/resources/fullscreenui/star-1.png
--- a/data/resources/fullscreenui/star-2.png
+++ b/data/resources/fullscreenui/star-2.png
--- a/data/resources/fullscreenui/star-3.png
+++ b/data/resources/fullscreenui/star-3.png
--- a/data/resources/fullscreenui/star-4.png
+++ b/data/resources/fullscreenui/star-4.png
--- a/data/resources/fullscreenui/star-5.png
+++ b/data/resources/fullscreenui/star-5.png
--- a/data/resources/gamecontrollerdb.txt
+++ b/data/resources/gamecontrollerdb.txt
@@ -3,7 +3,6 @@

 # Windows
 03000000300f00000a01000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
-03000000fa190000918d000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
 03000000fa2d00000100000000000000,3dRudder Foot Motion Controller,leftx:a0,lefty:a1,rightx:a5,righty:a2,platform:Windows,
 03000000d0160000040d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
 03000000d0160000050d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
@@ -20,7 +19,6 @@
 03000000801000000900000000000000,8BitDo F30 Arcade Stick,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001038000000000000,8BitDo F30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000090000000000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-05000000c82d00006a28000000000000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Windows,
 03000000c82d00001251000000000000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00001151000000000000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000150000000000000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
@@ -74,8 +72,6 @@
 03000000c82d00000260000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000261000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00001230000000000000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000c82d00001b30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000c82d00001d30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001530000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001630000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001730000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
@@ -109,9 +105,6 @@
 03000000491900001904000000000000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
 03000000710100001904000000000000,Amazon Luna Controller,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b8,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b4,rightstick:b7,rightx:a3,righty:a4,start:b6,x:b3,y:b2,platform:Windows,
 0300000008100000e501000000000000,Anbernic Game Pad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000020500000913000000000000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
-03000000373500000710000000000000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000373500004610000000000000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000830500000160000000000000,Arcade,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b4,platform:Windows,
 03000000120c0000100e000000000000,Armor 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000490b00004406000000000000,ASCII Seamic Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
@@ -122,7 +115,6 @@
 03000000050b00000679000000000000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,start:b3,platform:Windows,
 03000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
-03000000380800001889000000000000,AtGames Legends Gamer Pro,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b13,lefttrigger:b14,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 030000008a3500000102000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
 030000008a3500000201000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
 030000008a3500000302000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
@@ -176,6 +168,8 @@
 030000004f04000020b3000000000000,Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
 03000000bd12000002e0000000000000,Dual Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
 03000000ff1100003133000000000000,DualForce,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b1,platform:Windows,
+030000008f0e00000910000000000000,DualShock 2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000317300000100000000000000,DualShock 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 030000006f0e00003001000000000000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000fc0400000250000000000000,Easy Grip,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
 03000000bc2000000091000000000000,EasySMX Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
@@ -245,7 +239,6 @@
 03000000f025000031c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f0250000c383000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f0250000c483000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000d11800000094000000000000,Google Stadia Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b11,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
 030000004f04000026b3000000000000,GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 0300000079000000d418000000000000,GPD Win,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000c6240000025b000000000000,GPX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
@@ -272,8 +265,8 @@
 030000000d0f00005100000000000000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00008600000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000000d0f0000ba00000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000000d0f00008800000000000000,Hori Fighting Stick mini 4 PS3,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
-030000000d0f00008700000000000000,Hori Fighting Stick mini 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f00008800000000000000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+030000000d0f00008700000000000000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 030000000d0f00001000000000000000,Hori Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00003200000000000000,Hori Fightstick 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f0000c000000000000000,Hori Fightstick 4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
@@ -325,13 +318,11 @@
 030000000d0f0000c100000000000000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f0000f600000000000000,Horipad Nintendo Switch Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000000d0f00006700000000000000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000000d0f00009601000000000000,Horipad Steam,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b2,paddle1:b15,paddle2:b5,paddle3:b19,paddle4:b18,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 030000000d0f0000dc00000000000000,Horipad Switch,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000242e00000b20000000000000,Hyperkin Admiral N64 Controller,+rightx:b11,+righty:b13,-rightx:b8,-righty:b12,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,platform:Windows,
 03000000242e0000ff0b000000000000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Windows,
 03000000790000004e95000000000000,Hyperkin N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a5,righty:a2,start:b9,platform:Windows,
 03000000242e00006a48000000000000,Hyperkin RetroN Sq,a:b3,b:b7,back:b5,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b0,rightshoulder:b1,start:b4,x:b2,y:b6,platform:Windows,
-03000000242f00000a20000000000000,Hyperkin Scout,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
 03000000242e00006a38000000000000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Windows,
 03000000d81d00000e00000000000000,iBuffalo AC02 Arcade Joystick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,rightx:a2,righty:a5,start:b8,x:b4,y:b5,platform:Windows,
 03000000d81d00000f00000000000000,iBuffalo BSGP1204 Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
@@ -414,7 +405,6 @@
 03000000242f00007300000000000000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
 0300000079000000d218000000000000,Mayflash Magic NS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000d620000010a7000000000000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000242e0000f500000000000000,Mayflash N64 Adapter,a:b2,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
 03000000242f0000f400000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
 03000000790000007918000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,righttrigger:b7,rightx:a3,righty:a2,start:b8,platform:Windows,
 030000008f0e00001030000000000000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
@@ -486,15 +476,19 @@
 03000000790000002201000000000000,PC Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 030000006f0e00008501000000000000,PDP Fightpad Pro GameCube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000006f0e00000901000000000000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000006f0e00008901000000000000,PDP Realmz Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000008f0e00004100000000000000,PlaySega,a:b1,b:b0,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b4,y:b3,platform:Windows,
-03000000d620000011a7000000000000,PowerA Core Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000666600006706000000000000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Windows,
+03000000e30500009605000000000000,PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004c050000da0c000000000000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000632500002306000000000000,PlayStation Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000f0250000c183000000000000,PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d9040000160f000000000000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000004c0500003713000000000000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000011a7000000000000,PowerA Core Plus GameCube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 03000000dd62000015a7000000000000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000012a7000000000000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000dd62000016a7000000000000,PowerA Fusion Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000013a7000000000000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000d62000003340000000000000,PowerA OPS Pro Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000d62000002640000000000000,PowerA OPS Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000d62000006dca000000000000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 0300000062060000d570000000000000,PowerA PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000014a7000000000000,PowerA Spectra Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
@@ -593,7 +587,6 @@
 030000009b2800002c00000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
 030000009b2800008000000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
 03000000790000008f18000000000000,Rapoo Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
-0300000032150000a602000000000000,Razer Huntsman V3 Pro,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b12,dpright:b13,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000321500000003000000000000,Razer Hydra,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000f8270000bf0b000000000000,Razer Kishi,a:b6,b:b7,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b18,leftshoulder:b12,leftstick:b19,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b13,rightstick:b20,righttrigger:b15,rightx:a3,righty:a4,start:b17,x:b9,y:b10,platform:Windows,
 03000000321500000204000000000000,Razer Panthera PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
@@ -678,21 +671,13 @@
 03000000811700009d0a000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
 030000008b2800000300000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
 03000000921200004653000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
-030000008f0e00000910000000000000,Sony DualShock 2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
-03000000317300000100000000000000,Sony DualShock 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
-03000000666600006706000000000000,Sony PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Windows,
-03000000e30500009605000000000000,Sony PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
-030000004c050000da0c000000000000,Sony PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
-03000000632500002306000000000000,Sony PlayStation Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
-03000000f0250000c183000000000000,Sony PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000d9040000160f000000000000,Sony PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 03000000ff000000cb01000000000000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
-030000004c0500003713000000000000,Sony PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
 03000000341a00000208000000000000,Speedlink 6555,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:-a4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a3,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
 03000000341a00000908000000000000,Speedlink 6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 03000000380700001722000000000000,Speedlink Competition Pro,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,x:b2,y:b3,platform:Windows,
 030000008f0e00000800000000000000,Speedlink Strike FX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000c01100000591000000000000,Speedlink Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d11800000094000000000000,Stadia Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b11,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
 03000000de280000fc11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000de280000ff11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000120c0000160e000000000000,Steel Play Metaltech PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
@@ -702,6 +687,7 @@
 03000000381000003014000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000381000003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000381000001814000000000000,SteelSeries Stratus XL,a:b0,b:b1,back:b18,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b19,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000001c18000000000000,STK 7024X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000380700003847000000000000,Street Fighter Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,start:b7,x:b2,y:b3,platform:Windows,
 030000001f08000001e4000000000000,Super Famicom Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
 03000000790000000418000000000000,Super Famicom Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b33,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
@@ -716,18 +702,17 @@
 03000000b50700001203000000000000,Techmobility X6-38V,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
 03000000ba2200000701000000000000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b2,platform:Windows,
 03000000c61100001000000000000000,Tencent Xianyou Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,x:b3,y:b4,platform:Windows,
-03000000790000001c18000000000000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000790000002601000000000000,TGZ Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000002601000000000000,TGZ,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
 03000000591c00002400000000000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
 03000000591c00002600000000000000,THEGamepad,a:b2,b:b1,back:b6,leftx:a0,lefty:a1,start:b7,x:b3,y:b0,platform:Windows,
 030000004f04000015b3000000000000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
 030000004f04000023b3000000000000,Thrustmaster Dual Trigger PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000004f0400000ed0000000000000,Thrustmaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000004f04000008d0000000000000,Thrustmaster Ferrari 150 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f0400000ed0000000000000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000008d0000000000000,ThrustMaster Ferrari 150 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Windows,
 030000004f04000004b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
-030000004f04000003d0000000000000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000004f04000009d0000000000000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000003d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000009d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006d04000088ca000000000000,Thunderpad,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000666600000288000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000666600000488000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
@@ -755,7 +740,6 @@
 03000000bd12000012d0000000000000,USB Controller,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
 03000000ff1100004133000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 03000000632500002305000000000000,USB Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000882800000305000000000000,V5 Game Pad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,x:b2,y:b3,platform:Windows,
 03000000790000001a18000000000000,Venom,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000790000001b18000000000000,Venom Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00000302000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
@@ -787,6 +771,7 @@
 03000000120c00000a88000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000120c00001088000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2~,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5~,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000002a0600002000000000000000,Xbox Controller,a:b0,b:b1,back:b13,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b5,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b15,righttrigger:b7,rightx:a2,righty:a5,start:b12,x:b2,y:b3,platform:Windows,
+03000000300f00008888000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:b13,dpleft:b10,dpright:b11,dpup:b12,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000380700001645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000380700002645000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000380700003645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
@@ -795,6 +780,7 @@
 030000005e0400008502000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e0400008702000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 030000005e0400008902000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b10,leftstick:b8,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b9,righttrigger:b4,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00006300000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e0400000c0b000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
@@ -828,7 +814,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
 03000000c82d00000090000001000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000c82d00006a28000000010000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Mac OS X,
 03000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001251000000020000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
@@ -870,8 +855,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000260000001000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-03000000c82d00001b30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-03000000c82d00001d30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00001530000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00001630000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00001730000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
@@ -884,21 +867,20 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a31,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000491900001904000001010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Mac OS X,
 03000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
-0300000008100000e501000019040000,Anbernic Handheld,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000373500004610000001000000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+0300000008100000e501000019040000,Anbernic Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000a30c00002700000003030000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000a30c00002800000003030000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a3,lefty:a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000050b00000045000031000000,ASUS Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
 03000000050b00000579000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b42,paddle1:b9,paddle2:b11,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
 03000000050b00000679000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b23,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
-03000000503200000110000045010000,Atari VCS Classic,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:Mac OS X,
+03000000503200000110000045010000,Atari VCS Classic,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:MacOSX
 03000000503200000110000047010000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:Mac OS X,
 03000000503200000210000047010000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000008a3500000102000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
 030000008a3500000201000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000008a3500000202000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
 030000008a3500000402000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-030000008a3500000302000000010000,Backbone One PlayStation Edition,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000302000000010000,Backbone One PlayStationÆ Edition,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
 03000000c62400001a89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
 03000000c62400001b89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000d62000002a79000000010000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
@@ -921,7 +903,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c01100000140000000010000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000006f0e00000102000000000000,GameStop Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 03000000ff1100003133000007010000,GameWare PC Control Pad,a:b2,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Mac OS X,
-03000000d11800000094000000010000,Google Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 030000007d0400000540000001010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000280400000140000000020000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000008f0e00000300000007010000,GreenAsia Joystick,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Mac OS X,
@@ -933,8 +914,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f00008400000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00008500000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000341a00000302000014010000,Hori Fighting Stick Mini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00008800000000010000,Hori Fighting Stick mini 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00008700000000010000,Hori Fighting Stick mini 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008800000000010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008700000000010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00004d00000000000000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00003801000008010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Mac OS X,
 030000000d0f00009200000000010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
@@ -998,9 +979,11 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Mac OS X,
 03000000550900001472000025050000,NVIDIA Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Mac OS X,
 030000004b120000014d000000010000,Nyko Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Mac OS X,
-03000000790000001c18000000010000,PB Tails Choc,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000006f0e00000901000002010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000008f0e00000300000000000000,Piranha Xtreme PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000666600006706000088020000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Mac OS X,
+030000004c050000da0c000000010000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000004c0500003713000000010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000d620000011a7000000020000,PowerA Core Plus Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
 03000000d620000011a7000010050000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000d62000006dca000000010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
@@ -1018,7 +1001,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000005e040000e002000001000000,PXN P30 Pro Mobile,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
-03000000222c00000225000000010000,Qanba Dragon Arcade Joystick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000222c00000225000000010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000222c00000020000000010000,Qanba Drone Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000009b2800005600000020020000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Mac OS X,
 030000009b2800008000000022020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Mac OS X,
@@ -1051,12 +1034,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000b40400000a01000000000000,Sega Saturn,a:b0,b:b1,back:b5,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Mac OS X,
 030000003512000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
 0300000000f00000f100000000000000,SNES RetroPort,a:b2,b:b3,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,rightshoulder:b7,start:b6,x:b0,y:b1,platform:Mac OS X,
-03000000bc2000000155000000010000,SNK NEOGEO Arcade Stick Pro,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b2,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b11,x:b0,y:b3,platform:Mac OS X,
 030000004c050000a00b000000000000,Sony DualShock 4 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000004c050000cc09000000000000,Sony DualShock 4 V2,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
-03000000666600006706000088020000,Sony PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Mac OS X,
-030000004c050000da0c000000010000,Sony PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
-030000004c0500003713000000010000,Sony PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 030000005e0400008e02000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 03000000110100002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
 03000000110100002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
@@ -1075,7 +1055,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000591c00002400000021000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Mac OS X,
 03000000591c00002600000021000000,THEGamepad,a:b2,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Mac OS X,
 030000004f04000015b3000000000000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Mac OS X,
-030000004f0400000ed0000000020000,Thrustmaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004f0400000ed0000000020000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Mac OS X,
 03000000571d00002100000021000000,Tomee NES Controller Adapter,a:b1,b:b0,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,start:b3,platform:Mac OS X,
 03000000bd12000015d0000000010000,Tomee Retro Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
@@ -1101,7 +1081,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
-030000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
@@ -1111,9 +1091,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e040000130b000009050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000130b000015050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-030000005e040000130b000007050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000130b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-030000005e040000130b000022050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000220b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000120c0000100e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
@@ -1121,12 +1099,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,

 # Linux
 03000000c82d00000031000011010000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-03000000c82d00000631000000010000,8BitDo Adapter 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
 03000000021000000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-05000000c82d00006a28000000010000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Linux,
 03000000c82d00001251000011010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
@@ -1140,7 +1116,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
 03000000c82d00001590000011010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-03000000c82d00006928000011010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
 05000000c82d00006928000000010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
 05000000c82d00002590000001000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000008000000210000011010000,8BitDo NES30,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
@@ -1162,7 +1137,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000331000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000431000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Linux,
-03000000c82d00000060000011010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00000060000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00000061000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 030000003512000012ab000010010000,8BitDo SFC30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
@@ -1181,9 +1155,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000202800000900000000010000,8BitDo SNES30,a:b1,b:b0,back:b10,dpdown:b122,dpleft:b119,dpright:b120,dpup:b117,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-03000000c82d00000a31000014010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000c82d00001d30000011010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-05000000c82d00001b30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00001530000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00001630000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00001730000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
@@ -1198,6 +1169,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000a00500003232000001000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
 05000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00001890000011010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+050000005e040000e002000030110000,8BitDo Zero 2,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
 05000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c01100000355000011010000,Acrux Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006f0e00008801000011010000,Afterglow Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
@@ -1210,10 +1182,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000491900000204000021000000,Amazon Fire Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b17,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000491900001904000011010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
 05000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
-0300000008100000e501000001010000,Anbernic Handheld,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Linux,
-03000000020500000913000010010000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-03000000373500000710000010010000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-05000000373500004610000001000000,Anbernic RG P01,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+0300000008100000e501000001010000,Anbernic Gamepad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Linux,
 03000000790000003018000011010000,Arcade Fightstick F300,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 03000000a30c00002700000011010000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000a30c00002800000011010000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
@@ -1253,7 +1222,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000b0400003365000000010000,Competition Pro,a:b0,b:b1,back:b2,leftx:a0,lefty:a1,start:b3,platform:Linux,
 03000000260900008888000000010000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Linux,
 03000000a306000022f6000011010000,Cyborg V3 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
-030000005e0400008e02000002010000,Data Frog S80,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
 03000000791d00000103000010010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 030000006f0e00003001000001010000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000c11100000191000011010000,EasySMX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
@@ -1286,10 +1254,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 190000004b4800000010000001010000,GO-Advance Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b13,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b16,righttrigger:b15,start:b17,x:b2,y:b3,platform:Linux,
 190000004b4800000011000000010000,GO-Super Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b16,leftshoulder:b4,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b15,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b2,y:b3,platform:Linux,
 03000000f0250000c183000010010000,Goodbetterbest Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000d11800000094000011010000,Google Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
-05000000d11800000094000000010000,Google Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 0300000079000000d418000000010000,GPD Win 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000001010000,GPD Win Max 2 6800U Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000001010000,GPD Win Max 2 (6800U) Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000007d0400000540000000010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 03000000280400000140000000010000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 030000008f0e00000610000000010000,GreenAsia Electronics Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Linux,
@@ -1303,12 +1269,12 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f00008400000011010000,Hori Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00005f00000011010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00005e00000011010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-030000000d0f00005001000009040000,Hori Fighting Commander Octa Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00005001000009040000,Hori Fighting Commander OCTA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00008500000010010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00008600000002010000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 030000000d0f00003701000013010000,Hori Fighting Stick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b3,y:b2,platform:Linux,
-030000000d0f00008800000011010000,Hori Fighting Stick mini 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00008700000011010000,Hori Fighting Stick mini 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,rightstick:b11,righttrigger:a4,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000000d0f00008800000011010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008700000011010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,rightstick:b11,righttrigger:a4,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000000d0f00001000000011010000,Hori Fightstick 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 03000000ad1b000003f5000033050000,Hori Fightstick VX,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b8,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
 030000000d0f00004d00000011010000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
@@ -1325,7 +1291,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f00008501000015010000,Hori Switch Split Pad Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00006e00000011010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00006600000011010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-030000000d0f0000ee00000011010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f0000ee00000011010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f0000c100000011010000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00006700000001010000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 050000000d0f0000f600000001000000,Horipad Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
@@ -1348,7 +1314,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000632500007505000011010000,Ipega PG 9099,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 0500000049190000030400001b010000,Ipega PG9099,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 05000000491900000204000000000000,Ipega PG9118,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-03000000300f00001101000010010000,Jess Tech Colour Rumble Pad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
 03000000300f00001001000010010000,Jess Tech Dual Analog Rumble,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
 03000000300f00000b01000010010000,Jess Tech GGE909 PC Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 03000000ba2200002010000001010000,Jess Technology Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
@@ -1387,7 +1352,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000380700001647000010040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000380700003847000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000ad1b000016f0000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000120c00000500000000010000,Manta DualShock 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000120c00000500000000010000,Manta Dualshock 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
 030000008f0e00001330000010010000,Mayflash Controller Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
 03000000790000004318000010010000,Mayflash GameCube Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
 03000000790000004418000010010000,Mayflash GameCube Controller,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
@@ -1424,7 +1389,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000005e040000050b000003090000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 050000005e0400008e02000030110000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b13,paddle3:b12,paddle4:b14,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000120b00000b050000,Microsoft Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-060000005e040000120b000001050000,Microsoft Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b000001050000,Microsoft Xbox Series X Controller,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,guide:b8,leftshoulder:b4,rightshoulder:b5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,platform:Linux,
 03000000030000000300000002000000,Miroof,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
 03000000790000001c18000010010000,Mobapad Chitu HD,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 050000004d4f435554452d3035335800,Mocute 053X,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
@@ -1438,13 +1403,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000c62400001a89000000010000,MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000250900006688000000010000,MP8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
 030000005e0400008e02000010020000,MSI GC20 V2,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000f70600000100000000010000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Linux,
 030000006f0e00001311000011010000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Linux,
 030000006b1400000906000014010000,Nacon Asymmetric Wireless PS4 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006b140000010c000010010000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000853200000706000012010000,Nacon GC-100,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-0300000085320000170d000011010000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-0300000085320000190d000011010000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000000d0f00000900000010010000,Natec Genesis P44,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000004f1f00000800000011010000,NeoGeo PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 0300000092120000474e000000010000,NeoGeo X Arcade Stick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b3,y:b2,platform:Linux,
@@ -1473,8 +1435,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b8,start:b10,x:b3,y:b2,platform:Linux,
 050000007e0500001720000001800000,NSO SNES Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
 03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
-03000000550900001472000011010000,NVIDIA Controller,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
-05000000550900001472000001000000,NVIDIA Controller,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
+03000000550900001472000011010000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
+05000000550900001472000001000000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
 030000004b120000014d000000010000,NYKO Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
 03000000451300000830000010010000,NYKO CORE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 19000000010000000100000001010000,ODROID Go 2,a:b1,b:b0,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,guide:b10,leftshoulder:b4,leftstick:b12,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b14,start:b15,x:b2,y:b3,platform:Linux,
@@ -1499,9 +1461,13 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006f0e0000a702000023020000,PDP Xbox One Raven Black,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000d802000006640000,PDP Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000ef02000007640000,PDP Xbox Series Kinetic Wired Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000666600006706000000010000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Linux,
+030000004c050000da0c000011010000,PlayStation Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000d9040000160f000000010000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000004c0500003713000011010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400003a54000001010000,PowerA 1428124-01,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000d620000011a7000011010000,PowerA Core Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000011a7000011010000,PowerA Core Plus Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000dd62000015a7000011010000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000d620000012a7000011010000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000d62000000140000001010000,PowerA Fusion Pro 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1517,9 +1483,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d62000000f20000001010000,PowerA Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d62000000b20000001010000,PowerA Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000d62000000540000001010000,PowerA Advantage Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d040000d2ca000011010000,Precision Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000250900000017000010010000,PS/SS/N64 Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b5,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2~,righty:a3,start:b8,platform:Linux,
 03000000ff1100004133000010010000,PS2 Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
@@ -1537,7 +1501,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 060000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
 030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-030000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
@@ -1554,20 +1517,16 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000004c050000e60c000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000e60c000011810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 030000004c050000f20d000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-030000004c050000f20d000011810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 050000004c050000e60c000000810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-050000004c050000f20d000000810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 03000000300f00001211000011010000,Qanba Arcade Joystick,a:b2,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b9,x:b1,y:b3,platform:Linux,
-03000000222c00000225000011010000,Qanba Dragon Arcade Joystick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000222c00000025000011010000,Qanba Dragon Arcade Joystick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-03000000222c00001220000011010000,Qanba Drone 2 Arcade Joystick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-03000000222c00001020000011010000,Qanba Drone 2 Arcade Joystick PS5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000225000011010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000025000011010000,Qanba Dragon Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000222c00000020000011010000,Qanba Drone Arcade PS4 Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000300f00001210000010010000,Qanba Joystick Plus,a:b0,b:b1,back:b8,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,start:b9,x:b2,y:b3,platform:Linux,
-03000000222c00000223000011010000,Qanba Obsidian Arcade Joystick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000222c00000023000011010000,Qanba Obsidian Arcade Joystick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000222c00000223000011010000,Qanba Obsidian Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000023000011010000,Qanba Obsidian Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000009b2800000300000001010000,Raphnet 4nes4snes,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
 030000009b2800004200000001010000,Raphnet Dual NES Adapter,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Linux,
 0300132d9b2800006500000000000000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
@@ -1591,8 +1550,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 0300000032150000030a000001010000,Razer Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000321500000b10000011010000,Razer Wolverine PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-030000000d0f0000c100000010010000,Retro Bit Legacy16,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b12,leftshoulder:b4,lefttrigger:b6,misc1:b13,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f0000c100000072056800,Retro Bit Legacy16,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b5,leftshoulder:b9,lefttrigger:+a4,misc1:b11,rightshoulder:b10,righttrigger:+a5,start:b6,x:b3,y:b2,platform:Linux,
 03000000790000001100000010010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Linux,
 0300000003040000c197000011010000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
 190000004b4800000111000000010000,RetroGame Joypad,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
@@ -1607,11 +1564,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006f0e00001e01000011010000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000c6240000fefa000000010000,Rock Candy Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00004601000001010000,Rock Candy Xbox One Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000a306000023f6000011010000,Saitek Cyborg PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000a306000023f6000011010000,Saitek Cyborg V1 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000a30600001005000000010000,Saitek P150,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b2,righttrigger:b5,x:b3,y:b4,platform:Linux,
 03000000a30600000701000000010000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Linux,
 03000000a30600000cff000010010000,Saitek P2500 Force Rumble,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b0,y:b1,platform:Linux,
-03000000a30600000d5f000010010000,Saitek P2600,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
 03000000a30600000c04000011010000,Saitek P2900,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b12,x:b0,y:b3,platform:Linux,
 03000000a306000018f5000010010000,Saitek P3200 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000300f00001201000010010000,Saitek P380,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
@@ -1634,16 +1590,13 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000f025000021c1000010010000,Shanwan Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000341a00000908000010010000,SL6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-030000004b2900000430000011000000,Snakebyte Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 050000004c050000cc09000001000000,Sony DualShock 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
-03000000666600006706000000010000,Sony PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Linux,
-030000004c050000da0c000011010000,Sony PlayStation Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
-03000000d9040000160f000000010000,Sony PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 03000000ff000000cb01000010010000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
-030000004c0500003713000011010000,Sony PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000250900000500000000010000,Sony PS2 pad with SmartJoy Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
 030000005e0400008e02000073050000,Speedlink Torid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400008e02000020200000,SpeedLink Xeox Pro Analog,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d11800000094000011010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000de2800000112000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000de2800000112000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:+a5,dpleft:-a4,dpright:+a4,dpup:-a5,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,paddle1:b15,paddle2:b16,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
 03000000de2800000211000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
@@ -1673,7 +1626,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000e40a00000307000011010000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
 03000000e40a00000207000011010000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
 03000000ba2200000701000001010000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b2,platform:Linux,
-03000000790000001c18000011010000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000790000001c18000011010000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000591c00002400000010010000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
 03000000591c00002600000010010000,THEGamepad,a:b2,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
 030000004f04000015b3000001010000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
@@ -1719,14 +1672,12 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e040000a102000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000030060000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006f0e00001503000000020000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400008e02000000010000,Xbox 360 EasySMX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000014010000,Xbox 360 Receiver,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-0000000058626f782047616d65706100,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400000202000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
-030000005e0400008e02000072050000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00001304000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000ffff0000ffff000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+0000000058626f782047616d65706100,Xbox Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400000a0b000005040000,Xbox One Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
 030000005e040000d102000002010000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1738,10 +1689,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000005e040000220b000013050000,Xbox One Elite 2 Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 050000005e040000050b000002090000,Xbox One Elite Series 2,a:b0,b:b1,back:b136,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 030000005e040000ea02000011050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000ea02000015050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 060000005e040000ea0200000b050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 060000005e040000ea0200000d050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-060000005e040000ea02000016050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000120b000001050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000120b000005050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000120b000007050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1785,7 +1734,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 33313433353539306634656436353432,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 38426974446f20446f67626f6e65204d,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
 34343439373236623466343934376233,8BitDo FC30 Pro,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b28,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b29,righttrigger:b7,start:b5,x:b30,y:b2,platform:Android,
-38426974446f204e4743204d6f646b69,8BitDo GameCube,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b18,paddle2:b17,rightshoulder:b15,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b1,y:b3,platform:Android,
 38426974446f2038426974446f204c69,8BitDo Lite,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 30643332373663313263316637356631,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 38426974446f204c6974652032000000,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
@@ -1859,7 +1807,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 63396666386564393334393236386630,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
 63633435623263373466343461646430,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
 32333634613735616163326165323731,Amazon Luna Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
-4c696e757820342e31392e3137322077,Anbernic Handheld,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+4c696e757820342e31392e3137322077,Anbernic Gamepad,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Android,
 417374726f2063697479206d696e6920,Astro City Mini,a:b23,b:b22,back:b29,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
 35643263313264386134376362363435,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,start:b6,platform:Android,
 32353831643566306563643065356239,Atari VCS Modern Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
@@ -1873,8 +1821,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000bc20000000550000ffff3f00,GameSir G3w,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 34323662653333636330306631326233,Google Nexus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 35383633353935396534393230616564,Google Stadia Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-476f6f676c65204c4c43205374616469,Google Stadia Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-5374616469614e3848532d6532633400,Google Stadia Controller,a:b0,b:b1,back:b15,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000d6020000e5890000dfff3f00,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
 05000000d6020000e5890000dfff3f80,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,platform:Android,
 66633030656131663837396562323935,Hori Battle,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
@@ -1948,11 +1894,14 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 39383335313438623439373538343266,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b16,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
 4f5559412047616d6520436f6e74726f,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b6,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
 506572666f726d616e63652044657369,PDP PS3 Rock Candy Controller,a:b1,b:b17,back:h0.2,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b0,y:b2,platform:Android,
+62653335326261303663356263626339,PlayStation Classic Controller,a:b19,b:b1,back:b17,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b3,rightshoulder:b10,righttrigger:b20,start:b18,x:b2,y:b0,platform:Android,
+536f6e7920496e746572616374697665,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+576972656c65737320436f6e74726f6c,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 61653962353232366130326530363061,Pokken,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,rightshoulder:b20,righttrigger:b10,start:b18,x:b0,y:b2,platform:Android,
 32666633663735353234363064386132,PS2,a:b23,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a3,righty:a2,start:b30,x:b24,y:b21,platform:Android,
 050000004c05000068020000dfff3f00,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 536f6e7920504c415953544154494f4e,PS3 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-61363034663839376638653463633865,PS3 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61363034663839376638653463633865,PS3 Controller,a:b0,b:b1,back:b15,dpdown:a14,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 66366539656564653432353139356536,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 66383132326164626636313737373037,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 050000004c050000c405000000783f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
@@ -1975,7 +1924,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 65366465656364636137653363376531,PS4 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
 66613532303965383534396638613230,PS4 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
 050000004c050000e60c0000fffe3f00,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
-050000004c050000e60c0000fffe3f80,PS5 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a3,rightx:a4,righty:a5,start:b16,x:b2,y:b17,platform:Android,
+050000004c050000e60c0000fffe3f80,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a3,rightx:a4,righty:a5,start:b16,x:b0,y:b2,platform:Android,
 050000004c050000e60c0000ffff3f00,PS5 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 32346465346533616263386539323932,PS5 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 32633532643734376632656664383733,PS5 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
@@ -2016,11 +1965,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 38376662666661636265313264613039,SNES,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
 5346432f555342205061640000000000,SNES Adapter,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
 5553422047616d657061642000000000,SNES Controller,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
-62653335326261303663356263626339,Sony PlayStation Classic Controller,a:b19,b:b1,back:b17,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b3,rightshoulder:b10,righttrigger:b20,start:b18,x:b2,y:b0,platform:Android,
-536f6e7920496e746572616374697665,Sony PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-576972656c65737320436f6e74726f6c,Sony PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 63303964303462366136616266653561,Sony PSP,a:b21,b:b22,back:b27,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b23,y:b24,platform:Android,
 63376637643462343766333462383235,Sony Vita,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a3,righty:a4,start:b18,x:b0,y:b2,platform:Android,
+476f6f676c65204c4c43205374616469,Stadia Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+5374616469614e3848532d6532633400,Stadia Controller,a:b0,b:b1,back:b15,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
 05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
 0500000011010000201400000f7e0f00,SteelSeries Nimbus,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,x:b19,y:b2,platform:Android,
@@ -2030,7 +1978,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 62363434353532386238336663643836,TGZ Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 37323236633763666465316365313236,THEC64 Joystick,a:b21,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b27,x:b23,y:b24,platform:Android,
 38346162326232346533316164363336,THEGamepad,a:b23,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b24,y:b21,platform:Android,
-050000004f0400000ed00000fffe3f00,Thrustmaster eSwap Pro Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004f0400000ed00000fffe3f00,ThrustMaster eSwap Pro Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 5477696e20555342204a6f7973746963,Twin Joystick,a:b22,b:b21,back:b28,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,leftstick:b30,lefttrigger:b24,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b31,righttrigger:b25,rightx:a3,righty:a2,start:b29,x:b23,y:b20,platform:Android,
 30623739343039643830333266346439,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 31643365666432386133346639383937,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
--- a/data/resources/images/flags/Catalan.svg
+++ b/data/resources/images/flags/Catalan.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="810" height="540">
-<rect width="810" height="540" fill="#FCDD09"/>
-<path stroke="#DA121A" stroke-width="60" d="M0,90H810m0,120H0m0,120H810m0,120H0"/>
-</svg>
--- a/data/resources/images/flags/Chinese.svg
+++ b/data/resources/images/flags/Chinese.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="900" height="600"><path fill="#EE1C25" d="M0 0h900v600H0"/><g transform="translate(150,150) scale(3)"><path id="s" d="M0,-30 17.63355,24.27051 -28.53171,-9.27051H28.53171L-17.63355,24.27051" fill="#FF0"/></g><use xlink:href="#s" transform="translate(300,60) rotate(23.036243)"/><use xlink:href="#s" transform="translate(360,120) rotate(45.869898)"/><use xlink:href="#s" transform="translate(360,210) rotate(69.945396)"/><use xlink:href="#s" transform="translate(300,270) rotate(20.659808)"/></svg>
--- a/data/resources/images/flags/Czech.svg
+++ b/data/resources/images/flags/Czech.svg
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="900" height="600">
-	<rect width="900" height="600" fill="#d7141a"/>
-	<rect width="900" height="300" fill="#fff"/>
-	<path d="M 450,300 0,0 V 600 z" fill="#11457e"/>
-</svg>
--- a/data/resources/images/flags/Danish.svg
+++ b/data/resources/images/flags/Danish.svg
@@ -1 +0,0 @@
-<?xml version="1.0"?><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 37 28"><path fill="#c8102e" d="M0,0H37V28H0Z"/><path stroke="#fff" stroke-width="4" d="M0,14h37M14,0v28"/></svg>
--- a/data/resources/images/flags/Dutch.svg
+++ b/data/resources/images/flags/Dutch.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600" viewBox="0 0 9 6">
-<rect fill="#21468B"	width="9" height="6"/>
-<rect fill="#FFF" width="9" height="4"/>
-<rect fill="#AE1C28"	width="9" height="2"/>
-</svg>
--- a/data/resources/images/flags/English.svg
+++ b/data/resources/images/flags/English.svg
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
-<clipPath id="s">
-	<path d="M0,0 v30 h60 v-30 z"/>
-</clipPath>
-<clipPath id="t">
-	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
-</clipPath>
-<g clip-path="url(#s)">
-	<path d="M0,0 v30 h60 v-30 z" fill="#012169"/>
-	<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
-	<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#C8102E" stroke-width="4"/>
-	<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
-	<path d="M30,0 v30 M0,15 h60" stroke="#C8102E" stroke-width="6"/>
-</g>
-</svg>
--- a/data/resources/images/flags/Finnish.svg
+++ b/data/resources/images/flags/Finnish.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="1800" height="1100" viewBox="0 0 18 11">
-<rect width="18" height="11" fill="#fff"/>
-<path d="M0,5.5h18M6.5,0v11" stroke="#002F6C" stroke-width="3"/>
-</svg>
--- a/data/resources/images/flags/French.svg
+++ b/data/resources/images/flags/French.svg
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>
--- a/data/resources/images/flags/German.svg
+++ b/data/resources/images/flags/German.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
-	<desc>Flag of Germany</desc>
-	<rect id="black_stripe" width="5" height="3" y="0" x="0" fill="#000"/>
-	<rect id="red_stripe" width="5" height="2" y="1" x="0" fill="#D00"/>
-	<rect id="gold_stripe" width="5" height="1" y="2" x="0" fill="#FFCE00"/>
-</svg>
--- a/data/resources/images/flags/Greek.svg
+++ b/data/resources/images/flags/Greek.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="400" viewBox="0 0 27 18">
-<rect fill="#0D5EAF" width="27" height="18"/>
-<path fill="none" stroke-width="2" stroke="#FFF" d="M5,0V11 M0,5H10 M10,3H27 M10,7H27 M0,11H27 M0,15H27"/>
-</svg>
--- a/data/resources/images/flags/Hebrew.svg
+++ b/data/resources/images/flags/Hebrew.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1100" height="800"><path d="M 0,0 H 1100 V 800 H 0 Z" fill="#fff"/><path d="M 0,75 H 1100 V 200 H 0 Z" fill="#0038b8"/><path d="M 0,600 H 1100 V 725 H 0 Z" fill="#0038b8"/><path d="M 423.81566,472.85253 H 676.18435 L 550.00001,254.29492 Z m 126.18435,72.85255 126.1843,-218.55765 H 423.81566 Z" fill="none" stroke="#0038b8" stroke-width="27.5"/></svg>
--- a/data/resources/images/flags/Iranian.svg
+++ b/data/resources/images/flags/Iranian.svg
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="630" height="360">
-<rect width="630" height="360" fill="#da0000"/>
-<rect width="630" height="240" fill="#fff"/>
-<rect width="630" height="120" fill="#239f40"/>
-<g transform="translate(8.4,100.4)">
-<g id="tb4">
-<g id="tb1" fill="none" stroke="#fff" stroke-width="2">
-<path id="tbp1" d="M0,1H26M1,10V5H9V9H17V5H12M4,9H6M26,9H21V5H29M29,0V9H37V0M33,0V9" transform="scale(1.4)"/>
-<path id="tbp2" d="M0,7H9M10,7H19" transform="scale(2.8)"/>
-<use xlink:href="#tbp2" y="120"/>
-<use xlink:href="#tbp1" y="145.2"/>
-</g>
-<g id="tb3">
-<use xlink:href="#tb1" x="56"/>
-<use xlink:href="#tb1" x="112"/>
-<use xlink:href="#tb1" x="168"/>
-</g>
-</g>
-<use xlink:href="#tb3" x="168"/>
-<use xlink:href="#tb4" x="392"/>
-</g>
-<g fill="#da0000" transform="matrix(45,0,0,45,315,180)">
-<g id="emblem_half">
-<path d="M-0.54815,0.83638A0.912046,0.912046 0 0,0 0.328544,-0.722384A1,1 0 0,1 -0.54815,0.83638"/>
-<path d="M0.618339,0.661409A0.763932,0.763932 0 0,0 0.421644,-0.741049A1,1 0 0,1 0.618339,0.661409"/>
-<path d="M0,1 -0.05,0 0,-0.787278A0.309995,0.309995 0 0,0 0.118034,-0.688191V-0.100406L0.077809,0.892905z"/>
-<path d="M-0.02,-0.85 0,-0.831217A0.14431,0.14431 0 0,0 0.252075,-0.967708A0.136408,0.136408 0 0,1 0,-0.924634"/>
-</g>
-<use xlink:href="#emblem_half" transform="scale(-1,1)"/>
-</g>
-</svg>
--- a/data/resources/images/flags/Italian.svg
+++ b/data/resources/images/flags/Italian.svg
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="1500" height="1000" viewBox="0 0 3 2">
-<rect width="3" height="2" fill="#009246"/>
-<rect width="2" height="2" x="1" fill="#fff"/>
-<rect width="1" height="2" x="2" fill="#ce2b37"/>
-</svg>
--- a/data/resources/images/flags/Korean.svg
+++ b/data/resources/images/flags/Korean.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600" viewBox="-72 -48 144 96"><path fill="#fff" d="M-72-48v96H72v-96z"/><g stroke="#000" stroke-width="4"><path transform="rotate(33.69006752598)" d="M-50-12v24m6 0v-24m6 0v24m76 0V1m0-2v-11m6 0v11m0 2v11m6 0V1m0-2v-11"/><path transform="rotate(-33.69006752598)" d="M-50-12v24m6 0V1m0-2v-11m6 0v24m76 0V1m0-2v-11m6 0v24m6 0V1m0-2v-11"/></g><g transform="rotate(33.69006752598)"><path fill="#cd2e3a" d="M12 0a18 18 0 11-36 0 24 24 0 1148 0"/><path fill="#0047a0" d="M0 0a12 12 0 1124 0 24 24 0 11-48 0 12 12 0 1024 0"/></g></svg>
--- a/data/resources/images/flags/NTSC-J.svg
+++ b/data/resources/images/flags/NTSC-J.svg
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600">
-<desc>Japanese flag</desc>
-<rect fill="#fff" height="600" width="900"/>
-<circle fill="#bc002d" cx="450" cy="300" r="180"/>
-</svg>
--- a/data/resources/images/flags/Non-PS1.svg
+++ b/data/resources/images/flags/Non-PS1.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Creator: CorelDRAW -->
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="400">
-	<rect fill="#969594" width="600" height="400"/>
-	<rect fill="#c2c1c1" width="400" height="400"/>
-	<rect fill="#72706f" width="200" height="400"/>
-</svg>
--- a/data/resources/images/flags/Norwegian.svg
+++ b/data/resources/images/flags/Norwegian.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 22 16">
-	<title>Flag of Norway</title>
-	<rect width="22" height="16" fill="#ba0c2f"/>
-	<path d="M0,8h22M8,0v16" stroke="#fff" stroke-width="4"/>
-	<path d="M0,8h22M8,0v16" stroke="#00205b" stroke-width="2"/>
-</svg>
--- a/data/resources/images/flags/Other.svg
+++ b/data/resources/images/flags/Other.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Creator: CorelDRAW -->
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="400">
-	<rect fill="#969594" width="600" height="400"/>
-	<rect fill="#c2c1c1" width="400" height="400"/>
-	<rect fill="#72706f" width="200" height="400"/>
-	<path fill="#fff" stroke="#000" stroke-width="0.1524" d="M348.367 270.386h-93.7054v-9.3454c0-15.9122 1.768-28.8778 5.3882-38.8124 3.6202-10.0188 9.0086-19.0274 16.1648-27.2782 7.1564-8.2508 23.237-22.7318 48.242-43.443 13.3024-10.8608 19.9534-20.7954 19.9534-29.8038 0-9.0928-2.694-16.0808-7.9982-21.1322-5.3882-4.9674-13.4706-7.4932-24.3314-7.4932-11.7026 0-21.3006 3.873-28.962 11.6186-7.6614 7.6614-12.5446 21.2164-14.6494 40.412l-95.7262-11.871c3.2836-35.1922 16.0808-63.4806 38.3074-84.9496 22.3108-21.469 56.4928-32.1612 102.546-32.1612 35.8658 0 64.7436 7.493 86.8018 22.395 29.8882 20.2902 44.8744 47.2316 44.8744 80.9084 0 13.9758-3.8728 27.5306-11.6186 40.4962-7.6614 12.9656-23.4894 28.8778-47.3158 47.5684-16.5858 13.2182-27.1098 23.7422-31.4878 31.7404-4.2938 7.914-6.4828 18.3538-6.4828 31.151zm-96.989 24.9208h100.441v88.5698H251.378v-88.5698z"/>
-</svg>
--- a/data/resources/images/flags/Polish.svg
+++ b/data/resources/images/flags/Polish.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="640" height="400" viewBox="0 0 8 5">
-<rect width="8" height="5" fill="#dc143c"/>
-<rect width="8" height="2.5" fill="#fff"/>
-</svg>
--- a/data/resources/images/flags/Portuguese.svg
+++ b/data/resources/images/flags/Portuguese.svg
@@ -1,62 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="400">
-	<rect width="600" height="400" fill="#f00"/>
-	<rect width="240" height="400" fill="#060"/>
-	<g fill="#ff0" fill-rule="evenodd" stroke="#000" stroke-width="0.573" stroke-linecap="round" stroke-linejoin="round">
-		<path d="m318.24,262.04c-30.21-0.91-168.74-87.38-169.69-101.15l7.6496-12.757c13.741,19.966,155.36,104.06,169.27,101.08l-7.2299,12.823"/>
-		<path d="m154.59,146.4c-2.7101,7.2937,36.149,31.318,82.903,59.754,46.752,28.434,87.065,46.006,90.053,43.486,0.18256-0.32544,1.4701-2.5409,1.352-2.5232-0.56001,0.84402-1.9234,1.1104-4.0506,0.49741-12.631-3.6433-45.575-18.765-86.374-43.506-40.798-24.743-76.294-47.544-81.811-57.232-0.38363-0.67116-0.65702-1.8962-0.60146-2.8487l-0.13405-0.002-1.1747,2.0532-0.16139,0.32191h-0.00088zm164.36,116.04c-0.51238,0.92957-1.4675,0.96044-3.2816,0.76112-11.3-1.2506-45.589-17.925-86.162-42.213-47.21-28.26-86.2-54.01-81.97-60.74l1.1509-2.0346,0.22665,0.0706c-3.8037,11.405,76.948,57.578,81.702,60.522,46.724,28.947,86.115,45.851,89.601,41.458l-1.2682,2.181v-0.002z"/>
-		<path d="m240.17,169.23c30.237-0.23901,67.55-4.1319,89.023-12.69l-4.6265-7.5168c-12.692,7.0247-50.21,11.644-84.652,12.335-40.736-0.37483-69.49-4.1681-83.897-13.835l-4.3672,8.0045c26.484,11.207,53.623,13.587,88.52,13.703"/>
-		<path d="m330.44,156.71c-0.73904,1.1818-14.743,6.0113-35.373,9.5753-13.988,2.1325-32.234,3.9555-55.004,3.9776-21.633,0.0203-39.305-1.5196-52.684-3.3329-21.656-3.3955-32.833-8.1201-36.965-9.7896,0.39509-0.78581,0.64908-1.337,1.0301-2.0708,11.895,4.736,23.124,7.5918,36.279,9.6158,13.291,1.8,30.75,3.362,52.276,3.3417,22.664-0.0229,40.709-1.9844,54.616-4.0534,21.155-3.4122,32.711-7.8034,34.334-9.8425l1.494,2.5788h-0.002zm-4.0603-7.6226c-2.293,1.8415-13.718,5.8932-33.819,9.1034-13.415,1.9226-30.472,3.6433-52.265,3.6645-20.704,0.0203-37.619-1.375-50.485-3.2491-20.414-2.6661-31.279-7.4754-35.196-8.8776,0.3898-0.67381,0.78666-1.3423,1.1941-2.0135,3.0479,1.5346,13.533,5.7909,34.226,8.7224,12.72,1.8036,29.661,3.1477,50.262,3.1265,21.69-0.0221,38.553-1.7762,51.883-3.6883,20.205-2.7799,31.077-7.9472,32.728-9.241l1.4728,2.4509v0.002z"/>
-		<path d="m140.88,205.66c18.598,10.003,59.905,15.044,98.994,15.391,35.591,0.0564,81.958-5.5016,99.297-14.69l-0.47712-10.012c-5.4246,8.4773-55.113,16.609-99.206,16.276-44.093-0.3325-85.038-7.1429-98.687-15.959l0.0794,8.9914"/>
-		<path d="m340.12,204.22,0.00088,2.3874c-2.606,3.1159-18.946,7.8255-39.437,11.142-15.595,2.391-35.927,4.1945-61.262,4.1945-24.069,0-43.263-1.7163-58.148-4.0014-23.529-3.4264-38.579-9.4262-41.6-11.217l0.0132-2.7852c9.0748,6.0334,33.661,10.447,41.917,11.798,14.788,2.2701,33.868,3.9732,57.817,3.9732,25.216,0,45.434-1.7912,60.931-4.1663,14.701-2.1237,35.644-7.6465,39.767-11.324h0.00088zm0.01-8.4922,0.00088,2.3874c-2.606,3.1142-18.946,7.8237-39.437,11.14-15.595,2.391-35.927,4.1945-61.262,4.1945-24.069,0-43.263-1.7145-58.148-4.0014-23.529-3.4246-38.579-9.4245-41.6-11.216l0.0132-2.7852c9.0748,6.0325,33.661,10.447,41.917,11.796,14.788,2.2719,33.868,3.9758,57.817,3.9758,25.216,0,45.434-1.7921,60.931-4.169,14.701-2.1237,35.644-7.6465,39.767-11.324l0.00088,0.002z"/>
-		<path d="m239.79,260.32c-42.772-0.25489-79.421-11.659-87.16-13.544l5.6433,8.8344c13.67,5.7503,49.424,14.32,81.927,13.371,32.504-0.94809,60.91-3.466,80.928-13.211l5.7862-9.1555c-13.642,6.425-60.068,13.639-87.125,13.705"/>
-		<path stroke-width="0.55" d="m323.3,253.72c-0.85016,1.2991-1.7171,2.5823-2.5963,3.8294-9.4417,3.3293-24.319,6.8245-30.597,7.844-12.824,2.6423-32.665,4.594-50.274,4.6029-37.89-0.55474-68.905-7.9719-83.496-14.299l-1.1773-2.0241,0.19225-0.30427,1.9966,0.77435c25.948,9.2834,55.091,12.987,82.698,13.652,17.538,0.0617,35.095-2.01,49.292-4.5491,21.771-4.3621,30.574-7.65,33.275-9.1405l0.68701-0.38541h-0.00088zm5.0172-8.2753c0.022,0.0256,0.0441,0.0503,0.0653,0.0776-0.63585,1.0733-1.2911,2.1652-1.9622,3.2623-5.0357,1.8-18.702,5.7988-38.659,8.5893-13.149,1.7912-21.322,3.526-47.479,4.034-49.015-1.2471-80.75-10.831-88.289-13.195l-1.1174-2.1431c28.406,7.4154,57.422,12.592,89.408,13.121,23.931-0.50976,34.112-2.2719,47.152-4.0499,23.271-3.6186,34.996-7.4498,38.515-8.5558-0.0441-0.0635-0.0961-0.13053-0.15433-0.19932l2.5231-0.9428-0.002,0.002z"/>
-		<path d="m328.83,197.76c0.13873,28.137-14.26,53.386-25.858,64.525-16.408,15.759-38.163,25.896-63.569,26.363-28.37,0.52117-55.12-17.974-62.295-26.099-14.028-15.885-25.449-36.057-25.815-63.243,1.7376-30.709,13.793-52.1,31.268-66.769s40.743-21.813,60.121-21.302c22.358,0.59003,48.475,11.558,66.521,33.332,11.823,14.266,16.943,29.748,19.627,53.193zm-89.186-96.342c54.485,0,99.296,44.338,99.296,98.703,0,54.364-44.811,98.704-99.296,98.704s-98.924-44.339-98.924-98.704,44.439-98.703,98.924-98.703"/>
-		<path d="m239.91,101.08c54.534,0,99.011,44.483,99.011,99.022,0,54.538-44.478,99.02-99.011,99.02-54.534,0-99.011-44.481-99.011-99.02s44.478-99.022,99.011-99.022zm-96.832,99.0224c0,53.26,43.736,96.842,96.832,96.842,53.097,0,96.833-43.582,96.833-96.842,0-53.262-43.737-96.844-96.833-96.844s-96.832,43.584-96.832,96.844z"/>
-		<path d="m239.99,109.31c49.731,0,90.693,40.821,90.693,90.704,0,49.884-40.963,90.703-90.693,90.703s-90.693-40.819-90.693-90.703c0-49.883,40.964-90.704,90.693-90.704zm-88.515,90.7034c0,48.685,39.979,88.524,88.515,88.524s88.515-39.839,88.515-88.524c0-48.686-39.978-88.525-88.515-88.525-48.536,0-88.515,39.839-88.515,88.525z"/>
-		<path d="m243.98,100.68-8.48545,0,0.01,198.96,8.51455,0z"/>
-		<path d="m243.13,99.546h2.1598l0.0185,201.25h-2.1616l-0.0159-201.25zm-8.4213,0.0018h2.1766l0.003,201.25h-2.1783v-201.25z"/>
-		<path d="m338.99,203.935,0-7.3554-5.99-5.58-34-9-49-5-59,3-42,10-8.48,6.28,0,7.3572l21.48-9.637,51-8h49l36,4,25,6z"/>
-		<path d="m239.95,184.77c23.383-0.0432,46.07,2.2154,64.065,5.7194,18.569,3.7121,31.637,8.3556,36.105,13.571l-0.005,2.5823c-5.3884-6.4902-22.973-11.248-36.518-13.968-17.858-3.474-40.393-5.7168-63.647-5.6736-24.538,0.0459-47.387,2.3698-64.984,5.8032-14.12,2.8019-32.951,8.3679-35.302,13.858v-2.689c1.2911-3.8003,15.313-9.4792,34.984-13.417,17.729-3.4572,40.62-5.7415,65.302-5.7864zm0.01-8.4922c23.383-0.0423,46.07,2.2172,64.065,5.7194,18.569,3.7139,31.637,8.3556,36.105,13.571l-0.005,2.5823c-5.3884-6.4885-22.973-11.247-36.518-13.966-17.858-3.4757-40.393-5.7185-63.647-5.6736-24.538,0.0441-47.276,2.3698-64.875,5.8014-13.626,2.5832-33.226,8.3696-35.412,13.86v-2.6908c1.2911-3.7588,15.597-9.6414,34.985-13.417,17.729-3.4572,40.62-5.7397,65.302-5.7864z"/>
-		<path d="m239.48,132.96c36.849-0.18433,68.99,5.1523,83.695,12.685l5.3638,9.279c-12.781-6.888-47.456-14.05-89.005-12.979-33.854,0.20814-70.027,3.7271-88.176,13.41l6.4035-10.709c14.895-7.7241,50.022-11.643,81.72-11.684"/>
-		<path d="m239.97,140.62c21.017-0.0556,41.325,1.1298,57.476,4.0437,15.041,2.7993,29.385,7.0009,31.436,9.2604l1.5901,2.8099c-4.9881-3.257-17.401-6.8836-33.339-9.906-16.006-3.0083-36.3-4.0049-57.2-3.9502-23.722-0.0811-42.152,1.1712-57.969,3.9291-16.728,3.13-28.334,7.6015-31.197,9.7261l1.5583-2.9704c5.5631-2.8381,14.39-6.2592,29.223-8.9297,16.357-2.988,34.983-3.8841,58.423-4.0128h-0.00088zm-0.009-8.4843c20.113-0.0529,39.972,1.068,55.452,3.8506,12.209,2.3768,24.283,6.0872,28.704,9.3892l2.3256,3.6954c-3.9536-4.3947-18.836-8.5593-31.974-10.892-15.361-2.6494-34.395-3.698-54.508-3.8656-21.108,0.0591-40.615,1.352-55.752,4.1081-14.441,2.7481-23.76,6.0016-27.703,8.5425l2.0451-3.0868c5.4414-2.8646,14.232-5.4954,25.303-7.6465,15.249-2.7764,34.876-4.0358,56.108-4.0949z"/>
-		<path d="m289.15,241.26c-18.218-3.4008-36.469-3.8947-49.217-3.7447-61.407,0.71967-81.244,12.609-83.665,16.209l-4.5894-7.4815c15.634-11.332,49.073-17.687,88.587-17.037,20.518,0.33602,38.224,1.6986,53.119,4.5835l-4.2358,7.4727"/>
-		<path stroke-width="0.55" d="m239.58,236.46c17.082,0.25488,33.849,0.96044,50.033,3.9784l-1.172,2.069c-15.031-2.7746-31.055-3.8365-48.803-3.75-22.663-0.17727-45.585,1.9394-65.541,7.6668-6.2968,1.7524-16.721,5.8006-17.784,9.1458l-1.1659-1.9226c0.33601-1.9773,6.6363-6.081,18.414-9.3901,22.858-6.5458,44.239-7.6491,66.019-7.799v0.002zm0.77519-8.5963c17.698,0.33073,35.975,1.1492,53.74,4.6681l-1.2206,2.1537c-16.042-3.1847-31.369-4.2466-52.415-4.5702-22.735,0.0414-46.851,1.6625-68.778,8.0372-7.0791,2.062-19.297,6.5202-19.704,10.05l-1.1659-2.0655c0.26545-3.2059,10.842-7.388,20.358-10.156,22.096-6.4241,46.275-8.076,69.186-8.1174z"/>
-		<path d="M327.58,247.38,320.201,258.829,299,240,244,203,182,169,149.81,157.99,156.67,145.27,159,144l20,5,66,34,38,24,32,23,13,15z"/>
-		<path d="m148.65,158.29c5.646-3.8294,47.139,14.655,90.555,40.834,43.301,26.254,84.677,55.921,80.942,61.473l-1.2285,1.9323-0.56354,0.4445c0.12083-0.0864,0.74345-0.84755-0.0609-2.906-1.8449-6.0704-31.195-29.491-79.894-58.895-47.475-28.309-87.041-45.371-90.997-40.494l1.247-2.3892h-0.00089zm180.44,88.927c3.57-7.052-34.916-36.044-82.632-64.272-48.813-27.666-83.994-43.951-90.42-39.095l-1.4278,2.5991c-0.0124,0.14287,0.052-0.17727,0.35364-0.4101,1.1685-1.0195,3.1052-0.95074,3.9792-0.96662,11.065,0.16581,42.667,14.709,87.006,40.128,19.428,11.315,82.071,51.491,81.832,62.789,0.0168,0.97102,0.0803,1.1712-0.28485,1.6519l1.5936-2.4236v-0.002z"/>
-	</g>
-	<g>
-		<path fill="#fff" stroke="#000" stroke-width="0.67037" stroke-linejoin="bevel" d="m180.6,211.01c0,16.271,6.6628,30.987,17.457,41.742,10.815,10.778,25.512,17.579,41.809,17.579,16.381,0,31.247-6.6525,42.016-17.389,10.769-10.735,17.443-25.552,17.446-41.88h-0.002v-79.189l-118.74-0.14111,0.0123,79.278h0.002z"/>
-		<path fill="#f00" stroke="#000" stroke-width="0.50734" d="m182.82,211.12v0.045c0,15.557,6.4414,29.724,16.775,40.009,10.354,10.305,24.614,16.712,40.214,16.712,15.681,0,29.912-6.3606,40.222-16.626,10.308-10.265,16.697-24.433,16.699-40.044h-0.002v-76.826l-113.84-0.0185-0.0697,76.748m91.022-53.747,0.004,48.891-0.0414,5.1717h0.00088c0,1.3608-0.082,2.9122-0.24076,4.2333-0.92512,7.7294-4.4801,14.467-9.7451,19.708-6.1636,6.1357-14.671,9.9413-24.047,9.9413-9.327,0-17.639-3.9379-23.829-10.1-6.3497-6.32-10.03-14.986-10.03-23.947l-0.0132-54.023,67.94,0.12259,0.002,0.002z"/>
-		<g id="castle3">
-			<g id="castle" fill="#ff0" stroke="#000" stroke-width="0.5">
-				<path stroke="none" d="m190.19,154.43c0.13493-5.521,4.0524-6.828,4.0806-6.8474,0.0282-0.0185,4.2314,1.4076,4.2173,6.8986l-8.2978-0.0512"/>
-				<path d="m186.81,147.69-0.68172,6.3447,4.1406,0.009c0.0397-5.2493,3.9739-6.1225,4.0691-6.1031,0.0891-0.005,3.9889,1.1606,4.0929,6.1031h4.1511l-0.74962-6.3932-15.022,0.0379v0.002z"/>
-				<path d="m185.85,154.06h16.946c0.35717,0,0.64908,0.35277,0.64908,0.78404,0,0.43039-0.29191,0.78141-0.64908,0.78141h-16.946c-0.35717,0-0.64908-0.35102-0.64908-0.78141,0-0.43127,0.29191-0.78404,0.64908-0.78404z"/>
-				<path d="m192.01,154.03c0.0185-3.3126,2.2621-4.2501,2.2736-4.2483,0.00088,0,2.3423,0.96661,2.3609,4.2483h-4.6344"/>
-				<path d="m186.21,145.05h16.245c0.34218,0,0.62263,0.31839,0.62263,0.70468,0,0.38717-0.28045,0.70467-0.62263,0.70467h-16.245c-0.34218,0-0.62263-0.31573-0.62263-0.70467,0-0.38629,0.28045-0.70468,0.62263-0.70468z"/>
-				<path d="m186.55,146.47h15.538c0.32719,0,0.59529,0.31662,0.59529,0.70379,0,0.38805-0.2681,0.70467-0.59529,0.70467h-15.538c-0.32719,0-0.59529-0.31662-0.59529-0.70467,0-0.38717,0.2681-0.70379,0.59529-0.70379z"/>
-				<path d="m191.57,135.88,1.2267,0.002v0.87136h0.89513v-0.89076l1.2567,0.004v0.88723h0.89778v-0.89076h1.2576l-0.002,2.0117c0,0.31574-0.25398,0.52035-0.54854,0.52035h-4.4113c-0.29633,0-0.56972-0.23724-0.5706-0.52652l-0.003-1.9879h0.00088z"/>
-				<path d="m196.19,138.57,0.27691,6.4514-4.3028-0.0159,0.28486-6.4523,3.741,0.0168"/>
-				<path id="cp1" d="m190.94,141.56,0.13141,3.4775-4.1256,0.002,0.11641-3.4793h3.8786-0.00089z"/>
-				<use xlink:href="#cp1" x="10.609"/>
-				<path id="cp2" d="m186.3,139.04,1.1994,0.003v0.87224h0.8775v-0.89253l1.2294,0.004v0.889h0.87926v-0.89253l1.2302,0.002-0.002,2.0117c0,0.31398-0.2487,0.51859-0.5362,0.51859h-4.3169c-0.28926,0-0.55824-0.23548-0.55913-0.52564l-0.003-1.9888h0.00088z"/>
-				<use xlink:href="#cp2" x="10.609"/>
-				<path fill="#000" stroke="none" d="m193.9,140.61c-0.0265-0.62706,0.87661-0.63411,0.86603,0v1.5364h-0.866v-1.536"/>
-				<path id="cp3" fill="#000" stroke="none" d="m188.57,142.84c-0.003-0.6059,0.83693-0.61824,0.82635,0v1.1871h-0.826v-1.187"/>
-				<use xlink:href="#cp3" x="10.641"/>
-			</g>
-			<use xlink:href="#castle" y="46.3198"/>
-			<use xlink:href="#castle" transform="matrix(0.70460892,-0.70959585,0.70959585,0.70460892,-35.341459,275.10898)"/>
-		</g>
-		<use xlink:href="#castle" x="45.7138"/>
-		<use xlink:href="#castle3" transform="matrix(-1,0,0,1,479.79195,0)"/>
-		<g id="quina">
-			<path fill="#039" d="m232.636,202.406v0.005c0,2.2119,0.84927,4.2272,2.2118,5.6894,1.3652,1.4667,3.2454,2.3777,5.302,2.3777,2.0672,0,3.9439-0.90487,5.3029-2.3654,1.3581-1.4587,2.2021-3.47219,2.2021-5.693v-10.768l-14.992-0.0123-0.0273,10.766"/>
-			<path stroke="#fff" stroke-width="2.972" stroke-linecap="round" d="M236.074,195.742v0M244.392,195.742v0M240.225,199.735v0M236.074,203.916v0M244.383,203.905v0"/>
-		</g>
-		<use xlink:href="#quina" y="-26.016"/>
-		<use xlink:href="#quina" x="-20.799"/>
-		<use xlink:href="#quina" x="20.745"/>
-		<use xlink:href="#quina" y="25.784"/>
-	</g>
-</svg>
--- a/data/resources/images/flags/Russian.svg
+++ b/data/resources/images/flags/Russian.svg
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 6" width="900" height="600"><rect fill="#fff" width="9" height="3"/><rect fill="#d52b1e" y="3" width="9" height="3"/><rect fill="#0039a6" y="2" width="9" height="2"/></svg>
--- a/data/resources/images/flags/Spanish.svg
+++ b/data/resources/images/flags/Spanish.svg
--- a/data/resources/images/flags/Swedish.svg
+++ b/data/resources/images/flags/Swedish.svg
@@ -1 +0,0 @@
-<?xml version="1.0"?><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 5" width="1600" height="1000"><path fill="#005293" d="M0,0H8V5H0Z"/><path stroke="#fecb00" d="M0,2.5h8M3,0v5"/></svg>
--- a/data/resources/images/flags/Turkish.svg
+++ b/data/resources/images/flags/Turkish.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800" viewBox="0 -30000 90000 60000">
-	<title>Flag of Turkey</title>
-	<path fill="#e30a17" d="m0-30000h90000v60000H0z"/>
-	<path fill="#fff" d="m41750 0 13568-4408-8386 11541V-7133l8386 11541zm925 8021a15000 15000 0 1 1 0-16042 12000 12000 0 1 0 0 16042z"/>
-</svg>
--- a/data/resources/images/flags/sources.txt
+++ b/data/resources/images/flags/sources.txt
@@ -1,21 +0,0 @@
-Catalan.svg: https://commons.wikimedia.org/wiki/Flag_of_Catalonia.svg
-Chinese.svg: https://commons.wikimedia.org/wiki/Flag_of_the_People's_Republic_of_China.svg
-Czech.svg: https://commons.wikimedia.org/wiki/Flag_of_the_Czech_Republic.svg
-Danish.svg: https://commons.wikimedia.org/wiki/Flag_of_Denmark.svg
-Dutch.svg: https://commons.wikimedia.org/wiki/Flag_of_the_Netherlands.svg
-English.svg: https://commons.wikimedia.org/wiki/Flag_of_the_United_Kingdom_(1-2).svg
-Finnish.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Finland.svg
-French.svg: https://commons.wikimedia.org/wiki/File:Flag_of_France.svg
-German.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Germany.svg
-Greek.svg: https://commons.wikimedia.org/wiki/Flag_of_Greece.svg
-Hebrew.svg: https://commons.wikimedia.org/wiki/Flag_of_Israel.svg
-Iranian.svg: https://commons.wikimedia.org/wiki/Flag_of_Iran.svg
-Italian.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Italy.svg
-Korean.svg: https://commons.wikimedia.org/wiki/Flag_of_South_Korea.svg
-Norwegian.svg https://commons.wikimedia.org/wiki/File:Flag_of_Norway.svg
-Polish.svg: https://commons.wikimedia.org/wiki/Flag_of_Poland.svg
-Portuguese.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Portugal.svg
-Spanish.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Spain.svg
-Swedish.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Sweden.svg
-Russian.svg: https://commons.wikimedia.org/wiki/File:Flag_of_Russia.svg
-Other.svg: https://en.wikipedia.org/wiki/File:Flag_with_question_mark.svg
--- a/data/resources/images/star-0.svg
+++ b/data/resources/images/star-0.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-0.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/star-1.svg
+++ b/data/resources/images/star-1.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-1.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/star-2.svg
+++ b/data/resources/images/star-2.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-2.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/star-3.svg
+++ b/data/resources/images/star-3.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-3.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/star-4.svg
+++ b/data/resources/images/star-4.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-4.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;fill-opacity:1"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/star-5.svg
+++ b/data/resources/images/star-5.svg
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="88"
-   height="16"
-   viewBox="0 0 87.999995 16"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="star-5.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="37.536584"
-     inkscape:cy="1.9655172"
-     inkscape:window-width="1678"
-     inkscape:window-height="962"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(-4.5440002,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-6"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(13.508654,-3.287675)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-7"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(31.485839,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-5"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(49.500759,-3.3684146)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff33;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
-       id="path238-3"
-       inkscape:flatsided="false"
-       sodipodi:sides="5"
-       sodipodi:cx="12.866945"
-       sodipodi:cy="12"
-       sodipodi:r1="8.2255917"
-       sodipodi:r2="4.1127963"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 12.866945,3.7744083 2.417441,4.8982696 5.405562,0.7854747 -3.911501,3.8127714 0.92338,5.38372 L 12.866945,16.112796 8.0320636,18.654643 8.9554435,13.270924 5.0439428,9.4581522 10.449504,8.6726779 Z"
-       inkscape:transform-center-y="-0.78547412"
-       transform="translate(66.81011,-3.3684146)" />
-  </g>
-</svg>
--- a/data/resources/images/warning.svg
+++ b/data/resources/images/warning.svg
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.88 111.24"><defs><style>.cls-1{fill:#fec901;fill-rule:evenodd;}.cls-2{fill:#010101;}</style></defs><title>risk</title><path d="M2.5,85l43-74.41h0a22.59,22.59,0,0,1,8-8.35,15.72,15.72,0,0,1,16,0,22.52,22.52,0,0,1,7.93,8.38l.23.44,42.08,73.07a20.91,20.91,0,0,1,3,10.84A16.44,16.44,0,0,1,121,102.4a15.45,15.45,0,0,1-5.74,6,21,21,0,0,1-11.35,2.78v0H17.7c-.21,0-.43,0-.64,0a19,19,0,0,1-7.83-1.74,15.83,15.83,0,0,1-6.65-5.72A16.26,16.26,0,0,1,0,95.18a21.66,21.66,0,0,1,2.2-9.62c.1-.2.2-.4.31-.59Z"/><path class="cls-1" d="M9.09,88.78l43-74.38c5.22-8.94,13.49-9.2,18.81,0l42.32,73.49c4.12,6.79,2.41,15.9-9.31,15.72H17.7C9.78,103.79,5,97.44,9.09,88.78Z"/><path class="cls-2" d="M57.55,83.15a5.47,5.47,0,0,1,5.85-1.22,5.65,5.65,0,0,1,2,1.3A5.49,5.49,0,0,1,67,86.77a5.12,5.12,0,0,1-.08,1.4,5.22,5.22,0,0,1-.42,1.34,5.51,5.51,0,0,1-5.2,3.25,5.63,5.63,0,0,1-2.26-.53,5.51,5.51,0,0,1-2.81-2.92A6,6,0,0,1,55.9,88a5.28,5.28,0,0,1,0-1.31h0a6,6,0,0,1,.56-2,4.6,4.6,0,0,1,1.14-1.56Zm8.12-10.21c-.19,4.78-8.28,4.78-8.46,0-.82-8.19-2.92-27.63-2.85-35.32.07-2.37,2-3.78,4.55-4.31a11.65,11.65,0,0,1,2.48-.25,12.54,12.54,0,0,1,2.5.25c2.59.56,4.63,2,4.63,4.43V38l-2.84,35Z"/></svg>
--- a/data/resources/shaders/dolphinfx/bloom.glsl
+++ b/data/resources/shaders/dolphinfx/bloom.glsl
@@ -0,0 +1,238 @@
+/*===============================================================================*\
+|########################     [Dolphin FX Suite 2.20]      #######################|
+|##########################        By Asmodean          ##########################|
+||                                                                               ||
+||          This program is free software; you can redistribute it and/or        ||
+||          modify it under the terms of the GNU General Public License          ||
+||          as published by the Free Software Foundation; either version 2       ||
+||          of the License, or (at your option) any later version.               ||
+||                                                                               ||
+||          This program is distributed in the hope that it will be useful,      ||
+||          but WITHOUT ANY WARRANTY; without even the implied warranty of       ||
+||          MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        ||
+||          GNU General Public License for more details. (C)2015                 ||
+||                                                                               ||
+|#################################################################################|
+\*===============================================================================*/
+
+// Sourced from https://raw.githubusercontent.com/Asmodean-/dolphin/89d640cd557189bb5f921fc219150c74c39bdc55/Data/Sys/Shaders/DolphinFX.glsl with modifications.
+
+/*
+[configuration]
+
+[OptionRangeInteger]
+GUIName = BloomType
+OptionName = A_BLOOM_TYPE
+MinValue = 0
+MaxValue = 5
+StepAmount = 1
+DefaultValue = 0
+
+[OptionRangeFloat]
+GUIName = BloomStrength
+OptionName = B_BLOOM_STRENGTH
+MinValue = 0.000
+MaxValue = 1.000
+StepAmount = 0.001
+DefaultValue = 0.220
+
+[OptionRangeFloat]
+GUIName = BlendStrength
+OptionName = C_BLEND_STRENGTH
+MinValue = 0.000
+MaxValue = 1.200
+StepAmount = 0.010
+DefaultValue = 1.000
+
+[OptionRangeFloat]
+GUIName = BloomDefocus
+OptionName = D_B_DEFOCUS
+MinValue = 1.000
+MaxValue = 4.000
+StepAmount = 0.100
+DefaultValue = 2.000
+
+[OptionRangeFloat]
+GUIName = BloomWidth
+OptionName = D_BLOOM_WIDTH
+MinValue = 1.000
+MaxValue = 8.000
+StepAmount = 0.100
+DefaultValue = 3.200
+
+[OptionRangeFloat]
+GUIName = BloomReds
+OptionName = E_BLOOM_REDS
+MinValue = 0.000
+MaxValue = 0.500
+StepAmount = 0.001
+DefaultValue = 0.020
+
+[OptionRangeFloat]
+GUIName = BloomGreens
+OptionName = F_BLOOM_GREENS
+MinValue = 0.000
+MaxValue = 0.500
+StepAmount = 0.001
+DefaultValue = 0.010
+
+[OptionRangeFloat]
+GUIName = BloomBlues
+OptionName = G_BLOOM_BLUES
+MinValue = 0.000
+MaxValue = 0.500
+StepAmount = 0.001
+DefaultValue = 0.010
+
+[/configuration]
+*/
+
+//Average relative luminance
+CONSTANT float3 lumCoeff = float3(0.2126729, 0.7151522, 0.0721750);
+float AvgLuminance(float3 color)
+{
+    return sqrt(
+    (color.x * color.x * lumCoeff.x) +
+    (color.y * color.y * lumCoeff.y) +
+    (color.z * color.z * lumCoeff.z));
+}
+
+float smootherstep(float a, float b, float x)
+{
+    x = saturate((x - a) / (b - a));
+    return x*x*x*(x*(x * 6.0 - 15.0) + 10.0);
+}
+
+float3 BlendAddLight(float3 bloom, float3 blend)
+{
+    return saturate(bloom + blend);
+}
+
+float3 BlendScreen(float3 bloom, float3 blend)
+{
+    return (bloom + blend) - (bloom * blend);
+}
+
+float3 BlendAddGlow(float3 bloom, float3 blend)
+{
+    float glow = smootherstep(0.0, 1.0, AvgLuminance(bloom));
+    return lerp(saturate(bloom + blend),
+    (blend + blend) - (blend * blend), glow);
+}
+
+float3 BlendGlow(float3 bloom, float3 blend)
+{
+    float glow = smootherstep(0.0, 1.0, AvgLuminance(bloom));
+    return lerp((bloom + blend) - (bloom * blend),
+    (blend + blend) - (blend * blend), glow);
+}
+
+float3 BlendLuma(float3 bloom, float3 blend)
+{
+    float lumavg = smootherstep(0.0, 1.0, AvgLuminance(bloom + blend));
+    return lerp((bloom * blend), (1.0 -
+    ((1.0 - bloom) * (1.0 - blend))), lumavg);
+}
+
+float3 BlendOverlay(float3 bloom, float3 blend)
+{
+    float3 overlay = step(0.5, bloom);
+    return lerp((bloom * blend * 2.0), (1.0 - (2.0 *
+    (1.0 - bloom) * (1.0 - blend))), overlay);
+}
+
+float3 BloomCorrection(float3 color)
+{
+    float3 bloom = color;
+
+    bloom.r = 2.0 / 3.0 * (1.0 - (bloom.r * bloom.r));
+    bloom.g = 2.0 / 3.0 * (1.0 - (bloom.g * bloom.g));
+    bloom.b = 2.0 / 3.0 * (1.0 - (bloom.b * bloom.b));
+
+    bloom.r = saturate(color.r + GetOption(E_BLOOM_REDS) * bloom.r);
+    bloom.g = saturate(color.g + GetOption(F_BLOOM_GREENS) * bloom.g);
+    bloom.b = saturate(color.b + GetOption(G_BLOOM_BLUES) * bloom.b);
+
+    color = saturate(bloom);
+
+    return color;
+}
+
+float4 PyramidFilter(float2 texcoord, float2 width)
+{
+    float4 X = SampleLocation(texcoord + float2(0.5, 0.5) * width);
+    float4 Y = SampleLocation(texcoord + float2(-0.5,  0.5) * width);
+    float4 Z = SampleLocation(texcoord + float2(0.5, -0.5) * width);
+    float4 W = SampleLocation(texcoord + float2(-0.5, -0.5) * width);
+
+    return (X + Y + Z + W) / 4.0;
+}
+
+float3 Blend(float3 bloom, float3 blend)
+{
+         if (GetOption(A_BLOOM_TYPE) == 0) { return BlendGlow(bloom, blend); }
+    else if (GetOption(A_BLOOM_TYPE) == 1) { return BlendAddGlow(bloom, blend); }
+    else if (GetOption(A_BLOOM_TYPE) == 2) { return BlendAddLight(bloom, blend); }
+    else if (GetOption(A_BLOOM_TYPE) == 3) { return BlendScreen(bloom, blend); }
+    else if (GetOption(A_BLOOM_TYPE) == 4) { return BlendLuma(bloom, blend); }
+    else /*if (GetOption(A_BLOOM_TYPE) == 5) */ { return BlendOverlay(bloom, blend); }
+}
+
+void main()
+{
+    float4 color = Sample();
+    float2 texcoord = GetCoordinates();
+    float2 pixelSize = GetInvResolution();
+
+    float anflare = 4.0;
+
+    float2 defocus = float2(GetOption(D_B_DEFOCUS), GetOption(D_B_DEFOCUS));
+    float4 bloom = PyramidFilter(texcoord, pixelSize * defocus);
+
+    float2 dx = float2(pixelSize.x * GetOption(D_BLOOM_WIDTH), 0.0);
+    float2 dy = float2(0.0, pixelSize.y * GetOption(D_BLOOM_WIDTH));
+
+    float2 mdx = mul(dx, 2.0);
+    float2 mdy = mul(dy, 2.0);
+
+    float4 blend = bloom * 0.22520613262190495;
+
+    blend += 0.002589001911021066 * SampleLocation(texcoord - mdx + mdy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord - dx + mdy);
+    blend += 0.024146616900339800 * SampleLocation(texcoord + mdy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord + dx + mdy);
+    blend += 0.002589001911021066 * SampleLocation(texcoord + mdx + mdy);
+
+    blend += 0.010778807494659370 * SampleLocation(texcoord - mdx + dy);
+    blend += 0.044875475183061630 * SampleLocation(texcoord - dx + dy);
+    blend += 0.100529757860782610 * SampleLocation(texcoord + dy);
+    blend += 0.044875475183061630 * SampleLocation(texcoord + dx + dy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord + mdx + dy);
+
+    blend += 0.024146616900339800 * SampleLocation(texcoord - mdx);
+    blend += 0.100529757860782610 * SampleLocation(texcoord - dx);
+    blend += 0.100529757860782610 * SampleLocation(texcoord + dx);
+    blend += 0.024146616900339800 * SampleLocation(texcoord + mdx);
+
+    blend += 0.010778807494659370 * SampleLocation(texcoord - mdx - dy);
+    blend += 0.044875475183061630 * SampleLocation(texcoord - dx - dy);
+    blend += 0.100529757860782610 * SampleLocation(texcoord - dy);
+    blend += 0.044875475183061630 * SampleLocation(texcoord + dx - dy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord + mdx - dy);
+
+    blend += 0.002589001911021066 * SampleLocation(texcoord - mdx - mdy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord - dx - mdy);
+    blend += 0.024146616900339800 * SampleLocation(texcoord - mdy);
+    blend += 0.010778807494659370 * SampleLocation(texcoord + dx - mdy);
+    blend += 0.002589001911021066 * SampleLocation(texcoord + mdx - mdy);
+    blend = lerp(color, blend, GetOption(C_BLEND_STRENGTH));
+
+    bloom.xyz = Blend(bloom.xyz, blend.xyz);
+    bloom.xyz = BloomCorrection(bloom.xyz);
+
+    color.a = AvgLuminance(color.xyz);
+    bloom.a = AvgLuminance(bloom.xyz);
+    bloom.a *= anflare;
+
+    SetOutput(lerp(color, bloom, GetOption(B_BLOOM_STRENGTH)));
+}
--- a/data/resources/shaders/dolphinfx/celshading.glsl
+++ b/data/resources/shaders/dolphinfx/celshading.glsl
@@ -0,0 +1,174 @@
+/*===============================================================================*\
+|########################     [Dolphin FX Suite 2.20]      #######################|
+|##########################        By Asmodean          ##########################|
+||                                                                               ||
+||          This program is free software; you can redistribute it and/or        ||
+||          modify it under the terms of the GNU General Public License          ||
+||          as published by the Free Software Foundation; either version 2       ||
+||          of the License, or (at your option) any later version.               ||
+||                                                                               ||
+||          This program is distributed in the hope that it will be useful,      ||
+||          but WITHOUT ANY WARRANTY; without even the implied warranty of       ||
+||          MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        ||
+||          GNU General Public License for more details. (C)2015                 ||
+||                                                                               ||
+|#################################################################################|
+\*===============================================================================*/
+
+// Sourced from https://raw.githubusercontent.com/Asmodean-/dolphin/89d640cd557189bb5f921fc219150c74c39bdc55/Data/Sys/Shaders/DolphinFX.glsl with modifications.
+
+/*
+[configuration]
+
+[OptionRangeFloat]
+GUIName = EdgeStrength
+OptionName = A_EDGE_STRENGTH
+MinValue = 0.00
+MaxValue = 4.00
+StepAmount = 0.01
+DefaultValue = 1.00
+
+[OptionRangeFloat]
+GUIName = EdgeFilter
+OptionName = B_EDGE_FILTER
+MinValue = 0.25
+MaxValue = 1.00
+StepAmount = 0.01
+DefaultValue = 0.60
+
+[OptionRangeFloat]
+GUIName = EdgeThickness
+OptionName = C_EDGE_THICKNESS
+MinValue = 0.25
+MaxValue = 2.00
+StepAmount = 0.01
+DefaultValue = 1.00
+
+[OptionRangeInteger]
+GUIName = PaletteType
+OptionName = D_PALETTE_TYPE
+MinValue = 0
+MaxValue = 2
+StepAmount = 1
+DefaultValue = 1
+
+[OptionRangeInteger]
+GUIName = UseYuvLuma
+OptionName = E_YUV_LUMA
+MinValue = 0
+MaxValue = 1
+StepAmount = 1
+DefaultValue = 0
+
+[OptionRangeInteger]
+GUIName = ColourRounding
+OptionName = G_COLOR_ROUNDING
+MinValue = 0
+MaxValue = 1
+StepAmount = 1
+DefaultValue = 1
+
+[/configuration]
+*/
+
+//Average relative luminance
+CONSTANT float3 lumCoeff = float3(0.2126729, 0.7151522, 0.0721750);
+float AvgLuminance(float3 color)
+{
+    return sqrt(
+    (color.x * color.x * lumCoeff.x) +
+    (color.y * color.y * lumCoeff.y) +
+    (color.z * color.z * lumCoeff.z));
+}
+
+float3 YUVtoRGB(float3 YUV)
+{
+   const float3x3 m = float3x3(
+    1.000, 0.000, 1.28033,
+    1.000,-0.21482,-0.38059,
+    1.000, 2.12798, 0.000 );
+
+    return mul(m, YUV);
+}
+
+float3 RGBtoYUV(float3 RGB)
+{
+    const float3x3 m = float3x3(
+    0.2126, 0.7152, 0.0722,
+   -0.09991,-0.33609, 0.436,
+    0.615, -0.55861, -0.05639 );
+
+    return mul(m, RGB);
+}
+
+void main()
+{
+    float4 color = Sample();
+    float2 texcoord = GetCoordinates();
+    float2 pixelSize = GetInvResolution();
+    float2 texSize = GetResolution();
+
+    float3 yuv;
+    float3 sum = color.rgb;
+
+    const int NUM = 9;
+    const float2 RoundingOffset = float2(0.25, 0.25);
+    const float3 thresholds = float3(9.0, 8.0, 6.0);
+
+    float lum[NUM];
+    float3 col[NUM];
+    float2 set[NUM] = BEGIN_ARRAY(float2, NUM)
+    float2(-0.0078125, -0.0078125),
+    float2(0.00, -0.0078125),
+    float2(0.0078125, -0.0078125),
+    float2(-0.0078125, 0.00),
+    float2(0.00, 0.00),
+    float2(0.0078125, 0.00),
+    float2(-0.0078125, 0.0078125),
+    float2(0.00, 0.0078125),
+    float2(0.0078125, 0.0078125) END_ARRAY;
+
+    for (int i = 0; i < NUM; i++)
+    {
+        col[i] = SampleLocation(texcoord + set[i] * RoundingOffset).rgb;
+
+        if (GetOption(G_COLOR_ROUNDING) == 1) {
+        col[i].r = round(col[i].r * thresholds.r) / thresholds.r;
+        col[i].g = round(col[i].g * thresholds.g) / thresholds.g;
+        col[i].b = round(col[i].b * thresholds.b) / thresholds.b; }
+
+        lum[i] = AvgLuminance(col[i].xyz);
+        yuv = RGBtoYUV(col[i]);
+
+        if (GetOption(E_YUV_LUMA) == 0)
+        { yuv.r = round(yuv.r * thresholds.r) / thresholds.r; }
+        else
+        { yuv.r = saturate(round(yuv.r * lum[i]) / thresholds.r + lum[i]); }
+
+        yuv = YUVtoRGB(yuv);
+        sum += yuv;
+    }
+
+    float3 shadedColor = (sum / NUM);
+    float2 pixel = float2((1.0/texSize.x) * GetOption(C_EDGE_THICKNESS),
+                          (1.0/texSize.y) * GetOption(C_EDGE_THICKNESS));
+
+    float edgeX = dot(SampleLocation(texcoord + pixel).rgb, lumCoeff);
+    edgeX = dot(float4(SampleLocation(texcoord - pixel).rgb, edgeX), float4(lumCoeff, -1.0));
+
+    float edgeY = dot(SampleLocation(texcoord + float2(pixel.x, -pixel.y)).rgb, lumCoeff);
+    edgeY = dot(float4(SampleLocation(texcoord + float2(-pixel.x, pixel.y)).rgb, edgeY), float4(lumCoeff, -1.0));
+
+    float edge = dot(float2(edgeX, edgeY), float2(edgeX, edgeY));
+
+    if (GetOption(D_PALETTE_TYPE) == 0)
+        { color.rgb = lerp(color.rgb, color.rgb + pow(edge, GetOption(B_EDGE_FILTER)) * -GetOption(A_EDGE_STRENGTH), GetOption(A_EDGE_STRENGTH)); }
+    else if (GetOption(D_PALETTE_TYPE) == 1)
+        { color.rgb = lerp(color.rgb + pow(edge, GetOption(B_EDGE_FILTER)) * -GetOption(A_EDGE_STRENGTH), shadedColor, 0.25); }
+    else if (GetOption(D_PALETTE_TYPE) == 2)
+        { color.rgb = lerp(shadedColor + edge * -GetOption(A_EDGE_STRENGTH), pow(edge, GetOption(B_EDGE_FILTER)) * -GetOption(A_EDGE_STRENGTH) + color.rgb, 0.50); }
+
+    color.a = AvgLuminance(color.rgb);
+
+    SetOutput(saturate(color));
+}
--- a/data/resources/shaders/dolphinfx/crt/CRT-CONSUMER.glsl
+++ b/data/resources/shaders/dolphinfx/crt/CRT-CONSUMER.glsl
@@ -0,0 +1,780 @@
+//   Crt-Consumer
+
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your option) any later version.
+
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+
+/*
+[configuration]
+
+
+[OptionRangeFloat]
+GUIName = Pre-Scale Sharpening
+OptionName = PRE_SCALE
+MinValue = 1.0
+MaxValue = 4.0
+StepAmount = 0.1
+DefaultValue = 1.5
+
+[OptionRangeFloat]
+GUIName = Convergence X
+OptionName = blurx
+MinValue = -4.0
+MaxValue = 4.0
+StepAmount = 0.05
+DefaultValue = 0.25
+
+[OptionRangeFloat]
+GUIName = Convergence Y
+OptionName = blury
+MinValue = -4.0
+MaxValue = 4.0
+StepAmount = 0.05
+DefaultValue = -0.1
+
+[OptionRangeFloat]
+GUIName = Curvature X
+OptionName = warpx
+MinValue = 0.0
+MaxValue = 0.12
+StepAmount = 0.01
+DefaultValue = 0.03
+
+[OptionRangeFloat]
+GUIName = Curvature Y
+OptionName = warpy
+MinValue = 0.0
+MaxValue = 0.12
+StepAmount = 0.01
+DefaultValue = 0.04
+
+[OptionRangeFloat]
+GUIName = Corner size
+OptionName = corner
+MinValue = 0.0
+MaxValue = 0.10
+StepAmount = 0.01
+DefaultValue = 0.03
+
+[OptionRangeFloat]
+GUIName = Border Smoothness
+OptionName = smoothness
+MinValue = 100.0
+MaxValue = 600.0
+StepAmount = 5.0
+DefaultValue = 400.0
+
+[OptionRangeFloat]
+GUIName = Interlacing Toggle
+OptionName = inter
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Interlacing Downscale Scanlines
+OptionName = Downscale
+MinValue = 1.0
+MaxValue = 8.0
+StepAmount = 1.
+DefaultValue = 2.0
+
+[OptionRangeFloat]
+GUIName = Beam low
+OptionName = scanlow
+MinValue = 1.0
+MaxValue = 15.0
+StepAmount = 1.0
+DefaultValue = 6.0
+
+[OptionRangeFloat]
+GUIName = Beam high
+OptionName = scanhigh
+MinValue = 1.0
+MaxValue = 15.0
+StepAmount = 1.0
+DefaultValue = 8.0
+
+[OptionRangeFloat]
+GUIName = Scanlines dark
+OptionName = beamlow
+MinValue = 0.5
+MaxValue = 2.5
+StepAmount = 0.0
+DefaultValue = 1.45
+
+[OptionRangeFloat]
+GUIName = Scanlines bright
+OptionName = beamhigh
+MinValue = 0.5
+MaxValue = 2.5
+StepAmount = 0.0
+DefaultValue = 1.05
+
+[OptionRangeFloat]
+GUIName = Protect White On Masks
+OptionName = preserve
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.01
+DefaultValue = 0.98
+
+[OptionRangeFloat]
+GUIName = Bright boost dark pixels
+OptionName = brightboost1
+MinValue = 0.0
+MaxValue = 3.0
+StepAmount = 0.05
+DefaultValue = 1.25
+
+[OptionRangeFloat]
+GUIName = Bright boost bright pixels
+OptionName = brightboost2
+MinValue = 0.0
+MaxValue = 3.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Glow pixels per axis
+OptionName = glow
+MinValue = 1.0
+MaxValue = 6.0
+StepAmount = 1.0
+DefaultValue = 3.0
+
+[OptionRangeFloat]
+GUIName = Glow quality
+OptionName = quality
+MinValue = 0.25
+MaxValue = 4.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Glow intensity
+OptionName = glow_str
+MinValue = 0.0001
+MaxValue = 2.0
+StepAmount = 0.05
+DefaultValue = 0.3
+
+[OptionRangeFloat]
+GUIName = Add Noise
+OptionName = nois
+MinValue = 0.0
+MaxValue = 32.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Post Brightness
+OptionName = postbr
+MinValue = 0.0
+MaxValue = 2.5
+StepAmount = 0.02
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Palette Fixes. Sega, PUAE Atari ST dark colors 
+OptionName = palette_fix
+MinValue = 0.0
+MaxValue = 2.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Mask Type
+OptionName = Shadowmask
+MinValue = -1.0
+MaxValue = 8.0
+StepAmount = 1.
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Mask Size
+OptionName = masksize
+MinValue = 1.0
+MaxValue = 2.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Mask dark
+OptionName = MaskDark
+MinValue = 0.0
+MaxValue = 2.0
+StepAmount = 0.1
+DefaultValue = 0.2
+
+[OptionRangeFloat]
+GUIName = Mask light
+OptionName = MaskLight
+MinValue = 0.0
+MaxValue = 2.0
+StepAmount = 0.1
+DefaultValue = 1.5
+
+[OptionRangeFloat]
+GUIName = Slot Mask Strength
+OptionName = slotmask
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Slot Mask Width
+OptionName = slotwidth
+MinValue = 1.0
+MaxValue = 6.0
+StepAmount = 0.5
+DefaultValue = 2.0
+
+[OptionRangeFloat]
+GUIName = Slot Mask Height: 2x1 or 4x1
+OptionName = double_slot
+MinValue = 1.0
+MaxValue = 2.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Slot Mask Size
+OptionName = slotms
+MinValue = 1.0
+MaxValue = 2.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Gamma Out
+OptionName = GAMMA_OUT
+MinValue = 0.0
+MaxValue = 4.0
+StepAmount = 0.05
+DefaultValue = 2.25
+
+[OptionRangeFloat]
+GUIName = Saturation
+OptionName = sat
+MinValue = 0.0
+MaxValue = 2.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Contrast, 1.0:Off
+OptionName = contrast
+MinValue = 0.00
+MaxValue = 2.00
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Color Temperature %
+OptionName = WP
+MinValue = -100.0
+MaxValue = 100.0
+StepAmount = 5.
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Red-Green Tint
+OptionName = rg
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Red-Blue Tint
+OptionName = rb
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Green-Red Tint
+OptionName = gr
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Green-Blue Tint
+OptionName = gb
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Blue-Red Tint
+OptionName = br
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Blue-Green Tint
+OptionName = bg
+MinValue = -1.0
+MaxValue = 1.0
+StepAmount = 0.005
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Vignette On/Off
+OptionName = vignette
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Vignette Power
+OptionName = vpower
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.01
+DefaultValue = 0.15
+
+[OptionRangeFloat]
+GUIName = Vignette strength
+OptionName = vstr
+MinValue = 0.0
+MaxValue = 50.0
+StepAmount = 1.0
+DefaultValue = 40.0
+
+[OptionRangeFloat]
+GUIName = Switch off shader
+OptionName = alloff
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+
+[/configuration]
+*/
+
+#define iTime  (float(GetTime())/2.0)
+#define iTimer (float(GetTime())/60.0)
+
+#define SourceSize (vec4(1.0/GetInvNativePixelSize(),GetInvNativePixelSize()))
+
+vec2 Warp(vec2 pos)
+{
+    pos  = pos * 2.0 - 1.0;    
+    pos *= vec2(1.0 + (pos.y * pos.y) * warpx, 1.0 + (pos.x * pos.x) * warpy);
+    return pos * 0.5 + 0.5;
+} 
+
+float sw(float y, float l)
+{
+    float beam = mix(scanlow, scanhigh, y);
+    float scan = mix(beamlow,  beamhigh, l);
+    float ex = y * scan;
+    return exp2(-beam * ex * ex);
+}
+
+vec3 mask(vec2 x, vec3 col, float l)
+{
+    x = floor(x / masksize);        
+  
+    if (Shadowmask == 0.0)
+    {
+        float m = fract(x.x * 0.4999);
+        if (m < 0.4999) return vec3(1.0,             MaskDark, 1.0);
+        else            return vec3(MaskDark, 1.0,             MaskDark);
+    }
+   
+    else if (Shadowmask == 1.0)
+    {
+        vec3 Mask = vec3(MaskDark, MaskDark, MaskDark);
+        float line = MaskLight;
+        float odd  = 0.0;
+
+        if (fract(x.x / 6.0) < 0.5) odd = 1.0;
+        if (fract((x.y + odd) / 2.0) < 0.5) line = MaskDark;
+
+        float m = fract(x.x / 3.0);
+        if      (m < 0.333) Mask.b = MaskLight;
+        else if (m < 0.666) Mask.g = MaskLight;
+        else                Mask.r = MaskLight;
+        
+        Mask *= line; 
+        return Mask; 
+    } 
+    
+    else if (Shadowmask == 2.0)
+    {
+        float m = fract(x.x*0.3333);
+        if (m < 0.3333) return vec3(MaskDark,  MaskDark,  MaskLight);
+        if (m < 0.6666) return vec3(MaskDark,  MaskLight, MaskDark);
+        else            return vec3(MaskLight, MaskDark,  MaskDark);
+    }
+
+    if (Shadowmask == 3.0)
+    {
+        float m = fract(x.x * 0.5);
+        if (m < 0.5) return vec3(1.0, 1.0, 1.0);
+        else         return vec3(MaskDark, MaskDark, MaskDark);
+    }
+   
+    else if (Shadowmask == 4.0)
+    {   
+        vec3 Mask = vec3(col.rgb);
+        float line = MaskLight;
+        float odd  = 0.0;
+
+        if (fract(x.x / 4.0) < 0.5) odd = 1.0;
+        if (fract((x.y + odd) / 2.0) < 0.5) line = MaskDark;
+
+        float m = fract(x.x / 2.0);
+        if  (m < 0.5) { Mask.r = 1.0; Mask.b = 1.0; }
+        else  Mask.g = 1.0;   
+
+        Mask *= line;  
+        return Mask;
+    } 
+
+    else if (Shadowmask == 5.0)
+    {
+        vec3 Mask = vec3(1.0, 1.0, 1.0);
+
+        if (fract(x.x / 4.0) < 0.5)   
+        {
+            if (fract(x.y / 3.0) < 0.666)
+            {
+                if (fract(x.x / 2.0) < 0.5) Mask = vec3(1.0,             MaskDark, 1.0);
+                else                        Mask = vec3(MaskDark, 1.0,             MaskDark);
+            }
+            else Mask *= l;
+        }
+        else if (fract(x.x / 4.0) >= 0.5)   
+        {
+            if (fract(x.y / 3.0) > 0.333) 
+            {
+                if (fract(x.x / 2.0) < 0.5) Mask = vec3(1.0,             MaskDark, 1.0); 
+                else                        Mask = vec3(MaskDark, 1.0,             MaskDark);
+            }
+            else Mask *= l;
+        }
+
+        return Mask;
+    }
+
+    else if (Shadowmask == 6.0)
+    {
+        vec3 Mask = vec3(MaskDark, MaskDark, MaskDark);
+        if (fract(x.x / 6.0) < 0.5)   
+        {
+            if (fract(x.y / 4.0) < 0.75)  
+            {
+                if      (fract(x.x / 3.0) < 0.3333) Mask.r = MaskLight; 
+                else if (fract(x.x / 3.0) < 0.6666) Mask.g = MaskLight; 
+                else                                Mask.b = MaskLight;
+            }
+            else Mask * l * 0.9;
+        }
+        else if (fract(x.x / 6.0) >= 0.5)   
+        {
+            if (fract(x.y / 4.0) >= 0.5 || fract(x.y / 4.0) < 0.25)  
+            {
+                if      (fract(x.x / 3.0) < 0.3333) Mask.r = MaskLight; 
+                else if (fract(x.x / 3.0) < 0.6666) Mask.g = MaskLight;
+                else                                Mask.b = MaskLight;
+            }
+            else Mask * l * 0.9;
+        }
+        return Mask;
+    }
+
+    else if (Shadowmask == 7.0)
+    {
+        float m = fract(x.x * 0.3333);
+
+        if (m < 0.3333) return vec3(MaskDark,          MaskLight,         MaskLight * col.b); //Cyan
+        if (m < 0.6666) return vec3(MaskLight * col.r, MaskDark,          MaskLight);         //Magenta
+        else            return vec3(MaskLight,         MaskLight * col.g, MaskDark);          //Yellow
+    }
+
+    else if (Shadowmask == 8.0)
+    {
+        vec3 Mask = vec3(MaskDark, MaskDark, MaskDark);
+
+        float bright = MaskLight;
+        float left   = 0.0;
+        if (fract(x.x / 6.0) < 0.5) left = 1.0;
+             
+        float m = fract(x.x / 3.0);
+        if      (m < 0.333) Mask.b = 0.9;
+        else if (m < 0.666) Mask.g = 0.9;
+        else                Mask.r = 0.9;
+        
+        if (mod(x.y, 2.0) == 1.0 && left == 1.0 || mod(x.y, 2.0) == 0.0 && left == 0.0) 
+            Mask *= bright; 
+      
+        return Mask; 
+    } 
+    
+    else return vec3(1.0, 1.0, 1.0);
+}
+
+float SlotMask(vec2 pos, vec3 c)
+{
+    if (slotmask == 0.0) return 1.0;
+    
+    pos = floor(pos / slotms);
+    float mx = pow(max(max(c.r, c.g), c.b), 1.33);
+    float mlen = slotwidth * 2.0;
+    float px = fract(pos.x / mlen);
+    float py = floor(fract(pos.y / (2.0 * double_slot)) * 2.0 * double_slot);
+    float slot_dark = mix(1.0 - slotmask, 1.0 - 0.80 * slotmask, mx);
+    float slot = 1.0 + 0.7 * slotmask * (1.0 - mx);
+    
+    if      (py == 0.0                && px <  0.5) slot = slot_dark; 
+    else if (py == double_slot && px >= 0.5) slot = slot_dark;       
+    
+    return slot;
+}
+
+mat4 contrastMatrix(float contrast)
+{   
+    float t = (1.0 - contrast) / 2.0;
+    
+    return mat4(contrast, 0,               0,               0,
+                0,               contrast, 0,               0,
+                0,               0,               contrast, 0,
+                t,               t,               t,               1);
+}
+
+mat3 vign(float l)
+{
+//    vec2 vpos = vTexCoord;
+    vec2 vpos = GetCoordinates();
+    vpos *= 1.0 - vpos.xy;
+    
+    float vig = vpos.x * vpos.y * vstr;
+    vig = min(pow(vig, vpower), 1.0); 
+    if (vignette == 0.0) vig = 1.0;
+   
+    return mat3(vig, 0,   0,
+                0,   vig, 0,
+                0,   0,   vig);
+}
+
+vec3 saturation(vec3 textureColor)
+{
+    float luminance = length(textureColor.rgb) * 0.5775;
+
+    vec3 luminanceWeighting = vec3(0.4, 0.5, 0.1);
+    if (luminance < 0.5) luminanceWeighting.rgb = (luminanceWeighting.rgb * luminanceWeighting.rgb) 
+                                                + (luminanceWeighting.rgb * luminanceWeighting.rgb);
+
+    luminance = dot(textureColor.rgb, luminanceWeighting);
+    vec3 greyScaleColor = vec3(luminance, luminance, luminance);
+
+    vec3 res = vec3(mix(greyScaleColor, textureColor.rgb, sat));
+    return res;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+vec3 glow0 (vec2 texcoord, vec3 col)
+{
+
+   // the more quality, the smaller the offset and better quality, less visible glow too
+     vec2 size = SourceSize.zw/quality;
+     
+     vec3 c01;
+     vec3 sum = vec3(0.0);
+   
+   // glow = pixels per axis, the more the slower!
+
+    for (float x = -glow; x <= glow; x = x+1.0)
+     {
+
+   // multiply texture, the more far away the less pronounced
+        float factor = 1.0/glow;
+        for (float y = -glow; y <= glow; y = y+1.0)
+        {
+
+        vec2 offset = vec2(x, y) * size;
+
+         c01 = SampleLocation(texcoord + offset).rgb*factor; c01 = c01*c01;
+          
+                sum += c01;
+        }
+    }
+  
+    return (glow_str * sum / (glow * glow )) ;
+}
+    
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+float noise(vec2 co)
+{
+    return fract(sin(iTimer * dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
+float corner0(vec2 coord)
+{
+    coord = (coord - vec2(0.5, 0.5)) * 1.0 + vec2(0.5, 0.5);
+    coord = min(coord, vec2(1.0, 1.0) - coord) * vec2(1.0, SourceSize.y / SourceSize.x);
+    
+    vec2 cdist = vec2(corner, corner);
+    coord = (cdist - min(coord, cdist));
+    float dist = sqrt(dot(coord, coord));
+
+    return clamp((cdist.x - dist) * smoothness, 0.0, 1.0);
+}  
+
+const mat3 D65_to_XYZ = mat3(
+           0.4306190,  0.2220379,  0.0201853,
+           0.3415419,  0.7066384,  0.1295504,
+           0.1783091,  0.0713236,  0.9390944);
+
+const mat3 XYZ_to_D65 = mat3(
+           3.0628971, -0.9692660,  0.0678775,
+          -1.3931791,  1.8760108, -0.2288548,
+          -0.4757517,  0.0415560,  1.0693490);
+           
+const mat3 D50_to_XYZ = mat3(
+           0.4552773,  0.2323025,  0.0145457,
+           0.3675500,  0.7077956,  0.1049154,
+           0.1413926,  0.0599019,  0.7057489);
+           
+const mat3 XYZ_to_D50 = mat3(
+           2.9603944, -0.9787684,  0.0844874,
+          -1.4678519,  1.9161415, -0.2545973,
+          -0.4685105,  0.0334540,  1.4216174);         
+
+void main()
+{
+    vec2 vTexCoord  = GetCoordinates();
+    vec2 pos = Warp(vTexCoord.xy);
+    vec2 tex_size = 1.0 / GetInvNativePixelSize();  
+    vec2 OutputSize = GetWindowSize();
+
+
+    vec2 pC4 = (pos + 0.5/tex_size);
+    vec2 fp = fract(pos * tex_size);
+    if (inter < 0.5 && tex_size.y > 400.0){ fp.y = fract(pos.y * tex_size.y*1.0/Downscale);} 
+
+    vec4 res = vec4(1.0);
+    
+    if (alloff == 1.0) 
+        res = SampleLocation(pC4); 
+    else
+    {
+
+   vec2 texel = pos * tex_size;
+   vec2 texel_floored = floor(texel);
+
+   float scale = PRE_SCALE;
+   float region_range = 0.5 - 0.5 / scale;
+
+   // Figure out where in the texel to sample to get correct pre-scaled bilinear.
+   // Uses the hardware bilinear interpolator to avoid having to sample 4 times manually.
+
+   vec2 center_dist = fp - 0.5;
+
+   vec2 fpp = (center_dist - clamp(center_dist, -region_range, region_range)) * scale + 0.5;
+
+   vec2 mod_texel = texel_floored + fpp;
+   vec2 coords = mod_texel / SourceSize.xy;
+
+        vec3 sample1 = SampleLocation(vec2(coords.x + blurx*SourceSize.z, coords.y - blury*SourceSize.w)).rgb;
+        vec3 sample2 = SampleLocation(coords).rgb;
+        vec3 sample3 = SampleLocation(vec2(coords.x - blurx*SourceSize.z, coords.y + blury*SourceSize.w )).rgb;
+        
+        vec3 color = vec3(sample1.r * 0.5  + sample2.r * 0.5, 
+                          sample1.g * 0.25 + sample2.g * 0.5 + sample3.g * 0.25,
+                          sample2.b * 0.5  + sample3.b * 0.5);
+        if (palette_fix != 0.0) 
+        {
+            if (palette_fix == 1.0) color = color* 1.0667;
+            else if (palette_fix == 2.0) color = color * 2.0;
+        }
+
+        //COLOR TEMPERATURE FROM GUEST.R-DR.VENOM
+        if (WP != 0.0)
+        {
+            vec3 warmer = D50_to_XYZ * color;
+            warmer = XYZ_to_D65 * warmer; 
+            
+            vec3 cooler = D65_to_XYZ * color;
+            cooler = XYZ_to_D50 * cooler;
+            
+            float m = abs(WP) / 100.0;
+            vec3 comp = (WP < 0.0) ? cooler : warmer;
+            comp = clamp(comp, 0.0, 1.0);   
+            
+            color = vec3(mix(color, comp, m));
+        }
+
+     mat3 hue = mat3 (1., rg,  rb,                 //red tint
+                      gr,  1., gb,                  //green tint
+                      br,  bg,  1.);                //blue tint
+
+        color = hue * color;
+
+        color = (2.0*pow(color,vec3(2.8))) - pow(color,vec3(3.6));
+
+        float lum = color.r * 0.3 + color.g * 0.6 + color.b * 0.1;
+
+        float f = fract(fp.y -0.5);
+        
+        if (inter > 0.5 && tex_size.y > 400.0) color = color; 
+        else
+        {color = color * sw(f,lum) + color * sw (1.0-f,lum);}
+        
+        float lum1 = color.r * 0.3 + color.g * 0.6 + color.b * 0.1;
+
+        
+        color *= mix(mask((vTexCoord * OutputSize.xy), color,lum1), vec3(1.0), lum1*preserve);
+        
+
+        if (slotmask != 0.0) color *= SlotMask((vTexCoord * OutputSize.xy) * 1.0001, color);
+        
+        color *= mix(brightboost1, brightboost2, max(max(color.r, color.g), color.b));    
+
+    
+
+        color = pow(color,vec3(1.0 / GAMMA_OUT));
+                if (glow_str != 0.0) color += glow0(coords,color);
+
+        if (sat    != 1.0) color  = saturation(color);
+        if (corner != 0.0) color *= corner0(pC4);
+        if (nois   != 0.0) color *= 1.0 + noise(coords * 2.0) / nois;
+
+        color *= mix(1.0, postbr, lum);
+        res = vec4(color, 1.0);
+        if (contrast != 1.0) res = contrastMatrix(contrast) * res;
+        if (inter > 0.5 && SourceSize.y > 400.0 && fract(iTime) < 0.5) res = res * 0.95;
+        res.rgb *= vign(lum);
+
+    }
+    
+    SetOutput(res);
+}
--- a/data/resources/shaders/dolphinfx/crt/CRT-EASYMODE.glsl
+++ b/data/resources/shaders/dolphinfx/crt/CRT-EASYMODE.glsl
@@ -0,0 +1,277 @@
+//    CRT Shader by EasyMode
+//    License: GPL
+
+//    A flat CRT shader ideally for 1080p or higher displays.
+
+//    Recommended Settings:
+
+//    Video
+//    - Aspect Ratio:  4:3
+//    - Integer Scale: Off
+
+//    Shader
+//    - Filter: Nearest
+//    - Scale:  Don't Care
+
+//    Example RGB Mask Parameter Settings:
+
+//    Aperture Grille (Default)
+//    - Dot Width:  1
+//    - Dot Height: 1
+//    - Stagger:    0
+
+//    Lottes' Shadow Mask
+//    - Dot Width:  2
+//    - Dot Height: 1
+//    - Stagger:    3
+
+
+/*
+[configuration]
+
+[OptionRangeFloat]
+GUIName = Sharpness Horizontal
+OptionName = SHARPNESS_H
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.5
+
+[OptionRangeFloat]
+GUIName = Sharpness Vertical
+OptionName = SHARPNESS_V
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Mask Strength
+OptionName = MASK_STRENGTH
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.01
+DefaultValue = 0.3
+
+[OptionRangeFloat]
+GUIName = Mask Dot Width
+OptionName = MASK_DOT_WIDTH
+MinValue = 1.0
+MaxValue = 100.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Mask Dot Height
+OptionName = MASK_DOT_HEIGHT
+MinValue = 1.0
+MaxValue = 100.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Mask Stagger
+OptionName = MASK_STAGGER
+MinValue = 0.0
+MaxValue = 100.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Mask Size
+OptionName = MASK_SIZE
+MinValue = 1.0
+MaxValue = 100.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Scanline Strength
+OptionName = SCANLINE_STRENGTH
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Scanline Beam Width Min.
+OptionName = SCANLINE_BEAM_WIDTH_MIN
+MinValue = 0.5
+MaxValue = 5.0
+StepAmount = 0.5
+DefaultValue = 1.5
+
+[OptionRangeFloat]
+GUIName = Scanline Beam Width Max.
+OptionName = SCANLINE_BEAM_WIDTH_MAX
+MinValue = 0.5
+MaxValue = 5.0
+StepAmount = 0.5
+DefaultValue = 1.5
+
+[OptionRangeFloat]
+GUIName = Scanline Brightness Min.
+OptionName = SCANLINE_BRIGHT_MIN
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.35
+
+[OptionRangeFloat]
+GUIName = Scanline Brightness Max.
+OptionName = SCANLINE_BRIGHT_MAX
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.65
+
+[OptionRangeFloat]
+GUIName = Scanline Cutoff
+OptionName = SCANLINE_CUTOFF
+MinValue = 1.0
+MaxValue = 1000.0
+StepAmount = 1.0
+DefaultValue = 400.0
+
+[OptionRangeFloat]
+GUIName = Gamma Input
+OptionName = GAMMA_INPUT
+MinValue = 0.1
+MaxValue = 5.0
+StepAmount = 0.1
+DefaultValue = 2.0
+
+[OptionRangeFloat]
+GUIName = Gamma Output
+OptionName = GAMMA_OUTPUT
+MinValue = 0.1
+MaxValue = 5.0
+StepAmount = 0.1
+DefaultValue = 1.8
+
+[OptionRangeFloat]
+GUIName = Brightness Boost
+OptionName = BRIGHT_BOOST
+MinValue = 1.0
+MaxValue = 2.0
+StepAmount = 0.01
+DefaultValue = 1.2
+
+[OptionRangeFloat]
+GUIName = Dilation
+OptionName = DILATION
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[/configuration]
+*/
+
+#define FIX(c) max(abs(c), 1e-5)
+#define PI 3.141592653589
+
+#define TEX2D(c) dilate(SampleLocation(c))
+
+// Set to 0 to use linear filter and gain speed
+#define ENABLE_LANCZOS 1
+
+vec4 dilate(vec4 col)
+{
+    vec4 x = mix(vec4(1.0), col, GetOption(DILATION));
+
+    return col * x;
+}
+
+float curve_distance(float x, float sharp)
+{
+
+/*
+    apply half-circle s-curve to distance for sharper (more pixelated) interpolation
+    single line formula for Graph Toy:
+    0.5 - sqrt(0.25 - (x - step(0.5, x)) * (x - step(0.5, x))) * sign(0.5 - x)
+*/
+
+    float x_step = step(0.5, x);
+    float curve = 0.5 - sqrt(0.25 - (x - x_step) * (x - x_step)) * sign(0.5 - x);
+
+    return mix(x, curve, sharp);
+}
+
+mat4x4 get_color_matrix(vec2 co, vec2 dx)
+{
+    return mat4x4(TEX2D(co - dx), TEX2D(co), TEX2D(co + dx), TEX2D(co + 2.0 * dx));
+}
+
+vec3 filter_lanczos(vec4 coeffs, mat4x4 color_matrix)
+{
+    vec4 col        = color_matrix * coeffs;
+    vec4 sample_min = min(color_matrix[1], color_matrix[2]);
+    vec4 sample_max = max(color_matrix[1], color_matrix[2]);
+
+    col = clamp(col, sample_min, sample_max);
+
+    return col.rgb;
+}
+
+void main()
+{
+    vec2 vTexCoord = GetCoordinates();
+    vec2 nativeSize = 1.0 / GetInvNativePixelSize();
+    vec4 SourceSize = vec4(nativeSize, 1.0/nativeSize);
+
+    vec2 dx     = vec2(SourceSize.z, 0.0);
+    vec2 dy     = vec2(0.0, SourceSize.w);
+    vec2 pix_co = vTexCoord * SourceSize.xy - vec2(0.5, 0.5);
+    vec2 tex_co = (floor(pix_co) + vec2(0.5, 0.5)) * SourceSize.zw;
+    vec2 dist   = fract(pix_co);
+    float curve_x;
+    vec3 col, col2;
+
+#if ENABLE_LANCZOS
+    curve_x = curve_distance(dist.x, GetOption(SHARPNESS_H) * GetOption(SHARPNESS_H));
+
+    vec4 coeffs = PI * vec4(1.0 + curve_x, curve_x, 1.0 - curve_x, 2.0 - curve_x);
+
+    coeffs = FIX(coeffs);
+    coeffs = 2.0 * sin(coeffs) * sin(coeffs * 0.5) / (coeffs * coeffs);
+    coeffs /= dot(coeffs, vec4(1.0));
+
+    col  = filter_lanczos(coeffs, get_color_matrix(tex_co, dx));
+    col2 = filter_lanczos(coeffs, get_color_matrix(tex_co + dy, dx));
+#else
+    curve_x = curve_distance(dist.x, GetOption(SHARPNESS_H));
+
+    col  = mix(TEX2D(tex_co).rgb,      TEX2D(tex_co + dx).rgb,      curve_x);
+    col2 = mix(TEX2D(tex_co + dy).rgb, TEX2D(tex_co + dx + dy).rgb, curve_x);
+#endif
+
+    col = mix(col, col2, curve_distance(dist.y, GetOption(SHARPNESS_V)));
+    col = pow(col, vec3(GetOption(GAMMA_INPUT) / (GetOption(DILATION) + 1.0)));
+
+    float luma        = dot(vec3(0.2126, 0.7152, 0.0722), col);
+    float bright      = (max(col.r, max(col.g, col.b)) + luma) * 0.5;
+    float scan_bright = clamp(bright, GetOption(SCANLINE_BRIGHT_MIN), GetOption(SCANLINE_BRIGHT_MAX));
+    float scan_beam   = clamp(bright * GetOption(SCANLINE_BEAM_WIDTH_MAX), GetOption(SCANLINE_BEAM_WIDTH_MIN), GetOption(SCANLINE_BEAM_WIDTH_MAX));
+    float scan_weight = 1.0 - pow(cos(vTexCoord.y * 2.0 * PI * SourceSize.y) * 0.5 + 0.5, scan_beam) * GetOption(SCANLINE_STRENGTH);
+
+    float mask   = 1.0 - GetOption(MASK_STRENGTH);    
+    vec2 mod_fac = floor(vTexCoord * GetWindowSize().xy * SourceSize.xy / (SourceSize.xy * vec2(GetOption(MASK_SIZE), GetOption(MASK_DOT_HEIGHT) * GetOption(MASK_SIZE))));
+    int dot_no   = int(mod((mod_fac.x + mod(mod_fac.y, 2.0) * GetOption(MASK_STAGGER)) / GetOption(MASK_DOT_WIDTH), 3.0));
+    vec3 mask_weight;
+
+    if      (dot_no == 0) mask_weight = vec3(1.0,  mask, mask);
+    else if (dot_no == 1) mask_weight = vec3(mask, 1.0,  mask);
+    else                  mask_weight = vec3(mask, mask, 1.0);
+
+    if (SourceSize.y >= GetOption(SCANLINE_CUTOFF)) 
+        scan_weight = 1.0;
+
+    col2 = col.rgb;
+    col *= vec3(scan_weight);
+    col  = mix(col, col2, scan_bright);
+    col *= mask_weight;
+    col  = pow(col, vec3(1.0 / GetOption(GAMMA_OUTPUT)));
+
+    SetOutput(vec4(col * GetOption(BRIGHT_BOOST), 1.0));
+}
--- a/data/resources/shaders/dolphinfx/crt/ZFAST-CRT-COMPOSITE.glsl
+++ b/data/resources/shaders/dolphinfx/crt/ZFAST-CRT-COMPOSITE.glsl
@@ -0,0 +1,180 @@
+//    zfast_crt - A very simple CRT shader.
+
+//    Copyright (C) 2017 Greg Hogan (SoltanGris42)
+//	edited by metallic 77.
+//	ported to slang by gregoricavichioli & hunterk.
+//      ported to dolphinfx by Hyllian.
+
+//    This program is free software; you can redistribute it and/or modify it
+//    under the terms of the GNU General Public License as published by the Free
+//    Software Foundation; either version 2 of the License, or (at your option)
+//    any later version.
+
+
+/*
+[configuration]
+
+[OptionRangeFloat]
+GUIName = Curvature
+OptionName = Curvature
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Convergence X-Axis
+OptionName = blurx
+MinValue = -1.0
+MaxValue =  2.0
+StepAmount = 0.05
+DefaultValue = 0.85
+
+[OptionRangeFloat]
+GUIName = Convergence Y-Axis
+OptionName = blury
+MinValue = -1.0
+MaxValue =  1.0
+StepAmount = 0.05
+DefaultValue = -0.10
+
+[OptionRangeFloat]
+GUIName = Scanline Amount (Low)
+OptionName = HIGHSCANAMOUNT1
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.4
+
+[OptionRangeFloat]
+GUIName = Scanline Amount (High)
+OptionName = HIGHSCANAMOUNT2
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.3
+
+[OptionRangeFloat]
+GUIName = Mask Type
+OptionName = TYPE
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 1.0
+DefaultValue = 0.0
+
+[OptionRangeFloat]
+GUIName = Mask Effect Amount
+OptionName = MASK_DARK
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.3
+
+[OptionRangeFloat]
+GUIName = Mask/Scanline Fade
+OptionName = MASK_FADE
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.05
+DefaultValue = 0.7
+
+[OptionRangeFloat]
+GUIName = Saturation
+OptionName = sat
+MinValue = 0.0
+MaxValue = 3.0
+StepAmount = 0.05
+DefaultValue = 1.0
+
+[OptionRangeFloat]
+GUIName = Flicker
+OptionName = FLICK
+MinValue = 0.0
+MaxValue = 50.0
+StepAmount = 1.0
+DefaultValue = 10.0
+
+[/configuration]
+*/
+
+#define pi 3.14159
+
+#define blur_y GetOption(blury)/(SourceSize.y*2.0)
+#define blur_x GetOption(blurx)/(SourceSize.x*2.0)
+#define iTimer (float(GetTime())*2.0)
+#define flicker GetOption(FLICK)/1000.0
+
+// Distortion of scanlines, and end of screen alpha.
+vec2 Warp(vec2 pos)
+{
+    pos  = pos*2.0-1.0;    
+    pos *= vec2(1.0 + (pos.y*pos.y)*0.03, 1.0 + (pos.x*pos.x)*0.05);
+    
+    return pos*0.5 + 0.5;
+}
+
+
+void main()
+{
+    vec2 vTexCoord  = GetCoordinates();
+    vec2 texSize = 1.0 / GetInvNativePixelSize();
+    vec4 SourceSize = vec4(texSize, 1.0 / texSize);
+    
+    float maskFade = 0.3333*GetOption(MASK_FADE);
+    float omega    = 2.0*pi*SourceSize.y;
+
+    vec2 pos,corn;
+    if (GetOption(Curvature) == 1.0) 
+{
+    pos = Warp(vTexCoord.xy);
+    corn = min(pos,vec2(1.0)-pos); // This is used to mask the rounded
+    corn.x = 0.00001/corn.x;           // corners later on
+   
+}
+
+     else pos = vTexCoord;    
+     float OGL2Pos = pos.y*SourceSize.y;
+     float cent = floor(OGL2Pos)+0.5;
+     float ycoord = cent*SourceSize.w; 
+     ycoord = mix(pos.y,ycoord,0.6);
+     pos = vec2(pos.x,ycoord);
+
+
+     vec3 sample1 = sin(iTimer)*flicker + SampleLocation(vec2(pos.x + blur_x, pos.y - blur_y)).rgb;
+     vec3 sample2 =                0.5*SampleLocation(pos).rgb;
+     vec3 sample3 = sin(iTimer)*flicker + SampleLocation(vec2(pos.x - blur_x, pos.y + blur_y)).rgb;
+    
+     vec3 colour = vec3 (sample1.r*0.5  + sample2.r, 
+                         sample1.g*0.25 + sample2.g + sample3.g*0.25, 
+                                          sample2.b + sample3.b*0.5);
+    
+     vec3 interl = colour;
+     vec3 lumweight=vec3(0.22,0.71,0.07);
+     float lumsat = dot(colour,lumweight);
+   
+     vec3 graycolour = vec3(lumsat);
+     colour = vec3(mix(graycolour,colour.rgb,sat));
+
+     float SCANAMOUNT = mix(GetOption(HIGHSCANAMOUNT1),GetOption(HIGHSCANAMOUNT2),max(max(colour.r,colour.g),colour.b));
+         
+
+    if (SourceSize.y > 400.0) {
+    colour ;
+    } 
+else {
+    colour *= SCANAMOUNT * sin(fract(OGL2Pos)*3.14159)+1.0-SCANAMOUNT;
+    colour *= SCANAMOUNT * sin(fract(1.0-OGL2Pos)*3.14159)+1.0-SCANAMOUNT;
+    colour *= SCANAMOUNT * sin(fract(1.0+OGL2Pos)*3.14159)+1.0-SCANAMOUNT;
+    }
+
+     float steps; if (GetOption(TYPE) == 0.0) steps = 0.5; else steps = 0.3333;
+     float whichmask = fract(vTexCoord.x*GetWindowSize().x*steps);
+     float mask = 1.0 + float(whichmask < steps) * (-GetOption(MASK_DARK));
+
+    colour.rgb = mix(mask*colour, colour, dot(colour.rgb,vec3(maskFade)));
+
+    if (GetOption(Curvature) == 1.0 && corn.y < corn.x || GetOption(Curvature) == 1.0 && corn.x < 0.00001 )
+    colour = vec3(0.0); 
+
+    SetOutput(vec4(colour.rgb, 1.0));
+}
--- a/data/resources/shaders/dolphinfx/interpolation/JINC2.glsl
+++ b/data/resources/shaders/dolphinfx/interpolation/JINC2.glsl
@@ -0,0 +1,144 @@
+
+//   Hyllian's jinc windowed-jinc 2-lobe with anti-ringing Shader
+   
+//   Copyright (C) 2011-2024 Hyllian - sergiogdb@gmail.com
+
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your option) any later version.
+
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/*
+[configuration]
+
+[OptionRangeFloat]
+GUIName = Window Sinc Param
+OptionName = JINC2_WINDOW_SINC
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.01
+DefaultValue = 0.50
+
+[OptionRangeFloat]
+GUIName = Sinc Param
+OptionName = JINC2_SINC
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.01
+DefaultValue = 0.88
+
+[OptionRangeFloat]
+GUIName = Anti-ringing Strength
+OptionName = JINC2_AR_STRENGTH
+MinValue = 0.0
+MaxValue = 1.0
+StepAmount = 0.1
+DefaultValue = 0.5
+
+[/configuration]
+*/
+
+#define halfpi  1.5707963267948966192313216916398
+#define pi    3.1415926535897932384626433832795
+#define wa    (JINC2_WINDOW_SINC*pi)
+#define wb    (JINC2_SINC*pi)
+
+// Calculates the distance between two points
+float d(vec2 pt1, vec2 pt2)
+{
+  vec2 v = pt2 - pt1;
+  return sqrt(dot(v,v));
+}
+
+vec3 min4(vec3 a, vec3 b, vec3 c, vec3 d)
+{
+    return min(a, min(b, min(c, d)));
+}
+
+vec3 max4(vec3 a, vec3 b, vec3 c, vec3 d)
+{
+    return max(a, max(b, max(c, d)));
+}
+
+vec4 resampler(vec4 x)
+{
+	vec4 res;
+	res.x = (x.x==0.0) ?  wa*wb  :  sin(x.x*wa)*sin(x.x*wb)/(x.x*x.x);
+	res.y = (x.y==0.0) ?  wa*wb  :  sin(x.y*wa)*sin(x.y*wb)/(x.y*x.y);
+	res.z = (x.z==0.0) ?  wa*wb  :  sin(x.z*wa)*sin(x.z*wb)/(x.z*x.z);
+	res.w = (x.w==0.0) ?  wa*wb  :  sin(x.w*wa)*sin(x.w*wb)/(x.w*x.w);
+	return res;
+}
+
+void main()
+{
+    vec2 SourceSize = 1.0 / GetInvNativePixelSize();
+    vec2 invSourceSize = 1.0 / SourceSize;
+    vec2 vTexCoord = GetCoordinates();
+
+    vec3 color;
+    mat4x4 weights;
+
+    vec2 dx = vec2(1.0, 0.0);
+    vec2 dy = vec2(0.0, 1.0);
+
+    vec2 pc = vTexCoord*SourceSize;
+
+    vec2 tc = (floor(pc-vec2(0.5,0.5))+vec2(0.5,0.5));
+     
+    weights[0] = resampler(vec4(d(pc, tc    -dx    -dy), d(pc, tc           -dy), d(pc, tc    +dx    -dy), d(pc, tc+2.0*dx    -dy)));
+    weights[1] = resampler(vec4(d(pc, tc    -dx       ), d(pc, tc              ), d(pc, tc    +dx       ), d(pc, tc+2.0*dx       )));
+    weights[2] = resampler(vec4(d(pc, tc    -dx    +dy), d(pc, tc           +dy), d(pc, tc    +dx    +dy), d(pc, tc+2.0*dx    +dy)));
+    weights[3] = resampler(vec4(d(pc, tc    -dx+2.0*dy), d(pc, tc       +2.0*dy), d(pc, tc    +dx+2.0*dy), d(pc, tc+2.0*dx+2.0*dy)));
+
+    dx = dx * invSourceSize;
+    dy = dy * invSourceSize;
+    tc = tc * invSourceSize;
+     
+     // reading the texels
+     
+    vec3 c00 = SampleLocation(tc    -dx    -dy).xyz;
+    vec3 c10 = SampleLocation(tc           -dy).xyz;
+    vec3 c20 = SampleLocation(tc    +dx    -dy).xyz;
+    vec3 c30 = SampleLocation(tc+2.0*dx    -dy).xyz;
+    vec3 c01 = SampleLocation(tc    -dx       ).xyz;
+    vec3 c11 = SampleLocation(tc              ).xyz;
+    vec3 c21 = SampleLocation(tc    +dx       ).xyz;
+    vec3 c31 = SampleLocation(tc+2.0*dx       ).xyz;
+    vec3 c02 = SampleLocation(tc    -dx    +dy).xyz;
+    vec3 c12 = SampleLocation(tc           +dy).xyz;
+    vec3 c22 = SampleLocation(tc    +dx    +dy).xyz;
+    vec3 c32 = SampleLocation(tc+2.0*dx    +dy).xyz;
+    vec3 c03 = SampleLocation(tc    -dx+2.0*dy).xyz;
+    vec3 c13 = SampleLocation(tc       +2.0*dy).xyz;
+    vec3 c23 = SampleLocation(tc    +dx+2.0*dy).xyz;
+    vec3 c33 = SampleLocation(tc+2.0*dx+2.0*dy).xyz;
+
+    //  Get min/max samples
+    vec3 min_sample = min4(c11, c21, c12, c22);
+    vec3 max_sample = max4(c11, c21, c12, c22);
+
+    color = mat4x3(c00, c10, c20, c30) * weights[0];
+    color+= mat4x3(c01, c11, c21, c31) * weights[1];
+    color+= mat4x3(c02, c12, c22, c32) * weights[2];
+    color+= mat4x3(c03, c13, c23, c33) * weights[3];
+    color = color/(dot(weights * vec4(1.0), vec4(1.0)));
+
+    // Anti-ringing
+    vec3 aux = color;
+    color = clamp(color, min_sample, max_sample);
+
+    color = mix(aux, color, JINC2_AR_STRENGTH);
+ 
+    // final sum and weight normalization
+    SetOutput(vec4(color, 1.0));
+}
--- a/data/resources/shaders/dolphinfx/scanlines.glsl
+++ b/data/resources/shaders/dolphinfx/scanlines.glsl
@@ -1,65 +1,120 @@
+/*===============================================================================*\
+|########################     [Dolphin FX Suite 2.20]      #######################|
+|##########################        By Asmodean          ##########################|
+||                                                                               ||
+||          This program is free software; you can redistribute it and/or        ||
+||          modify it under the terms of the GNU General Public License          ||
+||          as published by the Free Software Foundation; either version 2       ||
+||          of the License, or (at your option) any later version.               ||
+||                                                                               ||
+||          This program is distributed in the hope that it will be useful,      ||
+||          but WITHOUT ANY WARRANTY; without even the implied warranty of       ||
+||          MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        ||
+||          GNU General Public License for more details. (C)2015                 ||
+||                                                                               ||
+|#################################################################################|
+\*===============================================================================*/
+
+// Sourced from https://raw.githubusercontent.com/Asmodean-/dolphin/89d640cd557189bb5f921fc219150c74c39bdc55/Data/Sys/Shaders/DolphinFX.glsl with modifications.
+
 /*
 [configuration]

-[OptionRangeFloat]
-GUIName = Active Line Brightness
-OptionName = BRIGHTEN
-MinValue = 0.1
-MaxValue = 2.0
-StepAmount = 0.1
-DefaultValue = 1.1
+[OptionRangeInteger]
+GUIName = ScanlineType
+OptionName = A_SCANLINE_TYPE
+MinValue = 0
+MaxValue = 2
+StepAmount = 1
+DefaultValue = 0

 [OptionRangeFloat]
-GUIName = Inactive Line Darkness
-OptionName = DARKEN
-MinValue = 0.1
-MaxValue = 1.0
+GUIName = ScanlineIntensity
+OptionName = B_SCANLINE_INTENSITY
+MinValue = 0.15
+MaxValue = 0.30
 StepAmount = 0.01
-DefaultValue = 0.5
+DefaultValue = 0.18

 [OptionRangeFloat]
-GUIName = Scanline Thickness
-OptionName = THICKNESS
-MinValue = 0.1
-MaxValue = 1.0
+GUIName = ScanlineThickness
+OptionName = B_SCANLINE_THICKNESS
+MinValue = 0.20
+MaxValue = 0.80
 StepAmount = 0.01
-DefaultValue = 0.5
+DefaultValue = 0.50

 [OptionRangeFloat]
-GUIName = Scanline Spacing
-OptionName = SPACING
-MinValue = 0.1
-MaxValue = 1.0
+GUIName = ScanlineBrightness
+OptionName = B_SCANLINE_BRIGHTNESS
+MinValue = 0.50
+MaxValue = 2.00
+StepAmount = 0.01
+DefaultValue = 1.10
+
+[OptionRangeFloat]
+GUIName = ScanlineSpacing
+OptionName = B_SCANLINE_SPACING
+MinValue = 0.10
+MaxValue = 0.99
 StepAmount = 0.01
 DefaultValue = 0.25

 [/configuration]
 */

-float3 RGBToYUV(float3 rgb)
+//Average relative luminance
+CONSTANT float3 lumCoeff = float3(0.2126729, 0.7151522, 0.0721750);
+float AvgLuminance(float3 color)
 {
-  return float3(dot(rgb.rgb, float3(0.299, 0.587, 0.114)),
-                dot(rgb.rgb, float3(-0.14713, -0.28886, 0.436)),
-                dot(rgb.rgb, float3(0.615, -0.51499, -0.10001)));
-}
-
-float3 YUVToRGB(float3 yuv)
-{
-  return float3(dot(yuv, float3(1.0f, 0.0, 1.13983)),
-                dot(yuv, float3(1.0f, -0.39465, -0.58060)),
-                dot(yuv, float3(1.0f, 2.03211, 0.0)));
+    return sqrt(
+    (color.x * color.x * lumCoeff.x) +
+    (color.y * color.y * lumCoeff.y) +
+    (color.z * color.z * lumCoeff.z));
 }

 void main()
 {
-  float2 pos = GetFragCoord();
-  float4 color = Sample();
-  float3 yuv = RGBToYUV(color.rgb);
+    float4 color = Sample();
+    float4 intensity = float4(0.0, 0.0, 0.0, 0.0);

-  float thickness = GetOption(THICKNESS);
-  float spacing = GetOption(SPACING);
-  yuv.r *= (frac(pos.y * spacing) > thickness) ? (1.0 - GetOption(DARKEN)) : GetOption(BRIGHTEN);
+    if (GetOption(A_SCANLINE_TYPE) == 0) { //X coord scanlines
+    if (fract(gl_FragCoord.y * GetOption(B_SCANLINE_SPACING)) > GetOption(B_SCANLINE_THICKNESS))
+    {
+        intensity = float4(0.0, 0.0, 0.0, 0.0);
+    } 
+    else
+    {
+        intensity = smoothstep(0.2, GetOption(B_SCANLINE_BRIGHTNESS), color) +
+        normalize(float4(color.xyz, AvgLuminance(color.xyz)));
+    } }

-  color.rgb = YUVToRGB(yuv);
-  SetOutput(color);
-}
+    else if (GetOption(A_SCANLINE_TYPE) == 1) { //Y coord scanlines
+    if (fract(gl_FragCoord.x * GetOption(B_SCANLINE_SPACING)) > GetOption(B_SCANLINE_THICKNESS))
+    {
+        intensity = float4(0.0, 0.0, 0.0, 0.0);
+    }
+    else
+    {
+        intensity = smoothstep(0.2, GetOption(B_SCANLINE_BRIGHTNESS), color) +
+        normalize(float4(color.xyz, AvgLuminance(color.xyz)));
+    } }
+
+    else if (GetOption(A_SCANLINE_TYPE) == 2) { //XY coord scanlines
+    if (fract(gl_FragCoord.x * GetOption(B_SCANLINE_SPACING)) > GetOption(B_SCANLINE_THICKNESS) &&
+        fract(gl_FragCoord.y * GetOption(B_SCANLINE_SPACING)) > GetOption(B_SCANLINE_THICKNESS))
+    {
+        intensity = float4(0.0, 0.0, 0.0, 0.0);
+    }
+    else
+    {
+        intensity = smoothstep(0.2, GetOption(B_SCANLINE_BRIGHTNESS), color) +
+        normalize(float4(color.xyz, AvgLuminance(color.xyz)));
+    } }
+
+    float level = (4.0-GetCoordinates().x) * GetOption(B_SCANLINE_INTENSITY);
+
+    color = intensity * (0.5 - level) + color * 1.1;
+
+    SetOutput(saturate(color));
+}
--- a/data/resources/shaders/reshade/Shaders/CRT-Guest-HD.fx
+++ b/data/resources/shaders/reshade/Shaders/CRT-Guest-HD.fx
--- a/data/resources/shaders/reshade/Shaders/DisplayDepth.fx
+++ b/data/resources/shaders/reshade/Shaders/DisplayDepth.fx
@@ -1,427 +0,0 @@
-/*
-  DisplayDepth by CeeJay.dk (with many updates and additions by the Reshade community)
-
-  Visualizes the depth buffer. The distance of pixels determine their brightness.
-  Close objects are dark. Far away objects are bright.
-  Use this to configure the depth input preprocessor definitions (RESHADE_DEPTH_INPUT_*).
-*/
-
-#include "ReShade.fxh"
-
-// -- Basic options --
-#if RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN
-#define TEXT_UPSIDE_DOWN "1"
-#define TEXT_UPSIDE_DOWN_ALTER "0"
-#else
-#define TEXT_UPSIDE_DOWN "0"
-#define TEXT_UPSIDE_DOWN_ALTER "1"
-#endif
-#if RESHADE_DEPTH_INPUT_IS_REVERSED
-#define TEXT_REVERSED "1"
-#define TEXT_REVERSED_ALTER "0"
-#else
-#define TEXT_REVERSED "0"
-#define TEXT_REVERSED_ALTER "1"
-#endif
-#if RESHADE_DEPTH_INPUT_IS_LOGARITHMIC
-#define TEXT_LOGARITHMIC "1"
-#define TEXT_LOGARITHMIC_ALTER "0"
-#else
-#define TEXT_LOGARITHMIC "0"
-#define TEXT_LOGARITHMIC_ALTER "1"
-#endif
-
-// "ui_text" was introduced in ReShade 4.5, so cannot show instructions in older versions
-
-uniform int iUIPresentType <
-    ui_label = "Present type";
-    ui_label_ja_jp = "画面効果";
-    ui_type = "combo";
-    ui_items = "Depth map\0Normal map\0Show both (Vertical 50/50)\0";
-    ui_items_ja_jp = "深度マップ\0法線マップ\0両方を表示 (左右分割)\0";
-#if __RESHADE__ < 40500
-    ui_tooltip =
-#else
-    ui_text =
-#endif
-        "The right settings need to be set in the dialog that opens after clicking the \"Edit global preprocessor definitions\" button above.\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN is currently set to " TEXT_UPSIDE_DOWN ".\n"
-        "If the Depth map is shown upside down set it to " TEXT_UPSIDE_DOWN_ALTER ".\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_REVERSED is currently set to " TEXT_REVERSED ".\n"
-        "If close objects in the Depth map are bright and far ones are dark set it to " TEXT_REVERSED_ALTER ".\n"
-        "Also try this if you can see the normals, but the depth view is all black.\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_LOGARITHMIC is currently set to " TEXT_LOGARITHMIC ".\n"
-        "If the Normal map has banding artifacts (extra stripes) set it to " TEXT_LOGARITHMIC_ALTER ".";
-    ui_text_ja_jp =
-#if ADDON_ADJUST_DEPTH
-        "Adjust Depthアドオンのインストールを検出しました。\n"
-        "'設定に保存して反映する'ボタンをクリックすると、このエフェクトで調節した全ての変数が共通設定に反映されます。\n"
-        "または、上の'プリプロセッサの定義を編集'ボタンをクリックした後に開くダイアログで直接編集する事もできます。";
-#else
-        "調節が終わったら、上の'プリプロセッサの定義を編集'ボタンをクリックした後に開くダイアログに入力する必要があります。\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWNは現在" TEXT_UPSIDE_DOWN "に設定されています。\n"
-        "深度マップが上下逆さまに表示されている場合は" TEXT_UPSIDE_DOWN_ALTER "に変更して下さい。\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_REVERSEDは現在" TEXT_REVERSED "に設定されています。\n"
-        "画面効果が深度マップのとき、近くの形状がより白く、遠くの形状がより黒い場合は" TEXT_REVERSED_ALTER "に変更して下さい。\n"
-        "また、法線マップで形が判別出来るが、深度マップが真っ暗に見えるという場合も、この設定の変更を試して下さい。\n"
-        "\n"
-        "RESHADE_DEPTH_INPUT_IS_LOGARITHMICは現在" TEXT_LOGARITHMIC "に設定されています。\n"
-        "画面効果に実際のレンダリングと合致しない縞模様がある場合は" TEXT_LOGARITHMIC_ALTER "に変更して下さい。";
-#endif
-    ui_tooltip_ja_jp =
-        "'深度マップ'は、形状の遠近を白黒で表現します。正しい見え方では、近くの形状ほど黒く、遠くの形状ほど白くなります。\n"
-        "'法線マップ'は、形状を滑らかに表現します。正しい見え方では、全体的に青緑風で、地平線を見たときに地面が緑掛かった色合いになります。\n"
-        "'両方を表示 (左右分割)'が選択された場合は、左に法線マップ、右に深度マップを表示します。";
-> = 2;
-
-uniform bool bUIShowOffset <
-    ui_label = "Blend Depth map into the image (to help with finding the right offset)";
-    ui_label_ja_jp = "透かし比較";
-    ui_tooltip_ja_jp = "補正作業を支援するために、画面効果を半透過で適用します。";
-> = false;
-
-uniform bool bUIUseLivePreview <
-    ui_category = "Preview settings";
-    ui_category_ja_jp = "基本的な補正";
-#if __RESHADE__ <= 50902
-    ui_category_closed = true;
-#elif !ADDON_ADJUST_DEPTH
-    ui_category_toggle = true;
-#endif
-    ui_label = "Show live preview and ignore preprocessor definitions";
-    ui_label_ja_jp = "プリプロセッサの定義を無視 (補正プレビューをオン)";
-    ui_tooltip = "Enable this to preview with the current preset settings instead of the global preprocessor settings.";
-    ui_tooltip_ja_jp =
-        "共通設定に保存されたプリプロセッサの定義ではなく、これより下のプレビュー設定を使用するには、これを有効にします。\n"
-#if ADDON_ADJUST_DEPTH
-        "設定の準備が出来たら、'設定に保存して反映する'ボタンをクリックしてから、このチェックボックスをオフにして下さい。"
-#else
-        "設定の準備が出来たら、上の'プリプロセッサの定義を編集'ボタンをクリックした後に開くダイアログに入力して下さい。"
-#endif
-        "\n\n"
-        "プレビューをオンにした場合と比較して画面効果がまったく同じになれば、正しく設定が反映されています。";
-> = false;
-
-#if __RESHADE__ <= 50902
-uniform int iUIUpsideDown <
-#else
-uniform bool iUIUpsideDown <
-#endif
-    ui_category = "Preview settings";
-    ui_label = "Upside Down";
-    ui_label_ja_jp = "深度バッファの上下反転を修正";
-#if __RESHADE__ <= 50902
-    ui_type = "combo";
-    ui_items = "Off\0On\0";
-#endif
-    ui_text_ja_jp =
-        "\n"
-#if ADDON_ADJUST_DEPTH
-        "項目にカーソルを合わせると、設定が必要な状況の説明が表示されます。"
-#else
-        "項目にカーソルを合わせると、設定が必要な状況の説明と、プリプロセッサの定義が表示されます。"
-#endif
-    ;
-    ui_tooltip_ja_jp =
-        "深度マップが上下逆さまに表示されている場合は変更して下さい。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN=値\n"
-        "定義値は次の通りです。オンの場合は1、オフの場合は0を指定して下さい。\n"
-        "RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN=1\n"
-        "RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN=0"
-#endif
-        ;
-> = RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN;
-
-#if __RESHADE__ <= 50902
-uniform int iUIReversed <
-#else
-uniform bool iUIReversed <
-#endif
-    ui_category = "Preview settings";
-    ui_label = "Reversed";
-    ui_label_ja_jp = "深度バッファの奥行反転を修正";
-#if __RESHADE__ <= 50902
-    ui_type = "combo";
-    ui_items = "Off\0On\0";
-#endif
-    ui_tooltip_ja_jp =
-        "画面効果が深度マップのとき、近くの形状が明るく、遠くの形状が暗い場合は変更して下さい。\n"
-        "また、法線マップで形が判別出来るが、深度マップが真っ暗に見えるという場合も、この設定の変更を試して下さい。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_INPUT_IS_REVERSED=値\n"
-        "定義値は次の通りです。オンの場合は1、オフの場合は0を指定して下さい。\n"
-        "RESHADE_DEPTH_INPUT_IS_REVERSED=1\n"
-        "RESHADE_DEPTH_INPUT_IS_REVERSED=0"
-#endif
-        ;
-> = RESHADE_DEPTH_INPUT_IS_REVERSED;
-
-#if __RESHADE__ <= 50902
-uniform int iUILogarithmic <
-#else
-uniform bool iUILogarithmic <
-#endif
-    ui_category = "Preview settings";
-    ui_label = "Logarithmic";
-    ui_label_ja_jp = "深度バッファを対数分布として扱うように修正";
-#if __RESHADE__ <= 50902
-    ui_type = "combo";
-    ui_items = "Off\0On\0";
-#endif
-    ui_tooltip = "Change this setting if the displayed surface normals have stripes in them.";
-    ui_tooltip_ja_jp =
-        "画面効果に実際のゲーム画面と合致しない縞模様がある場合は変更して下さい。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_INPUT_IS_LOGARITHMIC=値\n"
-        "定義値は次の通りです。オンの場合は1、オフの場合は0を指定して下さい。\n"
-        "RESHADE_DEPTH_INPUT_IS_LOGARITHMIC=1\n"
-        "RESHADE_DEPTH_INPUT_IS_LOGARITHMIC=0"
-#endif
-        ;
-> = RESHADE_DEPTH_INPUT_IS_LOGARITHMIC;
-
-// -- Advanced options --
-
-uniform float2 fUIScale <
-    ui_category = "Preview settings";
-    ui_label = "Scale";
-    ui_label_ja_jp = "拡大率";
-    ui_type = "drag";
-    ui_text =
-        "\n"
-        " * Advanced options\n"
-        "\n"
-        "The following settings also need to be set using \"Edit global preprocessor definitions\" above in order to take effect.\n"
-        "You can preview how they will affect the Depth map using the controls below.\n"
-        "\n"
-        "It is rarely necessary to change these though, as their defaults fit almost all games.\n\n";
-    ui_text_ja_jp =
-        "\n"
-        " * その他の補正 (不定形またはその他)\n"
-        "\n"
-        "これより下は、深度バッファが不定形など、特別なケース向けの設定です。\n"
-        "通常はこれより上の'基本的な補正'のみでほとんどのゲームに適合します。\n"
-        "また、これらの設定は画質の向上にはまったく役に立ちません。\n\n";
-    ui_tooltip =
-        "Best use 'Present type'->'Depth map' and enable 'Offset' in the options below to set the scale.\n"
-        "Use these values for:\nRESHADE_DEPTH_INPUT_X_SCALE=<left value>\nRESHADE_DEPTH_INPUT_Y_SCALE=<right value>\n"
-        "\n"
-        "If you know the right resolution of the games depth buffer then this scale value is simply the ratio\n"
-        "between the correct resolution and the resolution Reshade thinks it is.\n"
-        "For example:\n"
-        "If it thinks the resolution is 1920 x 1080, but it's really 1280 x 720 then the right scale is (1.5 , 1.5)\n"
-        "because 1920 / 1280 is 1.5 and 1080 / 720 is also 1.5, so 1.5 is the right scale for both the x and the y";
-    ui_tooltip_ja_jp =
-        "深度バッファの解像度がクライアント解像度と異なる場合に変更して下さい。\n"
-        "このスケール値は、深度バッファの解像度とクライアント解像度との単純な比率になります。\n"
-        "深度バッファの解像度が1280×720でクライアント解像度が1920×1080の場合、横の比率が1920÷1280、縦の比率が1080÷720となります。\n"
-        "計算した結果を設定すると、値はそれぞれX_SCALE=1.5、Y_SCALE=1.5となります。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_INPUT_X_SCALE=横の値\n"
-        "RESHADE_DEPTH_INPUT_Y_SCALE=縦の値\n"
-        "定義値は次の通りです。横の値はX_SCALE、縦の値はY_SCALEに指定して下さい。\n"
-        "RESHADE_DEPTH_INPUT_X_SCALE=1.0\n"
-        "RESHADE_DEPTH_INPUT_Y_SCALE=1.0"
-#endif
-        ;
-    ui_min = 0.0; ui_max = 2.0;
-    ui_step = 0.001;
-> = float2(RESHADE_DEPTH_INPUT_X_SCALE, RESHADE_DEPTH_INPUT_Y_SCALE);
-
-uniform int2 iUIOffset <
-    ui_category = "Preview settings";
-    ui_label = "Offset";
-    ui_label_ja_jp = "位置オフセット";
-    ui_type = "slider";
-    ui_tooltip =
-        "Best use 'Present type'->'Depth map' and enable 'Offset' in the options below to set the offset in pixels.\n"
-        "Use these values for:\nRESHADE_DEPTH_INPUT_X_PIXEL_OFFSET=<left value>\nRESHADE_DEPTH_INPUT_Y_PIXEL_OFFSET=<right value>";
-    ui_tooltip_ja_jp =
-        "深度バッファにレンダリングされた物体の形状が画面効果と重なり合っていない場合に変更して下さい。\n"
-        "この値は、ピクセル単位で指定します。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_INPUT_X_PIXEL_OFFSET=横の値\n"
-        "RESHADE_DEPTH_INPUT_Y_PIXEL_OFFSET=縦の値\n"
-        "定義値は次の通りです。横の値はX_PIXEL_OFFSET、縦の値はY_PIXEL_OFFSETに指定して下さい。\n"
-        "RESHADE_DEPTH_INPUT_X_PIXEL_OFFSET=0.0\n"
-        "RESHADE_DEPTH_INPUT_Y_PIXEL_OFFSET=0.0"
-#endif
-        ;
-    ui_min = -BUFFER_SCREEN_SIZE;
-    ui_max = BUFFER_SCREEN_SIZE;
-    ui_step = 1;
-> = int2(RESHADE_DEPTH_INPUT_X_PIXEL_OFFSET, RESHADE_DEPTH_INPUT_Y_PIXEL_OFFSET);
-
-uniform float fUIFarPlane <
-    ui_category = "Preview settings";
-    ui_label = "Far Plane";
-    ui_label_ja_jp = "遠点距離";
-    ui_type = "drag";
-    ui_tooltip = 
-        "RESHADE_DEPTH_LINEARIZATION_FAR_PLANE=<value>\n"
-        "Changing this value is not necessary in most cases.";
-    ui_tooltip_ja_jp =
-        "深度マップの色合いが距離感と合致しない、法線マップの表面が平面に見える、などの場合に変更して下さい。\n"
-        "遠点距離を1000に設定すると、ゲームの描画距離が1000メートルであると見なします。\n\n"
-        "このプレビュー画面はあくまでプレビューであり、ほとんどの場合、深度バッファは深度マップの色数より遥かに高い精度で表現されています。\n"
-        "例えば、10m前後の距離の形状が純粋な黒に見えるからという理由で値を変更しないで下さい。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_LINEARIZATION_FAR_PLANE=値\n"
-        "定義値は次の通りです。\n"
-        "RESHADE_DEPTH_LINEARIZATION_FAR_PLANE=1000.0"
-#endif
-        ;
-    ui_min = 0.0; ui_max = 1000.0;
-    ui_step = 0.1;
-> = RESHADE_DEPTH_LINEARIZATION_FAR_PLANE;
-
-uniform float fUIDepthMultiplier <
-    ui_category = "Preview settings";
-    ui_label = "Multiplier";
-    ui_label_ja_jp = "深度乗数";
-    ui_type = "drag";
-    ui_tooltip = "RESHADE_DEPTH_MULTIPLIER=<value>";
-    ui_tooltip_ja_jp =
-        "特定のエミュレータソフトウェアにおける深度バッファを修正するため、特別に追加された変数です。\n"
-        "この値は僅かな変更でも計算式を破壊するため、設定すべき値を知らない場合は変更しないで下さい。"
-#if !ADDON_ADJUST_DEPTH
-        "\n\n"
-        "定義名は次の通りです。文字は完全に一致する必要があり、半角大文字の英字とアンダーバーを用いなければなりません。\n"
-        "RESHADE_DEPTH_MULTIPLIER=値\n"
-        "定義値は次の通りです。\n"
-        "RESHADE_DEPTH_MULTIPLIER=1.0"
-#endif
-        ;
-    ui_min = 0.0; ui_max = 1000.0;
-    ui_step = 0.001;
-> = RESHADE_DEPTH_MULTIPLIER;
-
-float GetLinearizedDepth(float2 texcoord)
-{
-    if (!bUIUseLivePreview)
-    {
-        return ReShade::GetLinearizedDepth(texcoord);
-    }
-    else
-    {
-        if (iUIUpsideDown) // RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN
-            texcoord.y = 1.0 - texcoord.y;
-
-        texcoord.x /= fUIScale.x; // RESHADE_DEPTH_INPUT_X_SCALE
-        texcoord.y /= fUIScale.y; // RESHADE_DEPTH_INPUT_Y_SCALE
-        texcoord.x -= iUIOffset.x * BUFFER_RCP_WIDTH; // RESHADE_DEPTH_INPUT_X_PIXEL_OFFSET
-        texcoord.y += iUIOffset.y * BUFFER_RCP_HEIGHT; // RESHADE_DEPTH_INPUT_Y_PIXEL_OFFSET
-
-        float depth = tex2Dlod(ReShade::DepthBuffer, float4(texcoord, 0, 0)).x * fUIDepthMultiplier;
-
-        const float C = 0.01;
-        if (iUILogarithmic) // RESHADE_DEPTH_INPUT_IS_LOGARITHMIC
-            depth = (exp(depth * log(C + 1.0)) - 1.0) / C;
-
-        if (iUIReversed) // RESHADE_DEPTH_INPUT_IS_REVERSED
-            depth = 1.0 - depth;
-
-        const float N = 1.0;
-        depth /= fUIFarPlane - depth * (fUIFarPlane - N);
-
-        return depth;
-    }
-}
-
-float3 GetScreenSpaceNormal(float2 texcoord)
-{
-    float3 offset = float3(BUFFER_PIXEL_SIZE, 0.0);
-    float2 posCenter = texcoord.xy;
-    float2 posNorth  = posCenter - offset.zy;
-    float2 posEast   = posCenter + offset.xz;
-
-    float3 vertCenter = float3(posCenter - 0.5, 1) * GetLinearizedDepth(posCenter);
-    float3 vertNorth  = float3(posNorth - 0.5,  1) * GetLinearizedDepth(posNorth);
-    float3 vertEast   = float3(posEast - 0.5,   1) * GetLinearizedDepth(posEast);
-
-    return normalize(cross(vertCenter - vertNorth, vertCenter - vertEast)) * 0.5 + 0.5;
-}
-
-void PS_DisplayDepth(in float4 position : SV_Position, in float2 texcoord : TEXCOORD, out float3 color : SV_Target)
-{
-    float3 depth = GetLinearizedDepth(texcoord).xxx;
-    float3 normal = GetScreenSpaceNormal(texcoord);
-
-    // Ordered dithering
-#if 1
-    const float dither_bit = 8.0; // Number of bits per channel. Should be 8 for most monitors.
-    // Calculate grid position
-    float grid_position = frac(dot(texcoord, (BUFFER_SCREEN_SIZE * float2(1.0 / 16.0, 10.0 / 36.0)) + 0.25));
-    // Calculate how big the shift should be
-    float dither_shift = 0.25 * (1.0 / (pow(2, dither_bit) - 1.0));
-    // Shift the individual colors differently, thus making it even harder to see the dithering pattern
-    float3 dither_shift_RGB = float3(dither_shift, -dither_shift, dither_shift); // Subpixel dithering
-    // Modify shift acording to grid position.
-    dither_shift_RGB = lerp(2.0 * dither_shift_RGB, -2.0 * dither_shift_RGB, grid_position);
-    depth += dither_shift_RGB;
-#endif
-
-    color = depth;
-    if (iUIPresentType == 1)
-        color = normal;
-    if (iUIPresentType == 2)
-        color = lerp(normal, depth, step(BUFFER_WIDTH * 0.5, position.x));
-
-    if (bUIShowOffset)
-    {
-        float3 color_orig = tex2D(ReShade::BackBuffer, texcoord).rgb;
-
-        // Blend depth and back buffer color with 'overlay' so the offset is more noticeable
-        color = lerp(2 * color * color_orig, 1.0 - 2.0 * (1.0 - color) * (1.0 - color_orig), max(color.r, max(color.g, color.b)) < 0.5 ? 0.0 : 1.0);
-    }
-}
-
-technique DisplayDepth <
-    ui_tooltip =
-        "This shader helps you set the right preprocessor settings for depth input.\n"
-        "To set the settings click on 'Edit global preprocessor definitions' and set them there - not in this shader.\n"
-        "The settings will then take effect for all shaders, including this one.\n"  
-        "\n"
-        "By default calculated normals and depth are shown side by side.\n"
-        "Normals (on the left) should look smooth and the ground should be greenish when looking at the horizon.\n"
-        "Depth (on the right) should show close objects as dark and use gradually brighter shades the further away objects are.\n";
-    ui_tooltip_ja_jp =
-        "これは、深度バッファの入力をReShade側の計算式に合わせる調節をするための、設定作業の支援に特化した特殊な扱いのエフェクトです。\n"
-        "初期状態では「両方を表示」が選択されており、左に法線マップ、右に深度マップが表示されます。\n"
-        "\n"
-        "法線マップ(左側)は、形状を滑らかに表現します。正しい設定では、全体的に青緑風で、地平線を見たときに地面が緑を帯びた色になります。\n"
-        "深度マップ(右側)は、形状の遠近を白黒で表現します。正しい設定では、近くの形状ほど黒く、遠くの形状ほど白くなります。\n"
-        "\n"
-#if ADDON_ADJUST_DEPTH
-        "設定を完了するには、DisplayDepth.fxエフェクトの変数の一覧にある'設定に保存して反映する'ボタンをクリックして下さい。\n"
-#else
-        "設定を完了するには、エフェクト変数の編集画面にある'プリプロセッサの定義を編集'ボタンをクリックした後に開くダイアログに入力して下さい。\n"
-#endif
-        "すると、インストール先のゲームに対して共通の設定として保存され、他のプリセットでも正しく表示されるようになります。";
->
-
-{
-    pass
-    {
-        VertexShader = PostProcessVS;
-        PixelShader = PS_DisplayDepth;
-    }
-}
--- a/data/resources/shaders/reshade/Shaders/ReShade.fxh
+++ b/data/resources/shaders/reshade/Shaders/ReShade.fxh
@@ -1,7 +1,3 @@
-/*
- * SPDX-License-Identifier: CC0-1.0
- */
-
 #pragma once

 #if !defined(__RESHADE__) || __RESHADE__ < 30000
@@ -109,7 +105,6 @@ namespace ReShade
 }

 // Vertex shader generating a triangle covering the entire screen
-// See also https://www.reddit.com/r/gamedev/comments/2j17wk/a_slightly_faster_bufferless_vertex_shader_trick/
 void PostProcessVS(in uint id : SV_VertexID, out float4 position : SV_Position, out float2 texcoord : TEXCOORD)
 {
 	texcoord.x = (id == 2) ? 2.0 : 0.0;
--- a/data/resources/shaders/reshade/Shaders/ReShadeUI.fxh
+++ b/data/resources/shaders/reshade/Shaders/ReShadeUI.fxh
@@ -7,27 +7,27 @@
 #define RESHADE_VERSION(major,minor,build) (10000 * (major) + 100 * (minor) + (build))
 #define SUPPORTED_VERSION(major,minor,build) (__RESHADE__ >= RESHADE_VERSION(major,minor,build))

-// >= 3.0.0
+// Since 3.0.0
 // Commit current in-game user interface status
 // https://github.com/crosire/reshade/commit/302bacc49ae394faedc2e29a296c1cebf6da6bb2#diff-82cf230afdb2a0d5174111e6f17548a5R1183
 // Added various GUI related uniform variable annotations
 // https://reshade.me/forum/releases/2341-3-0
 #define __UNIFORM_INPUT_ANY    ui_type = "input";

-#define __UNIFORM_INPUT_BOOL1  __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_BOOL2  __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_BOOL3  __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_BOOL4  __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_INT1   __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_INT2   __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_INT3   __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_INT4   __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_FLOAT1 __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_FLOAT2 __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_FLOAT3 __UNIFORM_INPUT_ANY
-#define __UNIFORM_INPUT_FLOAT4 __UNIFORM_INPUT_ANY
+#define __UNIFORM_INPUT_BOOL1  __UNIFORM_INPUT_ANY // It is unsupported on all version
+#define __UNIFORM_INPUT_BOOL2  __UNIFORM_INPUT_ANY // It is unsupported on all version
+#define __UNIFORM_INPUT_BOOL3  __UNIFORM_INPUT_ANY // It is unsupported on all version
+#define __UNIFORM_INPUT_BOOL4  __UNIFORM_INPUT_ANY // It is unsupported on all version
+#define __UNIFORM_INPUT_INT1   __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_INT2   __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_INT3   __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_INT4   __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_FLOAT1 __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_FLOAT2 __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_FLOAT3 __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_INPUT_FLOAT4 __UNIFORM_INPUT_ANY // If it was not supported in someday or now, please add information

-// >= 4.0.1
+// Since 4.0.1
 // Change slider widget to be used with new "slider" instead of a "drag" type annotation
 // https://github.com/crosire/reshade/commit/746229f31cd6f311a3e72a543e4f1f23faa23f11#diff-59405a313bd8cbfb0ca6dd633230e504R1701
 // Changed slider widget to be used with < ui_type = "slider"; > instead of < ui_type = "drag"; >
@@ -35,7 +35,7 @@
 #if SUPPORTED_VERSION(4,0,1)
 #define __UNIFORM_DRAG_ANY    ui_type = "drag";

-// >= 4.0.0
+// Since 4.0.0
 // Rework statistics tab and add drag widgets back
 // https://github.com/crosire/reshade/commit/1b2c38795f00efd66c007da1f483f1441b230309
 // Changed drag widget to a slider widget (old one is still available via < ui_type = "drag2"; >)
@@ -43,7 +43,7 @@
 #elif SUPPORTED_VERSION(4,0,0)
 #define __UNIFORM_DRAG_ANY    ui_type = "drag2";

-// >= 3.0.0
+// Since 3.0.0
 // Commit current in-game user interface status
 // https://github.com/crosire/reshade/commit/302bacc49ae394faedc2e29a296c1cebf6da6bb2#diff-82cf230afdb2a0d5174111e6f17548a5R1187
 // Added various GUI related uniform variable annotations
@@ -52,20 +52,20 @@
 #define __UNIFORM_DRAG_ANY    ui_type = "drag";
 #endif

-#define __UNIFORM_DRAG_BOOL1  __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_BOOL2  __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_BOOL3  __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_BOOL4  __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_INT1   __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_INT2   __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_INT3   __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_INT4   __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_FLOAT1 __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_FLOAT2 __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_FLOAT3 __UNIFORM_DRAG_ANY
-#define __UNIFORM_DRAG_FLOAT4 __UNIFORM_DRAG_ANY
+#define __UNIFORM_DRAG_BOOL1  __UNIFORM_DRAG_ANY // It is unsupported on all version
+#define __UNIFORM_DRAG_BOOL2  __UNIFORM_DRAG_ANY // It is unsupported on all version
+#define __UNIFORM_DRAG_BOOL3  __UNIFORM_DRAG_ANY // It is unsupported on all version
+#define __UNIFORM_DRAG_BOOL4  __UNIFORM_DRAG_ANY // It is unsupported on all version
+#define __UNIFORM_DRAG_INT1   __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_INT2   __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_INT3   __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_INT4   __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_FLOAT1 __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_FLOAT2 __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_FLOAT3 __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_DRAG_FLOAT4 __UNIFORM_DRAG_ANY // If it was not supported in someday or now, please add information

-// >= 4.0.1
+// Since 4.0.1
 // Change slider widget to be used with new "slider" instead of a "drag" type annotation
 // https://github.com/crosire/reshade/commit/746229f31cd6f311a3e72a543e4f1f23faa23f11#diff-59405a313bd8cbfb0ca6dd633230e504R1699
 // Changed slider widget to be used with < ui_type = "slider"; > instead of < ui_type = "drag"; >
@@ -73,7 +73,7 @@
 #if SUPPORTED_VERSION(4,0,1)
 #define __UNIFORM_SLIDER_ANY    ui_type = "slider";

-// >= 4.0.0
+// Since 4.0.0
 // Rework statistics tab and add drag widgets back
 // https://github.com/crosire/reshade/commit/1b2c38795f00efd66c007da1f483f1441b230309
 // Changed drag widget to a slider widget (old one is still available via < ui_type = "drag2"; >)
@@ -84,20 +84,20 @@
 #define __UNIFORM_SLIDER_ANY    __UNIFORM_DRAG_ANY
 #endif

-#define __UNIFORM_SLIDER_BOOL1  __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_BOOL2  __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_BOOL3  __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_BOOL4  __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_INT1   __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_INT2   __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_INT3   __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_INT4   __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_FLOAT1 __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_FLOAT2 __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_FLOAT3 __UNIFORM_SLIDER_ANY
-#define __UNIFORM_SLIDER_FLOAT4 __UNIFORM_SLIDER_ANY
+#define __UNIFORM_SLIDER_BOOL1  __UNIFORM_SLIDER_ANY // It is unsupported on all version
+#define __UNIFORM_SLIDER_BOOL2  __UNIFORM_SLIDER_ANY // It is unsupported on all version
+#define __UNIFORM_SLIDER_BOOL3  __UNIFORM_SLIDER_ANY // It is unsupported on all version
+#define __UNIFORM_SLIDER_BOOL4  __UNIFORM_SLIDER_ANY // It is unsupported on all version
+#define __UNIFORM_SLIDER_INT1   __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_INT2   __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_INT3   __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_INT4   __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_FLOAT1 __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_FLOAT2 __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_FLOAT3 __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_SLIDER_FLOAT4 __UNIFORM_SLIDER_ANY // If it was not supported in someday or now, please add information

-// >= 3.0.0
+// Since 3.0.0
 // Add combo box display type for uniform variables and fix displaying of integer variable under Direct3D 9
 // https://github.com/crosire/reshade/commit/b025bfae5f7343509ec0cacf6df0cff537c499f2#diff-82cf230afdb2a0d5174111e6f17548a5R1631
 // Added various GUI related uniform variable annotations
@@ -105,19 +105,19 @@
 #define __UNIFORM_COMBO_ANY    ui_type = "combo";

 //      __UNIFORM_COMBO_BOOL1
-#define __UNIFORM_COMBO_BOOL2  __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_BOOL3  __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_BOOL4  __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_INT1   __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_INT2   __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_INT3   __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_INT4   __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_FLOAT1 __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_FLOAT2 __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_FLOAT3 __UNIFORM_COMBO_ANY
-#define __UNIFORM_COMBO_FLOAT4 __UNIFORM_COMBO_ANY
+#define __UNIFORM_COMBO_BOOL2  __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_BOOL3  __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_BOOL4  __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_INT1   __UNIFORM_COMBO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_COMBO_INT2   __UNIFORM_COMBO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_COMBO_INT3   __UNIFORM_COMBO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_COMBO_INT4   __UNIFORM_COMBO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_COMBO_FLOAT1 __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_FLOAT2 __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_FLOAT3 __UNIFORM_COMBO_ANY // It is unsupported on all version
+#define __UNIFORM_COMBO_FLOAT4 __UNIFORM_COMBO_ANY // It is unsupported on all version

-// >= 4.0.0
+// Since 4.0.0 (but the ui_items force set "Off\0On\0"), and if less than it force converted to checkbox
 // Add option to display boolean values as combo box instead of checkbox
 // https://github.com/crosire/reshade/commit/aecb757c864c9679e77edd6f85a1521c49e489c1#diff-59405a313bd8cbfb0ca6dd633230e504R1147
 // https://github.com/crosire/reshade/blob/v4.0.0/source/gui.cpp
@@ -125,7 +125,7 @@
 // https://reshade.me/forum/releases/4772-4-0
 #define __UNIFORM_COMBO_BOOL1  __UNIFORM_COMBO_ANY

-// >= 4.0.0
+// Since 4.0.0
 // Cleanup GUI code and rearrange some widgets
 // https://github.com/crosire/reshade/commit/6751f7bd50ea7c0556cf0670f10a4b4ba912ee7d#diff-59405a313bd8cbfb0ca6dd633230e504R1711
 // Added radio button widget (via < ui_type = "radio"; ui_items = "Button 1\0Button 2\0...\0"; >)
@@ -136,46 +136,48 @@
 #define __UNIFORM_RADIO_ANY    __UNIFORM_COMBO_ANY
 #endif

-#define __UNIFORM_RADIO_BOOL1  __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_BOOL2  __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_BOOL3  __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_BOOL4  __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_INT1   __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_INT2   __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_INT3   __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_INT4   __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_FLOAT1 __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_FLOAT2 __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_FLOAT3 __UNIFORM_RADIO_ANY
-#define __UNIFORM_RADIO_FLOAT4 __UNIFORM_RADIO_ANY
+#define __UNIFORM_RADIO_BOOL1  __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_BOOL2  __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_BOOL3  __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_BOOL4  __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_INT1   __UNIFORM_RADIO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_RADIO_INT2   __UNIFORM_RADIO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_RADIO_INT3   __UNIFORM_RADIO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_RADIO_INT4   __UNIFORM_RADIO_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_RADIO_FLOAT1 __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_FLOAT2 __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_FLOAT3 __UNIFORM_RADIO_ANY // It is unsupported on all version
+#define __UNIFORM_RADIO_FLOAT4 __UNIFORM_RADIO_ANY // It is unsupported on all version

-// >= 4.1.0
+// Since 4.1.0
 // Fix floating point uniforms with unknown "ui_type" not showing up in UI
 // https://github.com/crosire/reshade/commit/50e5bf44dfc84bc4220c2b9f19d5f50c7a0fda66#diff-59405a313bd8cbfb0ca6dd633230e504R1788
 // Fixed floating point uniforms with unknown "ui_type" not showing up in UI
 // https://reshade.me/forum/releases/5021-4-1
 #define __UNIFORM_COLOR_ANY    ui_type = "color";

-// >= 3.0.0
+// Since 3.0.0
 // Move technique list to preset configuration file
 // https://github.com/crosire/reshade/blob/84bba3aa934c1ebe4c6419b69dfe1690d9ab9d34/source/runtime.cpp#L1328
 // Added various GUI related uniform variable annotations
 // https://reshade.me/forum/releases/2341-3-0

-#define __UNIFORM_COLOR_BOOL1  __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_BOOL2  __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_BOOL3  __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_BOOL4  __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_INT1   __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_INT2   __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_INT3   __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_INT4   __UNIFORM_COLOR_ANY
-//      __UNIFORM_COLOR_FLOAT1
-#define __UNIFORM_COLOR_FLOAT2 __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_FLOAT3 __UNIFORM_COLOR_ANY
-#define __UNIFORM_COLOR_FLOAT4 __UNIFORM_COLOR_ANY
+// If empty, these versions before 4.1.0 are decide that the type is color from the number of components

-// >= 4.2.0
+#define __UNIFORM_COLOR_BOOL1  __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_BOOL2  __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_BOOL3  __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_BOOL4  __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_INT1   __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_INT2   __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_INT3   __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_INT4   __UNIFORM_COLOR_ANY // It is unsupported on all version
+//      __UNIFORM_COLOR_FLOAT1
+#define __UNIFORM_COLOR_FLOAT2 __UNIFORM_COLOR_ANY // It is unsupported on all version
+#define __UNIFORM_COLOR_FLOAT3 __UNIFORM_COLOR_ANY // If it was not supported in someday or now, please add information
+#define __UNIFORM_COLOR_FLOAT4 __UNIFORM_COLOR_ANY // If it was not supported in someday or now, please add information
+
+// Since 4.2.0
 // Add alpha slider widget for single component uniform variables (#86)
 // https://github.com/crosire/reshade/commit/87a740a8e3c4dcda1dd4eeec8d5cff7fa35fe829#diff-59405a313bd8cbfb0ca6dd633230e504R1820
 // Added alpha slider widget for single component uniform variables
@@ -186,7 +188,7 @@
 #define __UNIFORM_COLOR_FLOAT1 __UNIFORM_SLIDER_ANY
 #endif

-// >= 4.3.0
+// Since 4.3.0
 // Add new "list" GUI widget (#103)
 // https://github.com/crosire/reshade/commit/515287d20ce615c19cf3d4c21b49f83896f04ddc#diff-59405a313bd8cbfb0ca6dd633230e504R1894
 // Added new "list" GUI widget
@@ -198,17 +200,17 @@
 #endif

 //      __UNIFORM_LIST_BOOL1
-#define __UNIFORM_LIST_BOOL2  __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_BOOL3  __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_BOOL4  __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_INT1   __UNIFORM_LIST_ANY // >= 4.3.0
-#define __UNIFORM_LIST_INT2   __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_INT3   __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_INT4   __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_FLOAT1 __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_FLOAT2 __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_FLOAT3 __UNIFORM_LIST_ANY
-#define __UNIFORM_LIST_FLOAT4 __UNIFORM_LIST_ANY
+#define __UNIFORM_LIST_BOOL2  __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_BOOL3  __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_BOOL4  __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_INT1   __UNIFORM_LIST_ANY // Supported in 4.3.0
+#define __UNIFORM_LIST_INT2   __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_INT3   __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_INT4   __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_FLOAT1 __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_FLOAT2 __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_FLOAT3 __UNIFORM_LIST_ANY // Not supported in all versions
+#define __UNIFORM_LIST_FLOAT4 __UNIFORM_LIST_ANY // Not supported in all versions

-// For compatible with 'combo'
+// For compatible with ComboBox
 #define __UNIFORM_LIST_BOOL1  __UNIFORM_COMBO_ANY
--- a/data/resources/shaders/reshade/Shaders/UIMask.fx
+++ b/data/resources/shaders/reshade/Shaders/UIMask.fx
@@ -1,289 +0,0 @@
-/*
-	Simple UIMask shader by luluco250
-
-	I have no idea why this was never ported back to ReShade 3.0 from 2.0,
-	but if you missed it, here it is.
-
-	It doesn't feature the auto mask from the original shader.
-
-	It does feature a new multi-channnel masking feature. UI masks can now contain
-	separate 'modes' within each of the three color channels.
-
-	For example, you can have the regular hud on the red channel (the default one),
-	a mask for an inventory screen on the green channel and a mask for a quest menu
-	on the blue channel. You can then use keyboard keys to toggle each channel on or off.
-
-	Multiple channels can be active at once, they'll just add up to mask the image.
-
-	Simple/legacy masks are not affected by this, they'll work just as you'd expect,
-	so you can still make simple black and white masks that use all color channels, it'll
-	be no different than just having it on a single channel.
-
-	Tips:
-
-	--You can adjust how much it will affect your HUD by changing "Mask Intensity".
-
-	--You don't actually need to place the UIMask_Bottom technique at the bottom of
-	  your shader pipeline, if you have any effects that don't necessarily affect
-	  the visibility of the HUD you can place it before that.
-	  For instance, if you use color correction shaders like LUT, you might want
-	  to place UIMask_Bottom just before that.
-
-	--Preprocessor flags:
-	  --UIMASK_MULTICHANNEL:
-		Enables having up to three different masks on each color channel.
-
-	--Refer to this page for keycodes:
-	  https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
-
-	--To make a custom mask:
-
-	  1-Take a screenshot of your game with the HUD enabled,
-	   preferrably with any effects disabled for maximum visibility.
-
-	  2-Open the screenshot with your preferred image editor program, I use GIMP.
-
-	  3-Make a background white layer if there isn't one already.
-		Be sure to leave it behind your actual screenshot for the while.
-
-	  4-Make an empty layer for the mask itself, you can call it "mask".
-
-	  5-Having selected the mask layer, paint the places where HUD constantly is,
-		such as health bars, important messages, minimaps etc.
-
-	  6-Delete or make your screenshot layer invisible.
-
-	  7-Before saving your mask, let's do some gaussian blurring to improve it's look and feel:
-		For every step of blurring you want to do, make a new layer, such as:
-		Mask - Blur16x16
-		Mask - Blur8x8
-		Mask - Blur4x4
-		Mask - Blur2x2
-		Mask - NoBlur
-		You should use your image editor's default gaussian blurring filter, if there is one.
-		This avoids possible artifacts and makes the mask blend more easily on the eyes.
-		You may not need this if your mask is accurate enough and/or the HUD is simple enough.
-
-	  8-Now save the final image with a unique name such as "MyUIMask.png" in your textures folder.
-
-	  9-Set the preprocessor definition UIMASK_TEXTURE to the unique name of your image, with quotes.
-	    You're done!
-
-
-	MIT Licensed:
-
-	Copyright (c) 2017 Lucas Melo
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in all
-	copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-	SOFTWARE.
-*/
-
-//#region Preprocessor
-
-#include "ReShade.fxh"
-#include "ReShadeUI.fxh"
-
-#ifndef UIMASK_MULTICHANNEL
-	#define UIMASK_MULTICHANNEL 0
-#endif
-
-#if !UIMASK_MULTICHANNEL
-	#define TEXFORMAT R8
-#else
-	#define TEXFORMAT RGBA8
-#endif
-
-#ifndef UIMASK_TEXTURE
-	#define UIMASK_TEXTURE "UIMask.png"
-#endif
-
-//#endregion
-
-namespace UIMask
-{
-
-//#region Uniforms
-
-uniform int _Help
-<
-	ui_label = " ";
-	ui_text =
-		"For more detailed instructions, see the text at the top of this "
-		"effect's shader file (UIMask.fx).\n"
-		"\n"
-		"Available preprocessor definitions:\n"
-		"  UIMASK_MULTICHANNEL:\n"
-		"    If set to 1, each of the RGB color channels in the texture is "
-		"treated as a separate mask.\n"
-		"\n"
-		"How to create a mask:\n"
-		"\n"
-		"1. Take a screenshot with the game's UI appearing.\n"
-		"2. Open the screenshot in an image editor, GIMP or Photoshop are "
-		"recommended.\n"
-		"3. Create a new layer over the screenshot layer, fill it with black.\n"
-		"4. Reduce the layer opacity so you can see the screenshot layer "
-		"below.\n"
-		"5. Cover the UI with white to mask it from effects. The stronger the "
-		"mask white color, the more opaque the mask will be.\n"
-		"6. Set the mask layer opacity back to 100%.\n"
-		"7. Save the image in one of your texture folders, making sure to "
-		"use a unique name such as: \"MyUIMask.png\"\n"
-		"8. Set the preprocessor definition UIMASK_TEXTURE to the name of "
-		"your image, with quotes: \"MyUIMask.png\"\n"
-		;
-	ui_category = "Help";
-	ui_category_closed = true;
-	ui_type = "radio";
->;
-
-uniform float fMask_Intensity
-<
-	__UNIFORM_SLIDER_FLOAT1
-
-	ui_label = "Mask Intensity";
-	ui_tooltip =
-		"How much to mask effects from affecting the original image.\n"
-		"\nDefault: 1.0";
-	ui_min = 0.0;
-	ui_max = 1.0;
-	ui_step = 0.001;
-> = 1.0;
-
-uniform bool bDisplayMask <
-	ui_label = "Display Mask";
-	ui_tooltip =
-		"Display the mask texture.\n"
-		"Useful for testing multiple channels or simply the mask itself.\n"
-		"\nDefault: Off";
-> = false;
-
-#if UIMASK_MULTICHANNEL
-
-uniform bool bToggleRed <
-	ui_label = "Toggle Red Channel";
-	ui_tooltip = "Toggle UI masking for the red channel.\n"
-		     "Right click to assign a hotkey.\n"
-		     "\nDefault: On";
-> = true;
-
-uniform bool bToggleGreen <
-	ui_label = "Toggle Green Channel";
-	ui_tooltip = "Toggle UI masking for the green channel.\n"
-		     "Right click to assign a hotkey."
-		     "\nDefault: On";
-> = true;
-
-uniform bool bToggleBlue <
-	ui_label = "Toggle Blue Channel";
-	ui_tooltip = "Toggle UI masking for the blue channel.\n"
-		     "Right click to assign a hotkey."
-		     "\nDefault: On";
-> = true;
-
-#endif
-
-//#endregion
-
-//#region Textures
-
-texture BackupTex
-{
-	Width = BUFFER_WIDTH;
-	Height = BUFFER_HEIGHT;
-};
-sampler Backup
-{
-	Texture = BackupTex;
-};
-
-texture MaskTex <source=UIMASK_TEXTURE;>
-{
-	Width = BUFFER_WIDTH;
-	Height = BUFFER_HEIGHT;
-	Format = TEXFORMAT;
-};
-sampler Mask
-{
-	Texture = MaskTex;
-};
-
-//#endregion
-
-//#region Shaders
-
-float4 BackupPS(float4 pos : SV_Position, float2 uv : TEXCOORD) : SV_Target {
-	return tex2D(ReShade::BackBuffer, uv);
-}
-
-float4 MainPS(float4 pos : SV_Position, float2 uv : TEXCOORD) : SV_Target {
-	float4 color = tex2D(ReShade::BackBuffer, uv);
-	float4 backup = tex2D(Backup, uv);
-
-	#if !UIMASK_MULTICHANNEL
-		float mask = tex2D(Mask, uv).r;
-	#else
-		float3 mask_rgb = tex2D(Mask, uv).rgb;
-
-		// This just works, it basically adds masking with each channel that has
-		// been toggled.
-		float mask = saturate(
-			1.0 - dot(1.0 - mask_rgb,
-				float3(bToggleRed, bToggleGreen, bToggleBlue)));
-	#endif
-
-	color = lerp(color, backup, mask * fMask_Intensity);
-	color = bDisplayMask ? mask : color;
-
-	return color;
-}
-
-//#endregion
-
-//#region Techniques
-
-technique UIMask_Top
-<
-	ui_tooltip = "Place this *above* the effects to be masked.";
->
-{
-	pass
-	{
-		VertexShader = PostProcessVS;
-		PixelShader = BackupPS;
-		RenderTarget = BackupTex;
-	}
-}
-
-technique UIMask_Bottom
-<
-	ui_tooltip =
-		"Place this *below* the effects to be masked.\n"
-		"If you want to add a toggle key for the effect, set it to this one.";
->
-{
-	pass
-	{
-		VertexShader = PostProcessVS;
-		PixelShader = MainPS;
-	}
-}
-
-//#endregion
-
-} // Namespace.
--- a/data/resources/shaders/reshade/Shaders/anti-aliasing/fxaa.fx
+++ b/data/resources/shaders/reshade/Shaders/anti-aliasing/fxaa.fx
@@ -1,271 +0,0 @@
-#include "ReShade.fxh"
-
-
-/**
- * @license
- * Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
- *
- * TO  THE MAXIMUM  EXTENT PERMITTED  BY APPLICABLE  LAW, THIS SOFTWARE  IS PROVIDED
- * *AS IS*  AND NVIDIA AND  ITS SUPPLIERS DISCLAIM  ALL WARRANTIES,  EITHER  EXPRESS
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED  TO, NONINFRINGEMENT,IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL  NVIDIA 
- * OR ITS SUPPLIERS BE  LIABLE  FOR  ANY  DIRECT, SPECIAL,  INCIDENTAL,  INDIRECT,  OR  
- * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION,  DAMAGES FOR LOSS 
- * OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY 
- * OTHER PECUNIARY LOSS) ARISING OUT OF THE  USE OF OR INABILITY  TO USE THIS SOFTWARE, 
- * EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
-FXAA_PRESET - Choose compile-in knob preset 0-5.
------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD - The minimum amount of local contrast required 
-                      to apply algorithm.
-                      1.0/3.0  - too little
-                      1.0/4.0  - good start
-                      1.0/8.0  - applies to more edges
-                      1.0/16.0 - overkill
------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD_MIN - Trims the algorithm from processing darks.
-                          Perf optimization.
-                          1.0/32.0 - visible limit (smaller isn't visible)
-                          1.0/16.0 - good compromise
-                          1.0/12.0 - upper limit (seeing artifacts)
------------------------------------------------------------------------------
-FXAA_SEARCH_STEPS - Maximum number of search steps for end of span.
------------------------------------------------------------------------------
-FXAA_SEARCH_THRESHOLD - Controls when to stop searching.
-                        1.0/4.0 - seems to be the best quality wise
------------------------------------------------------------------------------
-FXAA_SUBPIX_TRIM - Controls sub-pixel aliasing removal.
-                   1.0/2.0 - low removal
-                   1.0/3.0 - medium removal
-                   1.0/4.0 - default removal
-                   1.0/8.0 - high removal
-                   0.0 - complete removal
------------------------------------------------------------------------------
-FXAA_SUBPIX_CAP - Insures fine detail is not completely removed.
-                  This is important for the transition of sub-pixel detail,
-                  like fences and wires.
-                  3.0/4.0 - default (medium amount of filtering)
-                  7.0/8.0 - high amount of filtering
-                  1.0 - no capping of sub-pixel aliasing removal
-*/
-
-
-uniform float2 BufferToViewportRatio < source = "buffer_to_viewport_ratio"; >;
-uniform float2 ViewportSize < source = "viewportsize"; >;
-
-sampler2D sBackBuffer{Texture=ReShade::BackBufferTex;AddressU=CLAMP;AddressV=CLAMP;AddressW=CLAMP;MagFilter=LINEAR;MinFilter=LINEAR;};
-
-
-#ifndef FXAA_PRESET
-    #define FXAA_PRESET 6
-#endif
-#if (FXAA_PRESET == 3)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/16.0)
-    #define FXAA_SEARCH_STEPS        16
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 4)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        24
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 5)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        32
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 6)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        32
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (1.0)
-    #define FXAA_SUBPIX_TRIM         (0.0)
-#endif
-
-#define FXAA_SUBPIX_TRIM_SCALE (1.0/(1.0 - FXAA_SUBPIX_TRIM))
-
-// Return the luma, the estimation of luminance from rgb inputs.
-// This approximates luma using one FMA instruction,
-// skipping normalization and tossing out blue.
-// FxaaLuma() will range 0.0 to 2.963210702.
-float FxaaLuma(float3 rgb) {
-    return rgb.y * (0.587/0.299) + rgb.x;
-}
-
-float3 FxaaLerp3(float3 a, float3 b, float amountOfA) {
-    return (-float3(amountOfA, amountOfA, amountOfA) * b) + ((a * float3(amountOfA, amountOfA, amountOfA)) + b);
-}
-
-float4 FxaaTexOff(sampler2D tex, float2 pos, int2 off, float2 rcpFrame) {
-    float x = pos.x + float(off.x) * rcpFrame.x;
-    float y = pos.y + float(off.y) * rcpFrame.y;
-    return tex2D(tex, float2(x, y));
-}
-
-// pos is the output of FxaaVertexShader interpolated across screen.
-// xy -> actual texture position {0.0 to 1.0}
-// rcpFrame should be a uniform equal to  {1.0/frameWidth, 1.0/frameHeight}
-float3 FxaaPixelShader(float2 pos, sampler2D tex, float2 rcpFrame)
-{
-    float3 rgbN = FxaaTexOff(tex, pos.xy, int2( 0,-1), rcpFrame).xyz;
-    float3 rgbW = FxaaTexOff(tex, pos.xy, int2(-1, 0), rcpFrame).xyz;
-    float3 rgbM = FxaaTexOff(tex, pos.xy, int2( 0, 0), rcpFrame).xyz;
-    float3 rgbE = FxaaTexOff(tex, pos.xy, int2( 1, 0), rcpFrame).xyz;
-    float3 rgbS = FxaaTexOff(tex, pos.xy, int2( 0, 1), rcpFrame).xyz;
-    
-    float lumaN = FxaaLuma(rgbN);
-    float lumaW = FxaaLuma(rgbW);
-    float lumaM = FxaaLuma(rgbM);
-    float lumaE = FxaaLuma(rgbE);
-    float lumaS = FxaaLuma(rgbS);
-    float rangeMin = min(lumaM, min(min(lumaN, lumaW), min(lumaS, lumaE)));
-    float rangeMax = max(lumaM, max(max(lumaN, lumaW), max(lumaS, lumaE)));
-    
-    float range = rangeMax - rangeMin;
-    if(range < max(FXAA_EDGE_THRESHOLD_MIN, rangeMax * FXAA_EDGE_THRESHOLD))
-    {
-        return rgbM;
-    }
-    
-    float3 rgbL = rgbN + rgbW + rgbM + rgbE + rgbS;
-    
-    float lumaL = (lumaN + lumaW + lumaE + lumaS) * 0.25;
-    float rangeL = abs(lumaL - lumaM);
-    float blendL = max(0.0, (rangeL / range) - FXAA_SUBPIX_TRIM) * FXAA_SUBPIX_TRIM_SCALE; 
-    blendL = min(FXAA_SUBPIX_CAP, blendL);
-    
-    float3 rgbNW = FxaaTexOff(tex, pos.xy, int2(-1,-1), rcpFrame).xyz;
-    float3 rgbNE = FxaaTexOff(tex, pos.xy, int2( 1,-1), rcpFrame).xyz;
-    float3 rgbSW = FxaaTexOff(tex, pos.xy, int2(-1, 1), rcpFrame).xyz;
-    float3 rgbSE = FxaaTexOff(tex, pos.xy, int2( 1, 1), rcpFrame).xyz;
-    rgbL += (rgbNW + rgbNE + rgbSW + rgbSE);
-    rgbL *= (1.0/float3(9.0, 9.0, 9.0));
-    
-    float lumaNW = FxaaLuma(rgbNW);
-    float lumaNE = FxaaLuma(rgbNE);
-    float lumaSW = FxaaLuma(rgbSW);
-    float lumaSE = FxaaLuma(rgbSE);
-    
-    float edgeVert = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaN) + (0.25 * lumaNE)) +
-        abs((0.50 * lumaW ) + (-1.0 * lumaM) + (0.50 * lumaE )) +
-        abs((0.25 * lumaSW) + (-0.5 * lumaS) + (0.25 * lumaSE));
-    float edgeHorz = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaW) + (0.25 * lumaSW)) +
-        abs((0.50 * lumaN ) + (-1.0 * lumaM) + (0.50 * lumaS )) +
-        abs((0.25 * lumaNE) + (-0.5 * lumaE) + (0.25 * lumaSE));
-        
-    bool horzSpan = edgeHorz >= edgeVert;
-    float lengthSign = horzSpan ? -rcpFrame.y : -rcpFrame.x;
-    
-    if(!horzSpan)
-    {
-        lumaN = lumaW;
-        lumaS = lumaE;
-    }
-    
-    float gradientN = abs(lumaN - lumaM);
-    float gradientS = abs(lumaS - lumaM);
-    lumaN = (lumaN + lumaM) * 0.5;
-    lumaS = (lumaS + lumaM) * 0.5;
-    
-    if (gradientN < gradientS)
-    {
-        lumaN = lumaS;
-        lumaN = lumaS;
-        gradientN = gradientS;
-        lengthSign *= -1.0;
-    }
-    
-    float2 posN;
-    posN.x = pos.x + (horzSpan ? 0.0 : lengthSign * 0.5);
-    posN.y = pos.y + (horzSpan ? lengthSign * 0.5 : 0.0);
-    
-    gradientN *= FXAA_SEARCH_THRESHOLD;
-    
-    float2 posP = posN;
-    float2 offNP = horzSpan ? float2(rcpFrame.x, 0.0) : float2(0.0, rcpFrame.y); 
-    float lumaEndN = lumaN;
-    float lumaEndP = lumaN;
-    bool doneN = false;
-    bool doneP = false;
-    posN += offNP * float2(-1.0, -1.0);
-    posP += offNP * float2( 1.0,  1.0);
-    
-    for(int i = 0; i < FXAA_SEARCH_STEPS; i++) {
-        if(!doneN)
-        {
-            lumaEndN = FxaaLuma(tex2D(tex, posN.xy).xyz);
-        }
-        if(!doneP)
-        {
-            lumaEndP = FxaaLuma(tex2D(tex, posP.xy).xyz);
-        }
-        
-        doneN = doneN || (abs(lumaEndN - lumaN) >= gradientN);
-        doneP = doneP || (abs(lumaEndP - lumaN) >= gradientN);
-        
-        if(doneN && doneP)
-        {
-            break;
-        }
-        if(!doneN)
-        {
-            posN -= offNP;
-        }
-        if(!doneP)
-        {
-            posP += offNP;
-        }
-    }
-    
-    float dstN = horzSpan ? pos.x - posN.x : pos.y - posN.y;
-    float dstP = horzSpan ? posP.x - pos.x : posP.y - pos.y;
-    bool directionN = dstN < dstP;
-    lumaEndN = directionN ? lumaEndN : lumaEndP;
-    
-    if(((lumaM - lumaN) < 0.0) == ((lumaEndN - lumaN) < 0.0))
-    {
-        lengthSign = 0.0;
-    }
- 
-
-    float spanLength = (dstP + dstN);
-    dstN = directionN ? dstN : dstP;
-    float subPixelOffset = (0.5 + (dstN * (-1.0/spanLength))) * lengthSign;
-    float3 rgbF = tex2D(tex, float2(
-        pos.x + (horzSpan ? 0.0 : subPixelOffset),
-        pos.y + (horzSpan ? subPixelOffset : 0.0))).xyz;
-    return FxaaLerp3(rgbL, rgbF, blendL); 
-}
-
-float4 PS_FXAA(float4 vpos: SV_Position, float2 vTexCoord : TEXCOORD0) : SV_Target
-{
-    float3 color = FxaaPixelShader(vTexCoord, sBackBuffer, 1.0 / (ViewportSize*BufferToViewportRatio));
-
-    return float4(color, 1.0);
-}
-
-
-
-technique FXAA
-{
-   pass
-   {
-   	VertexShader = PostProcessVS;
-   	PixelShader  = PS_FXAA;
-   }
-}
--- a/data/resources/shaders/reshade/Shaders/crt-royale.fx
+++ b/data/resources/shaders/reshade/Shaders/crt-royale.fx
@@ -0,0 +1,244 @@
+#include "ReShade.fxh"
+
+/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
+
+//  crt-royale-reshade: A port of TroggleMonkey's crt-royale from libretro to ReShade.
+//  Copyright (C) 2020 Alex Gunter <akg7634@gmail.com>
+//
+//  This program is free software; you can redistribute it and/or modify it
+//  under the terms of the GNU General Public License as published by the Free
+//  Software Foundation; either version 2 of the License, or any later version.
+//
+//  This program is distributed in the hope that it will be useful, but WITHOUT
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+//  more details.
+//
+//  You should have received a copy of the GNU General Public License along with
+//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+//  Place, Suite 330, Boston, MA 02111-1307 USA
+
+// Enable or disable the shader
+#ifndef CONTENT_BOX_VISIBLE
+	#define CONTENT_BOX_VISIBLE 0
+#endif
+
+#include "crt-royale/shaders/content-box.fxh"
+
+#if !CONTENT_BOX_VISIBLE
+	#include "crt-royale/shaders/input-blurring.fxh"
+	#include "crt-royale/shaders/electron-beams.fxh"
+	#include "crt-royale/shaders/blurring.fxh"
+	#include "crt-royale/shaders/deinterlace.fxh"
+	#include "crt-royale/shaders/phosphor-mask.fxh"
+	#include "crt-royale/shaders/brightpass.fxh"
+	#include "crt-royale/shaders/bloom.fxh"
+	#include "crt-royale/shaders/geometry-aa-last-pass.fxh"
+#endif
+
+
+technique CRT_Royale
+{
+	// Toggle the content box to help users configure it
+	#if CONTENT_BOX_VISIBLE
+		pass contentBoxPass
+		{
+			// content-box.fxh
+			// Draw a box that displays the crop we'll perform.
+			VertexShader = PostProcessVS;
+			PixelShader = contentBoxPixelShader;
+		}
+	#else
+		#if ENABLE_PREBLUR
+			pass PreblurVert
+			{
+				// input-blurring.fxh
+				// Optionally blur the input buffer a little
+				VertexShader = contentCropVS;
+				PixelShader = preblurVertPS;
+
+				RenderTarget = texPreblurVert;
+
+				PrimitiveTopology = TRIANGLESTRIP;
+				VertexCount = 4;
+			}
+			pass PreblurHoriz
+			{
+				// input-blurring.fxh
+				VertexShader = PostProcessVS;
+				PixelShader = preblurHorizPS;
+				
+				RenderTarget = texPreblurHoriz;
+			}
+		#endif
+		pass beamDistPass
+		{
+			// electron-beams.fxh
+			// Simulate emission of the interlaced video as electron beams. 	
+			VertexShader = calculateBeamDistsVS;
+			PixelShader = calculateBeamDistsPS;
+
+			RenderTarget = texBeamDist;
+
+			// This lets us improve performance by only computing the mask every k frames
+			ClearRenderTargets = false;
+		}
+		pass electronBeamPass
+		{
+			// electron-beams.fxh
+			// Simulate emission of the interlaced video as electron beams. 	
+			VertexShader = simulateEletronBeamsVS;
+			PixelShader = simulateEletronBeamsPS;
+
+			RenderTarget = texElectronBeams;
+
+			// If the preblur passes are disabled, we have to crop in this pass
+			#if !ENABLE_PREBLUR
+			PrimitiveTopology = TRIANGLESTRIP;
+			VertexCount = 4;
+			#endif
+		}
+		pass beamConvergencePass
+		{
+			// electron-beams.fxh
+			// Simulate beam convergence miscalibration
+			//   Not to be confused with beam purity
+			VertexShader = beamConvergenceVS;
+			PixelShader = beamConvergencePS;
+
+			RenderTarget = texBeamConvergence;
+		}
+		pass bloomApproxPassVert
+		{
+			// bloom.fxh
+			VertexShader = PostProcessVS;
+			PixelShader = approximateBloomVertPS;
+			
+			RenderTarget = texBloomApproxVert;
+		}
+		pass bloomApproxPassHoriz
+		{
+			// bloom.fxh
+			VertexShader = PostProcessVS;
+			PixelShader = approximateBloomHorizPS;
+			
+			RenderTarget = texBloomApproxHoriz;
+		}
+		pass blurVerticalPass
+		{
+			// blurring.fxh
+			// Vertically blur the approx bloom
+			VertexShader = blurVerticalVS;
+			PixelShader = blurVerticalPS;
+			
+			RenderTarget = texBlurVertical;
+		}
+		pass blurHorizontalPass
+		{
+			// blurring.fxh
+			// Horizontally blur the approx bloom
+			VertexShader = blurHorizontalVS;
+			PixelShader = blurHorizontalPS;
+			
+			RenderTarget = texBlurHorizontal;
+		}
+		pass deinterlacePass
+		{
+			// deinterlace.fxh
+			// Optionally deinterlace the video if interlacing is enabled.
+			//   Can help approximate the original crt-royale's appearance
+			//   without some issues like image retention.
+			VertexShader = deinterlaceVS;
+			PixelShader = deinterlacePS;
+			
+			RenderTarget = texDeinterlace;
+		}
+		pass freezeFramePass
+		{
+			// deinterlace.fxh
+			// Capture the current frame, so we can use it in the next
+			//   frame's deinterlacing pass.
+			VertexShader = freezeFrameVS;
+			PixelShader = freezeFramePS;
+
+			RenderTarget = texFreezeFrame;
+
+			// Explicitly disable clearing render targets
+			//   scanlineBlendPass will not work properly if this ever defaults to true
+			ClearRenderTargets = false;
+		}
+		pass generatePhosphorMask
+		{
+			// phosphor-mask.fxh
+			VertexShader = generatePhosphorMaskVS;
+			PixelShader = generatePhosphorMaskPS;
+
+			RenderTarget = texPhosphorMask;
+
+			// This lets us improve performance by only computing the mask every k frames
+			ClearRenderTargets = false;
+			
+			PrimitiveTopology = TRIANGLESTRIP;
+			VertexCount = 4;
+		}
+		pass applyPhosphormask
+		{
+			// phosphor-mask.fxh
+			// Tile the scaled phosphor mask and apply it to
+			//   the deinterlaced image.
+			VertexShader = PostProcessVS;
+			PixelShader = applyComputedPhosphorMaskPS;
+			
+			RenderTarget = texMaskedScanlines;
+			// RenderTarget = texGeometry;
+		}
+		pass brightpassPass
+		{
+			// brightpass.fxh
+			// Apply a brightpass filter for the bloom effect
+			VertexShader = brightpassVS;
+			PixelShader = brightpassPS;
+			
+			RenderTarget = texBrightpass;
+		}
+		pass bloomVerticalPass
+		{
+			// bloom.fxh
+			// Blur vertically for the bloom effect
+			VertexShader = bloomVerticalVS;
+			PixelShader = bloomVerticalPS;
+			
+			RenderTarget = texBloomVertical;
+		}
+		pass bloomHorizontalPass
+		{
+			// bloom.fxh
+			// Blur horizontally for the bloom effect.
+			//   Also apply various color changes and effects.
+			VertexShader = bloomHorizontalVS;
+			PixelShader = bloomHorizontalPS;
+			
+			RenderTarget = texBloomHorizontal;
+		}
+		pass geometryPass
+		{
+			// geometry-aa-last-pass.fxh
+			// Apply screen geometry and anti-aliasing.
+			VertexShader = geometryVS;
+			PixelShader = geometryPS;
+
+			RenderTarget = texGeometry;
+		}
+		pass uncropPass
+		{
+			// content-box.fxh
+			// Uncrop the video, so we draw the game's content
+			//   in the same position it started in.
+			VertexShader = contentUncropVS;
+			PixelShader = uncropContentPixelShader;
+			
+			PrimitiveTopology = TRIANGLESTRIP;
+			VertexCount = 4;
+		}
+	#endif
+}
--- a/data/resources/shaders/reshade/Shaders/crt-royale/lib/bind-shader-params.fxh
+++ b/data/resources/shaders/reshade/Shaders/crt-royale/lib/bind-shader-params.fxh
@@ -0,0 +1,908 @@
+#ifndef _BIND_SHADER_PARAMS_H
+#define _BIND_SHADER_PARAMS_H
+
+/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
+
+//  crt-royale: A full-featured CRT shader, with cheese.
+//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
+//
+//  crt-royale-reshade: A port of TroggleMonkey's crt-royale from libretro to ReShade.
+//  Copyright (C) 2020 Alex Gunter <akg7634@gmail.com>
+//
+//  This program is free software; you can redistribute it and/or modify it
+//  under the terms of the GNU General Public License as published by the Free
+//  Software Foundation; either version 2 of the License, or any later version.
+//
+//  This program is distributed in the hope that it will be useful, but WITHOUT
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+//  more details.
+//
+//  You should have received a copy of the GNU General Public License along with
+//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+//  Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
+
+///////////////////////////////  BEGIN INCLUDES  ///////////////////////////////
+#include "helper-functions-and-macros.fxh"
+#include "user-settings.fxh"
+#include "derived-settings-and-constants.fxh"
+#include "../version-number.fxh"
+
+////////////////////////////////  END INCLUDES  ////////////////////////////////
+
+//  Override some parameters for gamma-management.h and tex2Dantialias.h:
+#ifndef _OVERRIDE_DEVICE_GAMMA
+    #define _OVERRIDE_DEVICE_GAMMA 1
+#endif
+
+#if __RENDERER__ != 0x9000
+    #define _DX9_ACTIVE 0
+#else
+    #define _DX9_ACTIVE 1
+#endif
+
+// #ifndef ANTIALIAS_OVERRIDE_BASICS
+//     #define ANTIALIAS_OVERRIDE_BASICS 1
+// #endif
+
+// #ifndef ANTIALIAS_OVERRIDE_PARAMETERS
+//     #define ANTIALIAS_OVERRIDE_PARAMETERS 1
+// #endif
+
+#ifndef ADVANCED_SETTINGS
+    #define ADVANCED_SETTINGS 0
+#endif 
+
+// The width of the game's content
+#ifndef CONTENT_WIDTH
+	#define CONTENT_WIDTH BUFFER_WIDTH
+#endif
+// The height of the game's content
+#ifndef CONTENT_HEIGHT
+	#define CONTENT_HEIGHT BUFFER_HEIGHT
+#endif
+
+#if ADVANCED_SETTINGS == 1
+    // Using vertex uncropping is marginally faster, but vulnerable to DX9 weirdness.
+    // Most users will likely prefer the slower algorithm.
+    #ifndef USE_VERTEX_UNCROPPING
+        #define USE_VERTEX_UNCROPPING 0
+    #endif
+
+    #ifndef NUM_BEAMDIST_COLOR_SAMPLES
+        #define NUM_BEAMDIST_COLOR_SAMPLES 1024
+    #endif
+
+    #ifndef NUM_BEAMDIST_DIST_SAMPLES
+        #define NUM_BEAMDIST_DIST_SAMPLES 120
+    #endif
+
+    #ifndef BLOOMAPPROX_DOWNSIZING_FACTOR
+        #define BLOOMAPPROX_DOWNSIZING_FACTOR 4.0
+    #endif
+
+    // Define this internal value, so ADVANCED_SETTINGS == 0 doesn't cause a redefinition error when
+    //   NUM_BEAMDIST_COLOR_SAMPLES defined in the preset file. Also makes it easy to avoid bugs
+    //   related to parentheses and order-of-operations when the user defines this arithmetically.
+    static const uint num_beamdist_color_samples = uint(NUM_BEAMDIST_COLOR_SAMPLES);
+    static const uint num_beamdist_dist_samples = uint(NUM_BEAMDIST_DIST_SAMPLES);
+    static const float bloomapprox_downsizing_factor = float(BLOOMAPPROX_DOWNSIZING_FACTOR);
+#else
+    static const uint USE_VERTEX_CROPPING = 0;
+    static const uint num_beamdist_color_samples = 1024;
+    static const uint num_beamdist_dist_samples = 120;
+    static const float bloomapprox_downsizing_factor = 4.0;
+#endif
+
+#ifndef HIDE_HELP_SECTIONS
+    #define HIDE_HELP_SECTIONS 0
+#endif
+
+
+// Offset the center of the game's content (horizontal)
+#ifndef CONTENT_CENTER_X
+	#define CONTENT_CENTER_X 0
+#endif
+// Offset the center of the game's content (vertical)
+#ifndef CONTENT_CENTER_Y
+	#define CONTENT_CENTER_Y 0
+#endif
+
+// Wrap the content size in parenthesis for internal use, so the user doesn't have to
+static const float2 content_size = float2(int(CONTENT_WIDTH), int(CONTENT_HEIGHT));
+
+#ifndef ENABLE_PREBLUR
+    #define ENABLE_PREBLUR 1
+#endif
+
+
+static const float2 buffer_size = float2(BUFFER_WIDTH, BUFFER_HEIGHT);
+
+
+// The normalized center is 0.5 plus the normalized offset
+static const float2 content_center = float2(CONTENT_CENTER_X, CONTENT_CENTER_Y) / buffer_size + 0.5;
+// The content's normalized diameter d is its size divided by the buffer's size. The radius is d/2.
+static const float2 content_radius = content_size / (2.0 * buffer_size);
+static const float2 content_scale = content_size / buffer_size;
+
+static const float content_left = content_center.x - content_radius.x;
+static const float content_right = content_center.x + content_radius.x;
+static const float content_upper = content_center.y - content_radius.y;
+static const float content_lower = content_center.y + content_radius.y;
+
+// The xy-offset of the top-left pixel in the content box
+static const float2 content_offset = float2(content_left, content_upper);
+static const float2 content_offset_from_right = float2(content_right, content_lower);
+
+uniform uint frame_count < source = "framecount"; >;
+uniform int overlay_active < source = "overlay_active"; >;
+
+static const float gba_gamma = 3.5; //  Irrelevant but necessary to define.
+
+
+// === HELP AND INFO ===
+
+uniform int APPEND_VERSION_SUFFIX(version) <
+	ui_text = "Version: " DOT_VERSION_STR;
+	ui_label = " ";
+	ui_type = "radio";
+>;
+
+uniform int basic_setup_help <
+	ui_text = "1. Configure the Content Box if your game has letter-boxing.\n"
+			  "2. Configure the Phosphor Mask.\n"
+              "3. Configure the Scanlines.\n"
+              "4. Configure the Colors and Effects.\n"
+              "5. Configure the Screen Geometry.\n"
+              "6. Configure or disable Preblur\n\n"
+              "- In Preprocessor Definitions, set ADVANCED_SETTINGS to 1 to access more settings.\n";
+	ui_category = "Basic Setup Instructions";
+    ui_category_closed = true;
+	ui_label = " ";
+	ui_type = "radio";
+    hidden = HIDE_HELP_SECTIONS;
+>;
+
+uniform int content_box_help <
+	ui_text = "1. Expand the Preprocessor Definitions section.\n"
+              "2. Set CONTENT_BOX_VISIBLE to 1.\n"
+              "3. Use the \"CONTENT_\" parameters to configure the Content Box.\n"
+			  "4. Align the content box with the border of your game.\n"
+              "5. Set CONTENT_BOX_VISIBLE to 0 when you're done.\n\n"
+              "Parameters to focus on:\n"
+              "- CONTENT_HEIGHT and CONTENT_WIDTH\n"
+              "- CONTENT_CENTER_X and CONTENT_CENTER_Y\n"
+              "- CONTENT_BOX_INSCRIBED\n\n"
+              "Fancy Trick 1:\n"
+              "\tCONTENT_HEIGHT = BUFFER_HEIGHT\n"
+              "\tCONTENT_WIDTH = CONTENT_HEIGHT * 4.0 / 3.0\n"
+              "- Good if your game fills the screen vertically and has a 4:3 aspect ratio.\n"
+              "- Will also rescale automatically if you resize the window.\n\n"
+              "Fancy Trick 2:\n"
+              "\tCONTENT_HEIGHT = CONTENT_WIDTH * 9.0 / 16.0\n"
+              "\tCONTENT_WIDTH = 1500\n"
+              "- Good if your game is 1500 pixels wide with a 16:9 aspect ratio.\n"
+              "- Won't rescale automatically, but you'd only have to change the width.\n";
+	ui_category = "Content Box Instructions";
+    ui_category_closed = true;
+	ui_label = " ";
+	ui_type = "radio";
+    hidden = HIDE_HELP_SECTIONS;
+>;
+
+
+// ==== PHOSPHOR MASK ====
+uniform int mask_type <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "Choose which kind of CRT you want.\n\n";
+        #endif
+        ui_label   = "Mask Type";
+        ui_tooltip = "Selects the phosphor shape";
+        ui_type    = "combo";
+        ui_items   = "Grille\0"
+                    "Slot\0"
+                    "Shadow\0"
+                    "LowRes Grille\0"
+                    "LowRes Slot\0"
+                    "LowRes Shadow\0";
+
+    ui_category = "Phosphor Mask";
+    ui_category_closed = true;
+> = mask_type_static;
+
+uniform uint mask_size_param <
+        ui_label   = "Mask Size Param";
+        ui_tooltip = "Switch between using Mask Triad Size or Mask Num Triads";
+        ui_type    = "combo";
+        ui_items   = "Triad Width\0"
+                    "Num Triads Across\0";
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 2;
+    ui_category = "Phosphor Mask";
+> = mask_size_param_static;
+
+uniform float mask_triad_width <
+        ui_label   = "Mask Triad Width";
+        ui_tooltip = "The width of a triad in pixels";
+        ui_type    = "slider";
+        ui_min     = 1.0;
+        ui_max     = 60.0;
+        ui_step    = 0.1;
+
+    ui_category = "Phosphor Mask";
+> = mask_triad_width_static;
+
+uniform float mask_num_triads_across <
+        ui_label   = "Mask Num Triads Across";
+        ui_tooltip = "The number of triads in the viewport (horizontally)";
+        ui_type    = "drag";
+        ui_min     = 1.0;
+        ui_max     = 1280.0;
+        ui_step    = 1.0;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Phosphor Mask";
+> = mask_num_triads_across_static;
+
+uniform float scale_triad_height<
+        ui_label   = "Scale Triad Height";
+        ui_tooltip = "Scales the height of a triad";
+        ui_type    = "drag";
+        ui_min     = 0.01;
+        ui_max     = 10.0;
+        ui_step    = 0.001;
+
+    ui_spacing = 2;
+    ui_category = "Phosphor Mask";
+> = 1.0;
+
+uniform float2 phosphor_thickness <
+        ui_label   = "Phosphor Thickness XY";
+        ui_tooltip = "Makes the phosphors appear thicker in each direction";
+        ui_type    = "drag";
+        ui_min     = 0.01;
+        ui_max     = 0.99;
+        ui_step    = 0.01;
+        // hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Phosphor Mask";
+> = 0.2;
+
+uniform float2 phosphor_sharpness <
+        ui_label   = "Phosphor Sharpness XY";
+        ui_tooltip = "Makes the phosphors appear more crisp in each direction";
+        ui_type    = "drag";
+        ui_min     = 1;
+        ui_max     = 100;
+        ui_step    = 1;
+        // hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Phosphor Mask";
+> = 50;
+
+uniform float3 phosphor_offset_x <
+        ui_label   = "Phosphor Offset RGB X";
+        ui_tooltip = "Very slightly shifts the phosphor mask. Can help with subpixel alignment.";
+        ui_type    = "drag";
+        ui_min     = -1;
+        ui_max     = 1;
+        ui_step    = 0.01;
+        // hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 2;
+    ui_category = "Phosphor Mask";
+> = 0;
+
+uniform float3 phosphor_offset_y <
+        ui_label   = "Phosphor Offset RGB Y";
+        ui_tooltip = "Very slightly shifts the phosphor mask. Can help with subpixel alignment.";
+        ui_type    = "drag";
+        ui_min     = -1;
+        ui_max     = 1;
+        ui_step    = 0.01;
+        // hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Phosphor Mask";
+> = 0;
+
+// static const uint pixel_grid_mode = 0;
+// static const float2 pixel_size = 1;
+/*
+// ==== PIXELATION ===
+uniform uint pixel_grid_mode <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "- Fix issues displaying pixel art.\n"
+                     "- Force high-res games to look low-res.\n\n";
+        #endif
+        ui_label   = "Pixel Grid Param";
+        ui_tooltip = "Switch between using Pixel Size or Num Pixels";
+        ui_type    = "combo";
+        ui_items   = "Pixel Size\0"
+                    "Content Resolution\0";
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Pixelation";
+    ui_category_closed = true;
+> = 0;
+
+uniform float2 pixel_size <
+        #if !HIDE_HELP_SECTIONS && !ADVANCED_SETTINGS
+        ui_text    = "- Fix issues displaying pixel art.\n"
+                     "- Force high-res games to look low-res.\n\n";
+        #endif
+        ui_label   = "Pixel Size";
+        ui_tooltip = "The size of an in-game pixel on screen, in real-world pixels";
+        ui_type    = "slider";
+        ui_min     = 1.0;
+        ui_max     = 30.0;
+        ui_step    = 1.0;
+
+    ui_category = "Pixelation";
+    ui_category_closed = true;
+> = float2(1, 1);
+
+uniform float2 pixel_grid_resolution <
+        ui_label   = "Num Pixels";
+        ui_tooltip = "The number of in-game pixels displayed on-screen in each direction";
+        ui_type    = "drag";
+        ui_min     = 1.0;
+        ui_max     = 10000.0;
+        ui_step    = 1.0;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Pixelation";
+> = content_size;
+uniform float2 pixel_grid_offset <
+        ui_label   = "Pixel Grid Offset";
+        ui_tooltip = "Shifts the pixel-grid to help with alignment";
+        ui_type    = "slider";
+        ui_min     = -15.0;
+        ui_max     = 15.0;
+        ui_step    = 1.0;
+
+    #if ADVANCED_SETTINGS
+    ui_spacing = 2;
+    #endif
+    ui_category = "Pixelation";
+> = float2(0, 0);
+*/
+
+// ==== SCANLINES ====
+uniform uint scanline_thickness <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "Configure the electron beams and interlacing.\n\n";
+        #endif
+        ui_label   = "Scanline Thickness";
+        ui_tooltip = "Sets the height of each scanline";
+        ui_type    = "slider";
+        ui_min     = 1;
+        ui_max     = 30;
+        ui_step    = 1;
+
+    ui_category = "Scanlines";
+    ui_category_closed = true;
+> = 2;
+
+uniform float scanline_offset <
+        ui_label   = "Scanline Offset";
+        ui_tooltip = "Vertically shifts the scanlines to help with alignment";
+        ui_type    = "slider";
+        ui_min     = -30;
+        ui_max     = 30;
+        ui_step    = 1;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Scanlines";
+> = 0;
+
+uniform uint beam_shape_mode <
+        ui_label   = "Beam Shape Mode";
+        ui_tooltip = "Select the kind of beam to use.";
+        ui_type    = "combo";
+        ui_items   = "Digital (Fast)\0"
+                    "Linear (Simple)\0"
+                    "Gaussian (Realistic)\0"
+                    "Multi-Source Gaussian (Expensive)\0";
+
+    ui_category = "Scanlines";
+> = 1;
+
+uniform bool enable_interlacing <
+        ui_label   = "Enable Interlacing";
+
+    ui_spacing = 5;
+    ui_category = "Scanlines";
+> = false;
+
+uniform bool interlace_back_field_first <
+        ui_label   = "Draw Back-Field First";
+        ui_tooltip = "Draw odd-numbered scanlines first (often has no effect)";
+
+    ui_category = "Scanlines";
+> = interlace_back_field_first_static;
+
+uniform uint scanline_deinterlacing_mode <
+        ui_label   = "Deinterlacing Mode";
+        ui_tooltip = "Selects the deinterlacing algorithm, if any.";
+        ui_type    = "combo";
+        ui_items   = "None\0"
+                     "Fake-Progressive\0"  
+                     "Weaving\0"
+                     "Blended Weaving\0";
+
+    ui_category = "Scanlines";
+> = 1;
+
+uniform float deinterlacing_blend_gamma <
+        ui_label   = "Deinterlacing Blend Gamma";
+        ui_tooltip = "Nudge this if deinterlacing changes your colors too much";
+        ui_type    = "slider";
+        ui_min     = 0.01;
+        ui_max     = 5.0;
+        ui_step    = 0.01;
+
+    ui_category = "Scanlines";
+> = 1.0;
+
+uniform float linear_beam_thickness <
+        ui_label   = "Linear Beam Thickness";
+        ui_tooltip = "Linearly widens or narrows the beam";
+        ui_type    = "slider";
+        ui_min     = 0.01;
+        ui_max     = 3.0;
+        ui_step    = 0.01;
+
+    ui_spacing = 5;
+    ui_category = "Scanlines";
+> = 1.0;
+
+uniform float gaussian_beam_min_sigma <
+        ui_label   = "Gaussian Beam Min Sigma";
+        ui_tooltip = "For Gaussian Beam Shape, sets thickness of dim pixels";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+
+    ui_spacing = 5;
+    ui_category = "Scanlines";
+> = gaussian_beam_min_sigma_static;
+
+uniform float gaussian_beam_max_sigma <
+        ui_label   = "Gaussian Beam Max Sigma";
+        ui_tooltip = "For Gaussian Beam Shape, sets thickness of bright pixels";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+
+    ui_category = "Scanlines";
+> = gaussian_beam_max_sigma_static;
+
+uniform float gaussian_beam_spot_power <
+        ui_label   = "Gaussian Beam Spot Power";
+        ui_tooltip = "For Gaussian Beam Shape, balances between Min and Max Sigma";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+
+    ui_category = "Scanlines";
+> = gaussian_beam_spot_power_static;
+
+uniform float gaussian_beam_min_shape <
+        ui_label   = "Gaussian Beam Min Shape";
+        ui_tooltip = "For Gaussian Beam Shape, sets sharpness of dim pixels";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 2;
+    ui_category = "Scanlines";
+> = gaussian_beam_min_shape_static;
+
+uniform float gaussian_beam_max_shape <
+        ui_label   = "Gaussian Beam Max Shape";
+        ui_tooltip = "For Gaussian Beam Shape, sets sharpness of bright pixels";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Scanlines";
+> = gaussian_beam_max_shape_static;
+
+uniform float gaussian_beam_shape_power <
+        ui_label   = "Gaussian Beam Shape Power";
+        ui_tooltip = "For Gaussian Beam Shape, balances between Min and Max Shape";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Scanlines";
+> = gaussian_beam_shape_power_static;
+
+uniform float3 convergence_offset_x <
+        ui_label   = "Convergence Offset X RGB";
+        ui_tooltip = "Shift the color channels horizontally";
+        ui_type    = "drag";
+        ui_min     = -10;
+        ui_max     = 10;
+        ui_step    = 0.05;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 5;
+    ui_category = "Scanlines";
+> = 0;
+uniform float3 convergence_offset_y <
+        ui_label   = "Convergence Offset Y RGB";
+        ui_tooltip = "Shift the color channels vertically";
+        ui_type    = "drag";
+        ui_min     = -10;
+        ui_max     = 10;
+        ui_step    = 0.05;
+        hidden     = !ADVANCED_SETTINGS;
+    ui_category = "Scanlines";
+> = 0;
+
+static uint beam_horiz_filter = beam_horiz_filter_static;
+static float beam_horiz_sigma = beam_horiz_sigma_static;
+static float beam_horiz_linear_rgb_weight = beam_horiz_linear_rgb_weight_static;
+
+// ==== IMAGE COLORIZATION ====
+uniform float crt_gamma <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "Apply gamma, contrast, and blurring.\n\n";
+        #endif
+        ui_label   = "CRT Gamma";
+        ui_tooltip = "The gamma-level of the original content";
+        ui_type    = "slider";
+        ui_min     = 1.0;
+        ui_max     = 5.0;
+        ui_step    = 0.01;
+
+    ui_category = "Colors and Effects";
+    ui_category_closed = true;
+> = crt_gamma_static;
+
+uniform float lcd_gamma <
+        ui_label   = "LCD Gamma";
+        ui_tooltip = "The gamma-level of your display";
+        ui_type    = "slider";
+        ui_min     = 1.0;
+        ui_max     = 5.0;
+        ui_step    = 0.01;
+
+    ui_category = "Colors and Effects";
+> = lcd_gamma_static;
+
+uniform float levels_contrast <
+        ui_label   = "Levels Contrast";
+        ui_tooltip = "Sets the contrast of the CRT";
+        ui_type    = "slider";
+        ui_min     = 0.0;
+        ui_max     = 4.0;
+        ui_step    = 0.01;
+
+    ui_spacing = 5;
+    ui_category = "Colors and Effects";
+> = levels_contrast_static;
+
+uniform float halation_weight <
+        ui_label   = "Halation";
+        ui_tooltip = "Desaturation due to eletrons exciting the wrong phosphors";
+        ui_type    = "slider";
+        ui_min     = 0.0;
+        ui_max     = 1.0;
+        ui_step    = 0.01;
+        
+    ui_spacing = 2;
+    ui_category = "Colors and Effects";
+> = halation_weight_static;
+
+uniform float diffusion_weight <
+        ui_label   = "Diffusion";
+        ui_tooltip = "Blurring due to refraction from the screen's glass";
+        ui_type    = "slider";
+        ui_min     = 0.0;
+        ui_max     = 1.0;
+        ui_step    = 0.01;
+
+    ui_category = "Colors and Effects";
+> = diffusion_weight_static;
+
+uniform float blur_radius <
+        ui_label   = "Blur Radius";
+        ui_tooltip = "Scales the radius of the halation and diffusion effects";
+        ui_type    = "slider";
+        ui_min     = 0.01;
+        ui_max     = 5.0;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Colors and Effects";
+> = 1.0;
+
+uniform float bloom_underestimate_levels <
+        ui_label   = "Bloom Underestimation";
+        ui_tooltip = "Scale the bloom effect's intensity";
+        ui_type    = "drag";
+        ui_min     = FIX_ZERO(0.0);
+        ui_step    = 0.01;
+
+    ui_spacing = 2;
+    ui_category = "Colors and Effects";
+> = bloom_underestimate_levels_static;
+
+uniform float bloom_excess <
+        ui_label   = "Bloom Excess";
+        ui_tooltip = "Extra bloom applied to all colors";
+        ui_type    = "slider";
+        ui_min     = 0.0;
+        ui_max     = 1.0;
+        ui_step    = 0.01;
+
+    ui_category = "Colors and Effects";
+> = bloom_excess_static;
+
+uniform float2 aa_subpixel_r_offset_runtime <
+        ui_label   = "AA Subpixel R Offet XY";
+        ui_type    = "drag";
+        ui_min     = -0.5;
+        ui_max     = 0.5;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS || !_RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS;
+
+    ui_category = "Colors and Effects";
+> = aa_subpixel_r_offset_static;
+
+static const float aa_cubic_c = aa_cubic_c_static;
+static const float aa_gauss_sigma = aa_gauss_sigma_static;
+
+
+// ==== GEOMETRY ====
+uniform uint geom_rotation_mode <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "Change the geometry of the screen's glass.\n\n";
+        #endif
+        ui_label   = "Rotate Screen";
+        ui_type    = "combo";
+        ui_items   = "0 degrees\0"
+                     "90 degrees\0"
+                     "180 degrees\0"
+                     "270 degrees\0";
+
+    ui_category = "Screen Geometry";
+    ui_category_closed = true;
+> = 0;
+uniform uint geom_mode_runtime <
+        ui_label   = "Geometry Mode";
+        ui_tooltip = "Select screen curvature type";
+        ui_type    = "combo";
+        ui_items   = "Flat\0"
+                    "Spherical\0"
+                    "Spherical (Alt)\0"
+                    "Cylindrical (Trinitron)\0";
+                    
+    ui_category = "Screen Geometry";
+> = geom_mode_static;
+
+uniform float geom_radius <
+        ui_label   = "Geometry Radius";
+        ui_tooltip = "Select screen curvature radius";
+        ui_type    = "slider";
+        ui_min     = 1.0 / (2.0 * pi);
+        ui_max     = 1024;
+        ui_step    = 0.01;
+
+    ui_category = "Screen Geometry";
+> = geom_radius_static;
+
+uniform float geom_view_dist <
+        ui_label   = "View Distance";
+        ui_type    = "slider";
+        ui_min     = 0.5;
+        ui_max     = 1024;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 2;
+    ui_category = "Screen Geometry";
+> = geom_view_dist_static;
+
+uniform float2 geom_tilt_angle <
+        ui_label   = "Screen Tilt Angles";
+        ui_type    = "drag";
+        ui_min     = -pi;
+        ui_max     = pi;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Screen Geometry";
+> = geom_tilt_angle_static;
+
+uniform float2 geom_aspect_ratio <
+        ui_label   = "Screen Aspect Ratios";
+        ui_type    = "drag";
+        ui_min     = 1.0;
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_category = "Screen Geometry";
+> = float2(geom_aspect_ratio_static, 1);
+uniform float2 geom_overscan <
+        ui_label   = "Geom Overscan";
+        ui_type    = "drag";
+        ui_min     = FIX_ZERO(0.0);
+        ui_step    = 0.01;
+        hidden     = !ADVANCED_SETTINGS;
+
+    ui_spacing = 2;
+    ui_category = "Screen Geometry";
+> = geom_overscan_static;
+
+// ==== BORDER ====
+uniform float border_size <
+        #if !HIDE_HELP_SECTIONS
+        ui_text    = "Apply a thin vignette to the edge of the screen.\n\n";
+        #endif
+        ui_label   = "Border Size";
+        ui_category_closed = true;
+        ui_type    = "slider";
+        ui_min     = 0.0;
+        ui_max     = 0.5;
+        ui_step    = 0.01;
+
+    ui_category = "Screen Border";
+> = border_size_static;
+
+uniform float border_darkness <
+        ui_label   = "Border Darkness";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+
+    ui_category = "Screen Border";
+> = border_darkness_static;
+
+uniform float border_compress <
+        ui_label   = "Border Compress";
+        ui_type    = "drag";
+        ui_min     = 0.0;
+        ui_step    = 0.01;
+        
+    ui_category = "Screen Border";
+> = border_compress_static;
+
+// ==== PREBLUR ====
+#if ENABLE_PREBLUR
+    uniform float2 preblur_effect_radius <
+            #if !HIDE_HELP_SECTIONS
+            ui_text    = "- Apply a linear blur to the input image. Kind of like an NTSC/Composite shader, but much faster.\n"
+                         "- If you want to use an NTSC shader or don't like this effect, disable it by setting ENABLE_PREBLUR to 0\n"
+                         "- If you leave all of these set to 0, then they don't do anything. Consider disabling the effect to improve performance.\n\n";
+            #endif
+            ui_type    = "drag";
+            ui_min     = 0;
+            ui_max     = 100;
+            ui_step    = 1;
+            ui_label   = "Effect Radius XY";
+            ui_tooltip = "The radius of the effect visible on the screen (measured in pixels)";
+        
+        ui_category   = "Pre-Blur";
+        ui_category_closed = true;
+    > = 0;
+    uniform uint2 preblur_sampling_radius <
+            ui_type = "drag";
+            ui_min = 0;
+            ui_max = 100;
+            ui_step = 1;
+            ui_label = "Sampling Radius XY";
+            ui_tooltip = "The number of samples to take on either side of each pixel";
+        
+        ui_category   = "Pre-Blur";
+    > = 0;
+#else
+    static const float2 preblur_effect_radius = 0;
+    static const uint2 preblur_sampling_radius = 0;
+#endif
+
+//  Provide accessors for vector constants that pack scalar uniforms:
+float2 get_aspect_vector(const float geom_aspect_ratio)
+{
+    //  Get an aspect ratio vector.  Enforce geom_max_aspect_ratio, and prevent
+    //  the absolute scale from affecting the uv-mapping for curvature:
+    const float geom_clamped_aspect_ratio =
+        min(geom_aspect_ratio, geom_max_aspect_ratio);
+    const float2 geom_aspect =
+        normalize(float2(geom_clamped_aspect_ratio, 1.0));
+    return geom_aspect;
+}
+
+float2 get_geom_overscan_vector()
+{
+    return geom_overscan;
+}
+
+float2 get_geom_tilt_angle_vector()
+{
+    return geom_tilt_angle;
+}
+
+float3 get_convergence_offsets_x_vector()
+{
+    return convergence_offset_x;
+}
+
+float3 get_convergence_offsets_y_vector()
+{
+    return convergence_offset_y;
+}
+
+float2 get_convergence_offsets_r_vector()
+{
+    return float2(convergence_offset_x.r, convergence_offset_y.r);
+}
+
+float2 get_convergence_offsets_g_vector()
+{
+    return float2(convergence_offset_x.g, convergence_offset_y.g);
+}
+
+float2 get_convergence_offsets_b_vector()
+{
+    return float2(convergence_offset_x.b, convergence_offset_y.b);
+}
+
+float2 get_aa_subpixel_r_offset()
+{
+    #if _RUNTIME_ANTIALIAS_WEIGHTS
+        #if _RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
+            //  WARNING: THIS IS EXTREMELY EXPENSIVE.
+            return aa_subpixel_r_offset_runtime;
+        #else
+            return aa_subpixel_r_offset_static;
+        #endif
+    #else
+        return aa_subpixel_r_offset_static;
+    #endif
+}
+
+//  Provide accessors settings which still need "cooking:"
+float get_mask_amplify()
+{
+    static const float mask_grille_amplify = 1.0/mask_grille_avg_color;
+    static const float mask_slot_amplify = 1.0/mask_slot_avg_color;
+    static const float mask_shadow_amplify = 1.0/mask_shadow_avg_color;
+
+    float mask_amplify;
+    [flatten]
+    switch (mask_type) {
+        case 0:
+            mask_amplify = mask_grille_amplify;
+            break;
+        case 1:
+            mask_amplify = mask_slot_amplify;
+            break;
+        case 2:
+            mask_amplify = mask_shadow_amplify;
+            break;
+        case 3:
+            mask_amplify = mask_grille_amplify;
+            break;
+        case 4:
+            mask_amplify = mask_slot_amplify;
+            break;
+        default:
+            mask_amplify = mask_shadow_amplify;
+            break;
+                    
+    }
+    
+    return mask_amplify;
+}
+
+#endif  //  _BIND_SHADER_PARAMS_H
--- a/data/resources/shaders/reshade/Shaders/crt-royale/lib/bloom-functions.fxh
+++ b/data/resources/shaders/reshade/Shaders/crt-royale/lib/bloom-functions.fxh
@@ -0,0 +1,320 @@
+#ifndef _BLOOM_FUNCTIONS_H
+#define _BLOOM_FUNCTIONS_H
+
+/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
+
+//  crt-royale: A full-featured CRT shader, with cheese.
+//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
+//
+//  This program is free software; you can redistribute it and/or modify it
+//  under the terms of the GNU General Public License as published by the Free
+//  Software Foundation; either version 2 of the License, or any later version.
+//
+//  This program is distributed in the hope that it will be useful, but WITHOUT
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+//  more details.
+//
+//  You should have received a copy of the GNU General Public License along with
+//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+//  Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+/////////////////////////////////  DESCRIPTION  ////////////////////////////////
+
+//  These utility functions and constants help several passes determine the
+//  size and center texel weight of the phosphor bloom in a uniform manner.
+
+
+//////////////////////////////////  INCLUDES  //////////////////////////////////
+
+//  We need to calculate the correct blur sigma using some .cgp constants:
+//#include "../user-settings.h"
+
+
+#include "user-settings.fxh"
+#include "derived-settings-and-constants.fxh"
+#include "bind-shader-params.fxh"
+#include "blur-functions.fxh"
+
+///////////////////////////////  BLOOM CONSTANTS  //////////////////////////////
+
+//  Compute constants with manual inlines of the functions below:
+static const float bloom_diff_thresh = 1.0/256.0;
+
+
+
+///////////////////////////////////  HELPERS  //////////////////////////////////
+
+float get_min_sigma_to_blur_triad(const float triad_size,
+    const float thresh)
+{
+    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
+    //              2.) thresh is the max desired pixel difference in the
+    //                  blurred triad (e.g. 1.0/256.0).
+    //  Returns:    Return the minimum sigma that will fully blur a phosphor
+    //              triad on the screen to an even color, within thresh.
+    //              This closed-form function was found by curve-fitting data.
+    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
+    return -0.05168 + 0.6113*triad_size -
+        1.122*triad_size*sqrt(0.000416 + thresh);
+    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
+    //return 0.5985*triad_size - triad_size*sqrt(thresh)
+}
+
+float get_absolute_scale_blur_sigma(const float thresh)
+{
+    //  Requires:   1.) min_expected_triads must be a global float.  The number
+    //                  of horizontal phosphor triads in the final image must be
+    //                  >= min_allowed_viewport_triads.x for realistic results.
+    //              2.) bloom_approx_scale_x must be a global float equal to the
+    //                  absolute horizontal scale of BLOOM_APPROX.
+    //              3.) bloom_approx_scale_x/min_allowed_viewport_triads.x
+    //                  should be <= 1.1658025090 to keep the final result <
+    //                  0.62666015625 (the largest sigma ensuring the largest
+    //                  unused texel weight stays < 1.0/256.0 for a 3x3 blur).
+    //              4.) thresh is the max desired pixel difference in the
+    //                  blurred triad (e.g. 1.0/256.0).
+    //  Returns:    Return the minimum Gaussian sigma that will blur the pass
+    //              output as much as it would have taken to blur away
+    //              bloom_approx_scale_x horizontal phosphor triads.
+    //  Description:
+    //  BLOOM_APPROX should look like a downscaled phosphor blur.  Ideally, we'd
+    //  use the same blur sigma as the actual phosphor bloom and scale it down
+    //  to the current resolution with (bloom_approx_scale_x/viewport_size_x), but
+    //  we don't know the viewport size in this pass.  Instead, we'll blur as
+    //  much as it would take to blur away min_allowed_viewport_triads.x.  This
+    //  will blur "more than necessary" if the user actually uses more triads,
+    //  but that's not terrible either, because blurring a constant fraction of
+    //  the viewport may better resemble a true optical bloom anyway (since the
+    //  viewport will generally be about the same fraction of each player's
+    //  field of view, regardless of screen size and resolution).
+    //  Assume an extremely large viewport size for asymptotic results.
+    return bloom_approx_scale_x/max_viewport_size_x *
+        get_min_sigma_to_blur_triad(
+            max_viewport_size_x/min_allowed_viewport_triads.x, thresh);
+}
+
+float get_center_weight(const float sigma)
+{
+    //  Given a Gaussian blur sigma, get the blur weight for the center texel.
+    #if _RUNTIME_PHOSPHOR_BLOOM_SIGMA
+        return get_fast_gaussian_weight_sum_inv(sigma);
+    #else
+        const float denom_inv = 0.5/(sigma*sigma);
+        const float w0 = 1.0;
+        const float w1 = exp(-1.0 * denom_inv);
+        const float w2 = exp(-4.0 * denom_inv);
+        const float w3 = exp(-9.0 * denom_inv);
+        const float w4 = exp(-16.0 * denom_inv);
+        const float w5 = exp(-25.0 * denom_inv);
+        const float w6 = exp(-36.0 * denom_inv);
+        const float w7 = exp(-49.0 * denom_inv);
+        const float w8 = exp(-64.0 * denom_inv);
+        const float w9 = exp(-81.0 * denom_inv);
+        const float w10 = exp(-100.0 * denom_inv);
+        const float w11 = exp(-121.0 * denom_inv);
+        const float w12 = exp(-144.0 * denom_inv);
+        const float w13 = exp(-169.0 * denom_inv);
+        const float w14 = exp(-196.0 * denom_inv);
+        const float w15 = exp(-225.0 * denom_inv);
+        const float w16 = exp(-256.0 * denom_inv);
+        const float w17 = exp(-289.0 * denom_inv);
+        const float w18 = exp(-324.0 * denom_inv);
+        const float w19 = exp(-361.0 * denom_inv);
+        const float w20 = exp(-400.0 * denom_inv);
+        const float w21 = exp(-441.0 * denom_inv);
+        //  Note: If the implementation uses a smaller blur than the max allowed,
+        //  the worst case scenario is that the center weight will be overestimated,
+        //  so we'll put a bit more energy into the brightpass...no huge deal.
+        //  Then again, if the implementation uses a larger blur than the max
+        //  "allowed" because of dynamic branching, the center weight could be
+        //  underestimated, which is more of a problem...consider always using
+        #if PHOSPHOR_BLOOM_TRIAD_SIZE_MODE >= _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
+            //  43x blur:
+            const float weight_sum_inv = 1.0 /
+                (w0 + 2.0 * (w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10 +
+                w11 + w12 + w13 + w14 + w15 + w16 + w17 + w18 + w19 + w20 + w21));
+        #else
+        #if PHOSPHOR_BLOOM_TRIAD_SIZE_MODE >= _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
+            //  31x blur:
+            const float weight_sum_inv = 1.0 /
+                (w0 + 2.0 * (w1 + w2 + w3 + w4 + w5 + w6 + w7 +
+                w8 + w9 + w10 + w11 + w12 + w13 + w14 + w15));
+        #else
+        #if PHOSPHOR_BLOOM_TRIAD_SIZE_MODE >= _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
+            //  25x blur:
+            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (
+                w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10 + w11 + w12));
+        #else
+        #if PHOSPHOR_BLOOM_TRIAD_SIZE_MODE >= _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
+            //  17x blur:
+            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (
+                w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8));
+        #else
+            //  9x blur:
+            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (w1 + w2 + w3 + w4));
+        #endif  //  _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
+        #endif  //  _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
+        #endif  //  _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
+        #endif  //  _PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
+        const float center_weight = weight_sum_inv * weight_sum_inv;
+        return center_weight;
+    #endif
+}
+
+float3 tex2DblurNfast(const sampler2D tex, const float2 tex_uv,
+    const float2 dxdy, const float sigma,
+    const float input_gamma)
+{
+    //  If sigma is static, we can safely branch and use the smallest blur
+    //  that's big enough.  Ignore #define hints, because we'll only use a
+    //  large blur if we actually need it, and the branches cost nothing.
+    #if !_RUNTIME_PHOSPHOR_BLOOM_SIGMA
+        #define PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
+    #else
+        //  It's still worth branching if the profile supports dynamic branches:
+        //  It's much faster than using a hugely excessive blur, but each branch
+        //  eats ~1% FPS.
+        #if _DRIVERS_ALLOW_DYNAMIC_BRANCHES
+            #define PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
+        #endif
+    #endif
+    //  Failed optimization notes:
+    //  I originally created a same-size mipmapped 5-tap separable blur10 that
+    //  could handle any sigma by reaching into lower mip levels.  It was
+    //  as fast as blur25fast for runtime sigmas and a tad faster than
+    //  blur31fast for static sigmas, but mipmapping two viewport-size passes
+    //  ate 10% of FPS across all codepaths, so it wasn't worth it.
+    #ifdef PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
+        if(sigma <= blur9_std_dev)
+        {
+            return tex2Dblur9fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        }
+        else if(sigma <= blur17_std_dev)
+        {
+            return tex2Dblur17fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        }
+        else if(sigma <= blur25_std_dev)
+        {
+            return tex2Dblur25fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        }
+        else if(sigma <= blur31_std_dev)
+        {
+            return tex2Dblur31fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        }
+        else
+        {
+            return tex2Dblur43fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        }
+    #else
+        //  If we can't afford to branch, we can only guess at what blur
+        //  size we need.  Therefore, use the largest blur allowed.
+        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
+            return tex2Dblur43fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        #else
+        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
+            return tex2Dblur31fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        #else
+        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
+            return tex2Dblur25fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        #else
+        #if PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
+            return tex2Dblur17fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        #else
+            return tex2Dblur9fast(tex, tex_uv, dxdy, sigma, input_gamma);
+        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
+        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
+        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
+        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
+    #endif  //  PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
+}
+
+float get_bloom_approx_sigma(const float output_size_x_runtime,
+    const float estimated_viewport_size_x)
+{
+    //  Requires:   1.) output_size_x_runtime == BLOOM_APPROX.output_size.x.
+    //                  This is included for dynamic codepaths just in case the
+    //                  following two globals are incorrect:
+    //              2.) bloom_approx_size_x_for_skip should == the same
+    //                  if PHOSPHOR_BLOOM_FAKE is #defined
+    //              3.) bloom_approx_size_x should == the same otherwise
+    //  Returns:    For gaussian4x4, return a dynamic small bloom sigma that's
+    //              as close to optimal as possible given available information.
+    //              For blur3x3, return the a static small bloom sigma that
+    //              works well for typical cases.  Otherwise, we're using simple
+    //              bilinear filtering, so use static calculations.
+    //  Assume the default static value.  This is a compromise that ensures
+    //  typical triads are blurred, even if unusually large ones aren't.
+    static const float mask_num_triads_static =
+        max(min_allowed_viewport_triads.x, mask_num_triads_across_static);
+    const float mask_num_triads_from_size =
+        estimated_viewport_size_x/mask_triad_width;
+    const float mask_num_triads_runtime = max(min_allowed_viewport_triads.x,
+        lerp(mask_num_triads_from_size, mask_num_triads_across,
+            mask_size_param));
+    //  Assume an extremely large viewport size for asymptotic results:
+    static const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
+    if(bloom_approx_filter > 1.5)   //  4x4 true Gaussian resize
+    {
+        //  Use the runtime num triads and output size:
+        const float asymptotic_triad_size =
+            max_viewport_size_x/mask_num_triads_runtime;
+        const float asymptotic_sigma = get_min_sigma_to_blur_triad(
+            asymptotic_triad_size, bloom_diff_thresh);
+        const float bloom_approx_sigma =
+            asymptotic_sigma * output_size_x_runtime/max_viewport_size_x;
+        //  The BLOOM_APPROX input has to be ORIG_LINEARIZED to avoid moire, but
+        //  account for the Gaussian scanline sigma from the last pass too.
+        //  The bloom will be too wide horizontally but tall enough vertically.
+        return length(float2(bloom_approx_sigma, gaussian_beam_max_sigma));
+    }
+    else    //  3x3 blur resize (the bilinear resize doesn't need a sigma)
+    {
+        //  We're either using blur3x3 or bilinear filtering.  The biggest
+        //  reason to choose blur3x3 is to avoid dynamic weights, so use a
+        //  static calculation.
+        #ifdef PHOSPHOR_BLOOM_FAKE
+            static const float output_size_x_static =
+                bloom_approx_size_x_for_fake;
+        #else
+            static const float output_size_x_static = bloom_approx_size_x;
+        #endif
+        static const float asymptotic_triad_size =
+            max_viewport_size_x/mask_num_triads_static;
+        const float asymptotic_sigma = get_min_sigma_to_blur_triad(
+            asymptotic_triad_size, bloom_diff_thresh);
+        const float bloom_approx_sigma =
+            asymptotic_sigma * output_size_x_static/max_viewport_size_x;
+        //  The BLOOM_APPROX input has to be ORIG_LINEARIZED to avoid moire, but
+        //  try accounting for the Gaussian scanline sigma from the last pass
+        //  too; use the static default value:
+        return length(float2(bloom_approx_sigma, gaussian_beam_max_sigma_static));
+    }
+}
+
+float get_final_bloom_sigma(const float bloom_sigma_runtime)
+{
+    //  Requires:   1.) bloom_sigma_runtime is a precalculated sigma that's
+    //                  optimal for the [known] triad size.
+    //              2.) Call this from a fragment shader (not a vertex shader),
+    //                  or blurring with static sigmas won't be constant-folded.
+    //  Returns:    Return the optimistic static sigma if the triad size is
+    //              known at compile time.  Otherwise return the optimal runtime
+    //              sigma (10% slower) or an implementation-specific compromise
+    //              between an optimistic or pessimistic static sigma.
+    //  Notes:      Call this from the fragment shader, NOT the vertex shader,
+    //              so static sigmas can be constant-folded!
+    const float bloom_sigma_optimistic = get_min_sigma_to_blur_triad(
+        mask_triad_width_static, bloom_diff_thresh);
+    #if _RUNTIME_PHOSPHOR_BLOOM_SIGMA
+        return bloom_sigma_runtime;
+    #else
+        //  Overblurring looks as bad as underblurring, so assume average-size
+        //  triads, not worst-case huge triads:
+        return bloom_sigma_optimistic;
+    #endif
+}
+
+
+#endif  //  _BLOOM_FUNCTIONS_H
--- a/data/resources/shaders/reshade/Shaders/crt-royale/lib/blur-functions.fxh
+++ b/data/resources/shaders/reshade/Shaders/crt-royale/lib/blur-functions.fxh
--- a/data/resources/shaders/reshade/Shaders/crt-royale/lib/derived-settings-and-constants.fxh
+++ b/data/resources/shaders/reshade/Shaders/crt-royale/lib/derived-settings-and-constants.fxh
@@ -0,0 +1,405 @@
+#ifndef _DERIVED_SETTINGS_AND_CONSTANTS_H
+#define _DERIVED_SETTINGS_AND_CONSTANTS_H
+
+#include "helper-functions-and-macros.fxh"
+#include "user-settings.fxh"
+
+/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
+
+//  crt-royale: A full-featured CRT shader, with cheese.
+//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
+//
+//  crt-royale-reshade: A port of TroggleMonkey's crt-royale from libretro to ReShade.
+//  Copyright (C) 2020 Alex Gunter <akg7634@gmail.com>
+//
+//  This program is free software; you can redistribute it and/or modify it
+//  under the terms of the GNU General Public License as published by the Free
+//  Software Foundation; either version 2 of the License, or any later version.
+//
+//  This program is distributed in the hope that it will be useful, but WITHOUT
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+//  more details.
+//
+//  You should have received a copy of the GNU General Public License along with
+//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+//  Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+/////////////////////////////////  DESCRIPTION  ////////////////////////////////
+
+//  These macros and constants can be used across the whole codebase.
+//  Unlike the values in user-settings.cgh, end users shouldn't modify these.
+
+
+///////////////////////////////  BEGIN INCLUDES  ///////////////////////////////
+
+//#include "../user-settings.h"
+
+//#include "user-cgp-constants.h"
+
+/////////////////////////   BEGIN USER-CGP-CONSTANTS   /////////////////////////
+
+#ifndef _USER_CGP_CONSTANTS_H
+#define _USER_CGP_CONSTANTS_H
+
+//  IMPORTANT:
+//  These constants MUST be set appropriately for the settings in crt-royale.cgp
+//  (or whatever related .cgp file you're using).  If they aren't, you're likely
+//  to get artifacts, the wrong phosphor mask size, etc.  I wish these could be
+//  set directly in the .cgp file to make things easier, but...they can't.
+
+//  PASS SCALES AND RELATED CONSTANTS:
+//  Copy the absolute scale_x for BLOOM_APPROX.  There are two major versions of
+//  this shader: One does a viewport-scale bloom, and the other skips it.  The
+//  latter benefits from a higher bloom_approx_scale_x, so save both separately:
+static const float bloom_approx_scale_x = 4.0 / 3.0;
+static const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
+static const float bloom_diff_thresh_ = 1.0/256.0;
+
+static const float bloom_approx_size_x = 320.0;
+static const float bloom_approx_size_x_for_fake = 400.0;
+//  Copy the viewport-relative scales of the phosphor mask resize passes
+//  (MASK_RESIZE and the pass immediately preceding it):
+static const float2 mask_resize_viewport_scale = float2(0.0625, 0.0625);
+//  Copy the geom_max_aspect_ratio used to calculate the MASK_RESIZE scales, etc.:
+static const float geom_max_aspect_ratio = 4.0/3.0;
+
+//  PHOSPHOR MASK TEXTURE CONSTANTS:
+//  Set the following constants to reflect the properties of the phosphor mask
+//  texture named in crt-royale.cgp.  The shader optionally resizes a mask tile
+//  based on user settings, then repeats a single tile until filling the screen.
+//  The shader must know the input texture size (default 64x64), and to manually
+//  resize, it must also know the horizontal triads per tile (default 8).
+static const float2 mask_texture_small_size = float2(64.0, 64.0);
+static const float2 mask_texture_large_size = float2(512.0, 512.0);
+static const float mask_triads_per_tile = 8.0;
+//  We need the average brightness of the phosphor mask to compensate for the
+//  dimming it causes.  The following four values are roughly correct for the
+//  masks included with the shader.  Update the value for any LUT texture you
+//  change.  [Un]comment "#define PHOSPHOR_MASK_GRILLE14" depending on whether
+//  the loaded aperture grille uses 14-pixel or 15-pixel stripes (default 15).
+// #ifndef PHOSPHOR_MASK_GRILLE14
+//     #define PHOSPHOR_MASK_GRILLE14 0
+// #endif
+static const float mask_grille14_avg_color = 50.6666666/255.0;
+    //  TileableLinearApertureGrille14Wide7d33Spacing*.png
+    //  TileableLinearApertureGrille14Wide10And6Spacing*.png
+static const float mask_grille15_avg_color = 53.0/255.0;
+    //  TileableLinearApertureGrille15Wide6d33Spacing*.png
+    //  TileableLinearApertureGrille15Wide8And5d5Spacing*.png
+static const float mask_slot_avg_color = 46.0/255.0;
+    //  TileableLinearSlotMask15Wide9And4d5Horizontal8VerticalSpacing*.png
+    //  TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing*.png
+static const float mask_shadow_avg_color = 41.0/255.0;
+    //  TileableLinearShadowMask*.png
+    //  TileableLinearShadowMaskEDP*.png
+
+// #if PHOSPHOR_MASK_GRILLE14
+//     static const float mask_grille_avg_color = mask_grille14_avg_color;
+// #else
+    static const float mask_grille_avg_color = mask_grille15_avg_color;
+// #endif
+
+
+#endif  //  _USER_CGP_CONSTANTS_H
+
+//////////////////////////   END USER-CGP-CONSTANTS   //////////////////////////
+
+////////////////////////////////  END INCLUDES  ////////////////////////////////
+
+///////////////////////////////  FIXED SETTINGS  ///////////////////////////////
+
+
+
+#define _SIMULATE_CRT_ON_LCD 1
+#define _SIMULATE_GBA_ON_LCD 2
+#define _SIMULATE_LCD_ON_CRT 3
+#define _SIMULATE_GBA_ON_CRT 4
+
+//  Ensure the first pass decodes CRT gamma and the last encodes LCD gamma.
+#define GAMMA_SIMULATION_MODE _SIMULATE_CRT_ON_LCD
+
+//  Manually tiling a manually resized texture creates texture coord derivative
+//  discontinuities and confuses anisotropic filtering, causing discolored tile
+//  seams in the phosphor mask.  Workarounds:
+//  a.) Using tex2Dlod disables anisotropic filtering for tiled masks.  It's
+//      downgraded to tex2Dbias without _DRIVERS_ALLOW_TEX2DLOD #defined and
+//      disabled without _DRIVERS_ALLOW_TEX2DBIAS #defined either.
+//  b.) "Tile flat twice" requires drawing two full tiles without border padding
+//      to the resized mask FBO, and it's incompatible with same-pass curvature.
+//      (Same-pass curvature isn't used but could be in the future...maybe.)
+//  c.) "Fix discontinuities" requires derivatives and drawing one tile with
+//      border padding to the resized mask FBO, but it works with same-pass
+//      curvature.  It's disabled without _DRIVERS_ALLOW_DERIVATIVES #defined.
+//  Precedence: a, then, b, then c (if multiple strategies are #defined).
+// #ifndef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+//     #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD 1              //  129.7 FPS, 4x, flat; 101.8 at fullscreen
+// #endif
+// #ifndef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//     #define ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE 1       //  128.1 FPS, 4x, flat; 101.5 at fullscreen
+// #endif
+// #ifndef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//     #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES 1   //  124.4 FPS, 4x, flat; 97.4 at fullscreen
+// #endif
+//  Also, manually resampling the phosphor mask is slightly blurrier with
+//  anisotropic filtering.  (Resampling with mipmapping is even worse: It
+//  creates artifacts, but only with the fully bloomed shader.)  The difference
+//  is subtle with small triads, but you can fix it for a small cost.
+// #ifndef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+//     #define ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD 0
+// #endif
+
+
+//////////////////////////////  DERIVED SETTINGS  //////////////////////////////
+
+//  Intel HD 4000 GPU's can't handle manual mask resizing (for now), setting the
+//  geometry mode at runtime, or a 4x4 true Gaussian resize.  Disable
+//  incompatible settings ASAP.  (_INTEGRATED_GRAPHICS_COMPATIBILITY_MODE may be
+//  #defined by either user-settings.h or a wrapper .cg that #includes the
+//  current .cg pass.)
+#if _INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
+    #if _PHOSPHOR_MASK_MANUALLY_RESIZE
+        #undef _PHOSPHOR_MASK_MANUALLY_RESIZE
+        #define _PHOSPHOR_MASK_MANUALLY_RESIZE 0
+    #endif
+    #if _RUNTIME_GEOMETRY_MODE
+        #undef _RUNTIME_GEOMETRY_MODE
+        #define _RUNTIME_GEOMETRY_MODE 0
+    #endif
+    //  Mode 2 (4x4 Gaussian resize) won't work, and mode 1 (3x3 blur) is
+    //  inferior in most cases, so replace 2.0 with 0.0:
+    static const float bloom_approx_filter = macro_cond(
+        bloom_approx_filter_static > 1.5,
+        0.0,
+        bloom_approx_filter_static
+    );
+#else
+    static const float bloom_approx_filter = bloom_approx_filter_static;
+#endif
+
+//  Disable slow runtime paths if static parameters are used.  Most of these
+//  won't be a problem anyway once the params are disabled, but some will.
+#if !_RUNTIME_SHADER_PARAMS_ENABLE
+    #if _RUNTIME_PHOSPHOR_BLOOM_SIGMA
+        #undef _RUNTIME_PHOSPHOR_BLOOM_SIGMA
+        #define _RUNTIME_PHOSPHOR_BLOOM_SIGMA 0
+    #endif
+    #if _RUNTIME_ANTIALIAS_WEIGHTS
+        #undef _RUNTIME_ANTIALIAS_WEIGHTS
+        #define _RUNTIME_ANTIALIAS_WEIGHTS 0
+    #endif
+    #if _RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
+        #undef _RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
+        #define _RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS 0
+    #endif
+    #if _RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
+        #undef _RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
+        #define _RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE 0
+    #endif
+    #if _RUNTIME_GEOMETRY_TILT
+        #undef _RUNTIME_GEOMETRY_TILT
+        #define _RUNTIME_GEOMETRY_TILT 0
+    #endif
+    #if _RUNTIME_GEOMETRY_MODE
+        #undef _RUNTIME_GEOMETRY_MODE
+        #define _RUNTIME_GEOMETRY_MODE 0
+    #endif
+    // #if FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
+    //     #undef FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
+    //     #define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT 0
+    // #endif
+#endif
+
+//  Make tex2Dbias a backup for tex2Dlod for wider compatibility.
+// #if ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+//     #define ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+// #endif
+// #if ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+//     #define ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
+// #endif
+//  Rule out unavailable anisotropic compatibility strategies:
+#if !_DRIVERS_ALLOW_DERIVATIVES
+    // #if ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+    //     #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+    //     #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES 0
+    // #endif
+#endif
+// #if !_DRIVERS_ALLOW_TEX2DLOD
+    // #if ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+    //     #undef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+    //     #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD 0
+    // #endif
+    // #if ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+    //     #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+    //     #define ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD 0
+    // #endif
+    // #ifdef ANTIALIAS_DISABLE_ANISOTROPIC
+    //     #undef ANTIALIAS_DISABLE_ANISOTROPIC
+    // #endif
+// #endif
+// #if !_DRIVERS_ALLOW_TEX2DBIAS
+    // #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+    //     #undef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+    // #endif
+    // #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
+    //     #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
+    // #endif
+// #endif
+//  Prioritize anisotropic tiling compatibility strategies by performance and
+//  disable unused strategies.  This concentrates all the nesting in one place.
+// #if ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+//     #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+//         #undef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+//     #endif
+//     #if ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//         #undef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//         #define ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE 0
+//     #endif
+//     #if ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//         #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//         #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES 0
+//     #endif
+//     #else
+//     #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+//         #if ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//             #undef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//             #define ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE 0
+//         #endif
+//         #if ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//             #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//             #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES 0
+//         #endif
+//     #else
+//         //  ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE is only compatible with
+//         //  flat texture coords in the same pass, but that's all we use.
+//         #if ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+//             #if ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//                 #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//                 #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES 0
+//             #endif
+//         #endif
+//     #endif
+// #endif
+//  The tex2Dlod and tex2Dbias strategies share a lot in common, and we can
+//  reduce some #ifdef nesting in the next section by essentially OR'ing them:
+// #if ANISOTROPIC_TILING_COMPAT_TEX2DLOD
+//     #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
+// #endif
+// #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
+//     #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
+// #endif
+//  Prioritize anisotropic resampling compatibility strategies the same way:
+// #if ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+//     #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
+//         #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
+//     #endif
+// #endif
+
+
+///////////////////////  DERIVED PHOSPHOR MASK CONSTANTS  //////////////////////
+
+//  If we can use the large mipmapped LUT without mipmapping artifacts, we
+//  should: It gives us more options for using fewer samples.
+// #if USE_LARGE_PHOSPHOR_MASK
+    // #if ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
+    //     //  TODO: Take advantage of this!
+    //     #define PHOSPHOR_MASK_RESIZE_MIPMAPPED_LUT
+    //     static const float2 mask_resize_src_lut_size = mask_texture_large_size;
+    // #else
+static const float2 mask_resize_src_lut_size = mask_texture_large_size;
+    // #endif
+// #else
+//     static const float2 mask_resize_src_lut_size = mask_texture_small_size;
+// #endif
+
+static const float tile_aspect_inv = mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
+
+
+//  tex2D's sampler2D parameter MUST be a uniform global, a uniform input to
+//  main_fragment, or a static alias of one of the above.  This makes it hard
+//  to select the phosphor mask at runtime: We can't even assign to a uniform
+//  global in the vertex shader or select a sampler2D in the vertex shader and
+//  pass it to the fragment shader (even with explicit TEXUNIT# bindings),
+//  because it just gives us the input texture or a black screen.  However, we
+//  can get around these limitations by calling tex2D three times with different
+//  uniform samplers (or resizing the phosphor mask three times altogether).
+//  With dynamic branches, we can process only one of these branches on top of
+//  quickly discarding fragments we don't need (cgc seems able to overcome
+//  limigations around dependent texture fetches inside of branches).  Without
+//  dynamic branches, we have to process every branch for every fragment...which
+//  is slower.  Runtime sampling mode selection is slower without dynamic
+//  branches as well.  Let the user's static #defines decide if it's worth it.
+#if _DRIVERS_ALLOW_DYNAMIC_BRANCHES
+    #define _RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
+// #else
+    // #if FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
+    //     #define _RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
+    // #endif
+#endif
+
+//  We need to render some minimum number of tiles in the resize passes.
+//  We need at least 1.0 just to repeat a single tile, and we need extra
+//  padding beyond that for anisotropic filtering, discontinuitity fixing,
+//  antialiasing, same-pass curvature (not currently used), etc.  First
+//  determine how many border texels and tiles we need, based on how the result
+//  will be sampled:
+#ifdef GEOMETRY_EARLY
+    static const float max_subpixel_offset = aa_subpixel_r_offset_static.x;
+    //  Most antialiasing filters have a base radius of 4.0 pixels:
+    static const float max_aa_base_pixel_border = 4.0 +
+        max_subpixel_offset;
+#else
+    static const float max_aa_base_pixel_border = 0.0;
+#endif
+//  Anisotropic filtering adds about 0.5 to the pixel border:
+// #ifndef ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
+static const float max_aniso_pixel_border = max_aa_base_pixel_border + 0.5;
+// #else
+//     static const float max_aniso_pixel_border = max_aa_base_pixel_border;
+// #endif
+//  Fixing discontinuities adds 1.0 more to the pixel border:
+// #if ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
+//     static const float max_tiled_pixel_border = max_aniso_pixel_border + 1.0;
+// #else
+    static const float max_tiled_pixel_border = max_aniso_pixel_border;
+// #endif
+//  Convert the pixel border to an integer texel border.  Assume same-pass
+//  curvature about triples the texel frequency:
+#ifdef GEOMETRY_EARLY
+    #define max_mask_texel_border macro_ceil(max_tiled_pixel_border * 3.0f)
+#else
+    #define max_mask_texel_border macro_ceil(max_tiled_pixel_border)
+#endif
+//  Convert the texel border to a tile border using worst-case assumptions:
+static const float max_mask_tile_border = max_mask_texel_border/
+(mask_min_allowed_triad_size * mask_triads_per_tile);
+
+//  Finally, set the number of resized tiles to render to MASK_RESIZE, and set
+//  the starting texel (inside borders) for sampling it.
+#ifndef GEOMETRY_EARLY
+    // #if ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
+        //  Special case: Render two tiles without borders.  Anisotropic
+        //  filtering doesn't seem to be a problem here.
+        // static const float mask_resize_num_tiles = 1.0 + 1.0;
+        // static const float mask_start_texels = 0.0;
+    // #else
+    static const float mask_resize_num_tiles = 1.0 + 2.0 * max_mask_tile_border;
+    static const float mask_start_texels = max_mask_texel_border;
+    // #endif
+#else
+    static const float mask_resize_num_tiles = 1.0 + 2.0*max_mask_tile_border;
+    static const float mask_start_texels = max_mask_texel_border;
+#endif
+
+//  We have to fit mask_resize_num_tiles into an FBO with a viewport scale of
+//  mask_resize_viewport_scale.  This limits the maximum final triad size.
+//  Estimate the minimum number of triads we can split the screen into in each
+//  dimension (we'll be as correct as mask_resize_viewport_scale is):
+static const float mask_resize_num_triads = mask_resize_num_tiles * mask_triads_per_tile;
+static const float2 min_allowed_viewport_triads =
+float2(mask_resize_num_triads, mask_resize_num_triads) / mask_resize_viewport_scale;
+
+
+
+#endif  //  _DERIVED_SETTINGS_AND_CONSTANTS_H
--- a/data/resources/shaders/reshade/Shaders/crt-royale/lib/downsampling-functions.fxh
+++ b/data/resources/shaders/reshade/Shaders/crt-royale/lib/downsampling-functions.fxh
@@ -0,0 +1,84 @@
+#ifndef _DOWNSAMPLING_FUNCTIONS_H
+#define _DOWNSAMPLING_FUNCTIONS_H
+
+/////////////////////////////////  MIT LICENSE  ////////////////////////////////
+
+//  Copyright (C) 2020 Alex Gunter <akg7634@gmail.com>
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to
+//  deal in the Software without restriction, including without limitation the
+//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+//  IN THE SOFTWARE.
+
+float3 opaque_linear_downsample(
+    const sampler2D tex,
+    const float2 texcoord,
+    const uint num_pairs,
+    const float2 delta_uv
+) {
+    const uint total_num_samples = num_pairs * 2 + 1;
+    const float2 coord_left = texcoord - delta_uv * num_pairs;
+
+    float3 acc = 0;
+    for(int i = 0; i < total_num_samples; i++) {
+        const float2 coord = coord_left + i * delta_uv;
+        acc += tex2D_nograd(tex, coord).rgb;
+    }
+    
+    return acc / total_num_samples;
+}
+
+
+float3 opaque_lanczos_downsample(
+    const sampler2D tex,
+    const float2 texcoord,
+    const uint num_pairs,
+    const float2 delta_uv,
+    const float num_sinc_lobes,
+    const float weight_at_center
+) {
+    const uint total_num_samples = num_pairs * 2 + 1;
+    const float2 coord_left = texcoord - delta_uv * num_pairs;
+    const float sinc_dx = num_sinc_lobes / num_pairs;  // 2 * num_sinc_lobes / (total_num_samples - 1)
+
+    float3 acc = 0;
+    float w_sum = 0;
+    for(int i = 0; i < total_num_samples; i++) {
+        const float2 coord = coord_left + i * delta_uv;
+        const float sinc_x = i * sinc_dx;
+
+        const float weight = (i != num_pairs) ?
+            num_sinc_lobes * sin(pi*sinc_x) * sin(pi*sinc_x/num_sinc_lobes) / (pi*pi * sinc_x*sinc_x) :
+            weight_at_center;
+
+        acc += weight * tex2D_nograd(tex, coord).rgb;
+        w_sum += weight;
+    }
+    
+    return acc / w_sum;
+}
+
+float3 opaque_lanczos_downsample(
+    const sampler2D tex,
+    const float2 texcoord,
+    const uint num_pairs,
+    const float2 delta_uv,
+    const float num_sinc_lobes
+) {
+    return opaque_lanczos_downsample(tex, texcoord, num_pairs, delta_uv, num_sinc_lobes, 1);
+}
+
+#endif  //  _DOWNSAMPLING_FUNCTIONS_H
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="900" height="600"><path fill="#EE1C25" d="M0 0h900v600H0"/><g transform="translate(150,150) scale(3)"><path id="s" d="M0,-30 17.63355,24.27051 -28.53171,-9.27051H28.53171L-17.63355,24.27051" fill="#FF0"/></g><use xlink:href="#s" transform="translate(300,60) rotate(23.036243)"/><use xlink:href="#s" transform="translate(360,120) rotate(45.869898)"/><use xlink:href="#s" transform="translate(360,210) rotate(69.945396)"/><use xlink:href="#s" transform="translate(300,270) rotate(20.659808)"/></svg>
				`@@ -1 +0,0 @@`
				`<?xml version="1.0"?><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 37 28"><path fill="#c8102e" d="M0,0H37V28H0Z"/><path stroke="#fff" stroke-width="4" d="M0,14h37M14,0v28"/></svg>`
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="1100" height="800"><path d="M 0,0 H 1100 V 800 H 0 Z" fill="#fff"/><path d="M 0,75 H 1100 V 200 H 0 Z" fill="#0038b8"/><path d="M 0,600 H 1100 V 725 H 0 Z" fill="#0038b8"/><path d="M 423.81566,472.85253 H 676.18435 L 550.00001,254.29492 Z m 126.18435,72.85255 126.1843,-218.55765 H 423.81566 Z" fill="none" stroke="#0038b8" stroke-width="27.5"/></svg>`
				`@@ -1 +0,0 @@`
				<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.88 111.24"><defs><style>.cls-1{fill:#fec901;fill-rule:evenodd;}.cls-2{fill:#010101;}</style></defs><title>risk</title><path d="M2.5,85l43-74.41h0a22.59,22.59,0,0,1,8-8.35,15.72,15.72,0,0,1,16,0,22.52,22.52,0,0,1,7.93,8.38l.23.44,42.08,73.07a20.91,20.91,0,0,1,3,10.84A16.44,16.44,0,0,1,121,102.4a15.45,15.45,0,0,1-5.74,6,21,21,0,0,1-11.35,2.78v0H17.7c-.21,0-.43,0-.64,0a19,19,0,0,1-7.83-1.74,15.83,15.83,0,0,1-6.65-5.72A16.26,16.26,0,0,1,0,95.18a21.66,21.66,0,0,1,2.2-9.62c.1-.2.2-.4.31-.59Z"/><path class="cls-1" d="M9.09,88.78l43-74.38c5.22-8.94,13.49-9.2,18.81,0l42.32,73.49c4.12,6.79,2.41,15.9-9.31,15.72H17.7C9.78,103.79,5,97.44,9.09,88.78Z"/><path class="cls-2" d="M57.55,83.15a5.47,5.47,0,0,1,5.85-1.22,5.65,5.65,0,0,1,2,1.3A5.49,5.49,0,0,1,67,86.77a5.12,5.12,0,0,1-.08,1.4,5.22,5.22,0,0,1-.42,1.34,5.51,5.51,0,0,1-5.2,3.25,5.63,5.63,0,0,1-2.26-.53,5.51,5.51,0,0,1-2.81-2.92A6,6,0,0,1,55.9,88a5.28,5.28,0,0,1,0-1.31h0a6,6,0,0,1,.56-2,4.6,4.6,0,0,1,1.14-1.56Zm8.12-10.21c-.19,4.78-8.28,4.78-8.46,0-.82-8.19-2.92-27.63-2.85-35.32.07-2.37,2-3.78,4.55-4.31a11.65,11.65,0,0,1,2.48-.25,12.54,12.54,0,0,1,2.5.25c2.59.56,4.63,2,4.63,4.43V38l-2.84,35Z"/></svg>